Import go-akuity into grpc-gateway-client

Signed-off-by: Sunghoon Kang <[email protected]>

Author: Sunghoon Kang

go.mod

@@ -3,19 +3,21 @@ module github.com/akuity/grpc-gateway-client
 go 1.20
 
 require (
-	github.com/akuity/go-akuity v0.0.0-20230304081857-7177ba20624a
+	github.com/alevinval/sse v1.0.1
+	github.com/go-resty/resty/v2 v2.7.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
 	github.com/stretchr/testify v1.8.2
 	google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488
 	google.golang.org/grpc v1.53.0
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
 	google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743
 )
 
 require (
-	github.com/alevinval/sse v1.0.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-resty/resty/v2 v2.7.0 // indirect
+	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect

go.sum

@@ -1,13 +1,13 @@
-github.com/akuity/go-akuity v0.0.0-20230304081857-7177ba20624a h1:sZ9MaltiOMC/ydyWEOQgLFYgorhYq+4JnbhQsdDhu50=
-github.com/akuity/go-akuity v0.0.0-20230304081857-7177ba20624a/go.mod h1:iBOIBw6+nnYKr021QHY+hO5/u9cTlgvN5dSgZGYeEIw=
 github.com/alevinval/sse v1.0.1 h1:cFubh2lMNdHT6niFLCsyTuhAgljaAWbdmceAe6qPIfo=
 github.com/alevinval/sse v1.0.1/go.mod h1:Bvl1EawUlmW1y1vSU5uDl03+1Zsqqz/+6D2PAUvftcw=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
 github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
+github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -17,6 +17,7 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 h1:gDLXvp5S9izjldquuoAhDzccbsk
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2/go.mod h1:7pdNwVWBBHGiCxa9lAszqCJMbfTISJ7oMftp8+UGV08=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -43,6 +44,8 @@ google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 h1:QQF+HdiI4iocoxU
 google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA=
 google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
 google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 h1:rNBFJjBCOgVr9pWD7rs/knKL4FRTKgpZmsRfV214zcA=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 h1:yqElulDvOF26oZ2O+2/aoX7mQ8DY/6+p39neytrycd8=

internal/generator/packages.go

@@ -11,7 +11,7 @@ var (
 
 // Akuity packages
 var (
-	pkgGatewayClient = protogen.GoImportPath("github.com/akuity/go-akuity/pkg/grpc/gateway")
+	pkgGatewayClient = protogen.GoImportPath("github.com/akuity/grpc-gateway-client/pkg/grpc/gateway")
 )
 
 // protobuf packages

pkg/context/context.go

@@ -0,0 +1,12 @@
+package context
+
+import "context"
+
+func Get[K comparable, V any](ctx context.Context, key K) (V, bool) {
+	v, ok := ctx.Value(key).(V)
+	return v, ok
+}
+
+func Set[K comparable, V any](ctx context.Context, key K, val V) context.Context {
+	return context.WithValue(ctx, key, val)
+}

pkg/context/context_test.go

@@ -0,0 +1,74 @@
+package context
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+type dummyKey struct {
+	/* explicitly empty */
+}
+
+func TestGet(t *testing.T) {
+	type testSet[K, V any] struct {
+		newContextFunc func() context.Context
+		key            K
+		shouldExists   bool
+		value          V
+	}
+	testSets := map[string]testSet[dummyKey, string]{
+		"get existing value": {
+			newContextFunc: func() context.Context {
+				return context.WithValue(context.TODO(), dummyKey{}, "some value")
+			},
+			key:          dummyKey{},
+			value:        "some value",
+			shouldExists: true,
+		},
+		"get non-existing value": {
+			newContextFunc: context.TODO,
+			key:            dummyKey{},
+			shouldExists:   false,
+		},
+	}
+	for name, ts := range testSets {
+		t.Run(name, func(t *testing.T) {
+			ctx := ts.newContextFunc()
+			actual, ok := Get[dummyKey, string](ctx, ts.key)
+			if !ts.shouldExists {
+				require.False(t, ok)
+				return
+			}
+			require.True(t, ok)
+			require.Equal(t, ts.value, actual)
+		})
+	}
+}
+
+func TestSet(t *testing.T) {
+	testSets := map[string]struct {
+		key   interface{}
+		value interface{}
+	}{
+		"set boolean value": {
+			key:   dummyKey{},
+			value: true,
+		},
+		"set integer value": {
+			key:   dummyKey{},
+			value: 1234,
+		},
+		"set string value": {
+			key:   dummyKey{},
+			value: "some value",
+		},
+	}
+	for name, ts := range testSets {
+		t.Run(name, func(t *testing.T) {
+			ctx := Set(context.TODO(), ts.key, ts.value)
+			require.Equal(t, ctx.Value(ts.key), ts.value)
+		})
+	}
+}

pkg/grpc/gateway/client.go

@@ -0,0 +1,61 @@
+package gateway
+
+import (
+	"net/http"
+
+	"github.com/go-resty/resty/v2"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+)
+
+type Client interface {
+	NewRequest(method, url string) *resty.Request
+
+	Marshal(v interface{}) ([]byte, error)
+	Unmarshal(data []byte, v interface{}) error
+}
+
+type client struct {
+	httpClient    *http.Client
+	skipTLSVerify bool
+	rc            *resty.Client
+
+	marshaller *runtime.JSONPb
+}
+
+func NewClient(baseURL string, opts ...ClientOption) Client {
+	c := &client{}
+	for _, opt := range opts {
+		opt(c)
+	}
+
+	if c.httpClient == nil {
+		c.httpClient = &http.Client{}
+	}
+	if c.httpClient.Transport == nil {
+		c.httpClient.Transport = http.DefaultTransport.(*http.Transport).Clone()
+	}
+	setSkipTLSVerify(c.httpClient, c.skipTLSVerify)
+
+	if c.marshaller == nil {
+		c.marshaller = &runtime.JSONPb{}
+	}
+	c.rc = resty.NewWithClient(c.httpClient).SetBaseURL(baseURL)
+	c.rc.JSONMarshal = c.marshaller.Marshal
+	c.rc.JSONUnmarshal = c.marshaller.Unmarshal
+	return c
+}
+
+func (c *client) NewRequest(method string, url string) *resty.Request {
+	req := c.rc.NewRequest()
+	req.Method = method
+	req.URL = url
+	return req
+}
+
+func (c *client) Marshal(v interface{}) ([]byte, error) {
+	return c.marshaller.Marshal(v)
+}
+
+func (c *client) Unmarshal(data []byte, v interface{}) error {
+	return c.marshaller.Unmarshal(data, v)
+}

pkg/grpc/gateway/http.go

@@ -0,0 +1,57 @@
+package gateway
+
+import (
+	"crypto/tls"
+	"net/http"
+
+	"google.golang.org/grpc/codes"
+
+	"github.com/akuity/grpc-gateway-client/pkg/http/roundtripper"
+)
+
+func setSkipTLSVerify(hc *http.Client, skip bool) {
+	rt := roundtripper.GetRoundTripper(hc)
+	for {
+		ht, ok := rt.(*http.Transport)
+		if ok {
+			if ht.TLSClientConfig == nil {
+				ht.TLSClientConfig = &tls.Config{}
+			}
+			ht.TLSClientConfig.InsecureSkipVerify = skip
+			break
+		}
+
+		wrapped, ok := rt.(roundtripper.WrappedRoundTripper)
+		if !ok {
+			break
+		}
+		rt = wrapped.Unwrap()
+	}
+}
+
+// HTTPStatusToCode converts HTTP status code to gRPC error code
+// https://github.com/grpc/grpc/blob/9d2a1a3d1aba56d94c56d2e01cf2511d1a082445/doc/http-grpc-status-mapping.md
+func HTTPStatusToCode(code int) codes.Code {
+	switch code {
+	case http.StatusOK:
+		return codes.OK
+	case http.StatusBadRequest:
+		return codes.Internal
+	case http.StatusUnauthorized:
+		return codes.Unauthenticated
+	case http.StatusForbidden:
+		return codes.PermissionDenied
+	case http.StatusNotFound:
+		return codes.Unimplemented
+	case http.StatusTooManyRequests:
+		return codes.Unavailable
+	case http.StatusBadGateway:
+		return codes.Unavailable
+	case http.StatusServiceUnavailable:
+		return codes.Unavailable
+	case http.StatusGatewayTimeout:
+		return codes.Unavailable
+	default:
+		return codes.Unknown
+	}
+}

pkg/grpc/gateway/http_test.go

@@ -0,0 +1,89 @@
+package gateway
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/akuity/grpc-gateway-client/pkg/http/roundtripper"
+)
+
+var (
+	_ roundtripper.WrappedRoundTripper = &wrappedTransport{}
+	_ http.RoundTripper                = &unwrappableTransport{}
+)
+
+type wrappedTransport struct {
+	rt http.RoundTripper
+}
+
+func (t *wrappedTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	return t.rt.RoundTrip(req)
+}
+
+func (t *wrappedTransport) Unwrap() http.RoundTripper {
+	return t.rt
+}
+
+type unwrappableTransport struct {
+	rt http.RoundTripper
+}
+
+func (t unwrappableTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	return t.rt.RoundTrip(req)
+}
+
+func Test_setSkipTLSVerify(t *testing.T) {
+	testSets := map[string]struct {
+		newClientFunc func() *http.Client
+		errExpected   bool
+	}{
+		"client with default transport": {
+			newClientFunc: func() *http.Client {
+				return &http.Client{
+					Transport: http.DefaultTransport.(*http.Transport).Clone(),
+				}
+			},
+			errExpected: false,
+		},
+		"client with wrapped transport": {
+			newClientFunc: func() *http.Client {
+				return &http.Client{
+					Transport: &wrappedTransport{
+						rt: http.DefaultTransport.(*http.Transport).Clone(),
+					},
+				}
+			},
+			errExpected: false,
+		},
+		"client with unwrappable transport": {
+			newClientFunc: func() *http.Client {
+				return &http.Client{
+					Transport: &unwrappableTransport{
+						rt: http.DefaultTransport.(*http.Transport).Clone(),
+					},
+				}
+			},
+			errExpected: true,
+		},
+	}
+	for name, ts := range testSets {
+		t.Run(name, func(t *testing.T) {
+			srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+				w.WriteHeader(http.StatusNoContent)
+			}))
+
+			hc := ts.newClientFunc()
+			setSkipTLSVerify(hc, true)
+			res, err := hc.Get(srv.URL)
+			if ts.errExpected {
+				require.Error(t, err)
+			} else {
+				require.NotNil(t, res)
+				require.Equal(t, http.StatusNoContent, res.StatusCode)
+			}
+		})
+	}
+}