make it able to use with Kubernetes openAPI

.gitpod.yml

@@ -0,0 +1,11 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
+# and commit this file to your remote git repository to share the goodness with others.
+
+# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
+
+tasks:
+  - init: go get && go build ./... && go test ./...
+    command: go run .
+
+

README.md

@@ -6,12 +6,12 @@ This tool will accept an OpenAPI/Swagger definition (yaml or JSON) and generate
 
 To install, have Go installed with `$GOPATH/bin` on your `$PATH` and then:
 ```
-go install github.com/NYTimes/openapi2proto/cmd/openapi2proto@latest
+go install github.com/sanposhiho/openapi2proto/cmd/openapi2proto@latest
 ```
 
 On Older versions of Go (<1.15), use:
 ```
-go get -u github.com/NYTimes/openapi2proto/cmd/openapi2proto
+go get -u github.com/sanposhiho/openapi2proto/cmd/openapi2proto
 ```
 
 ## Run

cmd/openapi2proto/main.go

@@ -7,9 +7,9 @@ import (
 	"io"
 	"os"
 
-	"github.com/NYTimes/openapi2proto"
-	"github.com/NYTimes/openapi2proto/compiler"
-	"github.com/NYTimes/openapi2proto/protobuf"
+	"github.com/sanposhiho/openapi2proto"
+	"github.com/sanposhiho/openapi2proto/compiler"
+	"github.com/sanposhiho/openapi2proto/protobuf"
 	"github.com/pkg/errors"
 )
 

compiler/compiler.go

@@ -1,14 +1,14 @@
 // Package compiler contains tools to take openapi.* definitions and
 // compile them into protobuf.* structures.
-package compiler // github.com/NYTimes/openapi2proto/compiler
+package compiler // github.com/sanposhiho/openapi2proto/compiler
 
 import (
 	"bytes"
 	"sort"
 	"strings"
 
-	"github.com/NYTimes/openapi2proto/openapi"
-	"github.com/NYTimes/openapi2proto/protobuf"
+	"github.com/sanposhiho/openapi2proto/openapi"
+	"github.com/sanposhiho/openapi2proto/protobuf"
 	"github.com/pkg/errors"
 )
 
@@ -339,6 +339,7 @@ func (c *compileCtx) compilePath(path string, p *openapi.Path) error {
 			if err != nil {
 				return errors.Wrapf(err, `failed to compile parameters for %s`, endpointName)
 			}
+			reqType = c.getBoxedType(reqType)
 			m, ok := reqType.(*protobuf.Message)
 			if !ok {
 				return errors.Errorf(`type %s is not a message (%T)`, reqName, reqType)
@@ -388,6 +389,7 @@ func (c *compileCtx) compilePath(path string, p *openapi.Path) error {
 			}
 
 			if resType != nil {
+				resType = c.getBoxedType(resType)
 				m, ok := resType.(*protobuf.Message)
 				if !ok {
 					return errors.Errorf(`got non-message type (%T) in response for %s`, resType, endpointName)

compiler/interface.go

@@ -1,10 +1,10 @@
 package compiler
 
 import (
-	"github.com/NYTimes/openapi2proto/internal/option"
+	"github.com/sanposhiho/openapi2proto/internal/option"
 
-	"github.com/NYTimes/openapi2proto/openapi"
-	"github.com/NYTimes/openapi2proto/protobuf"
+	"github.com/sanposhiho/openapi2proto/openapi"
+	"github.com/sanposhiho/openapi2proto/protobuf"
 )
 
 const (

compiler/options.go

@@ -1,6 +1,6 @@
 package compiler
 
-import "github.com/NYTimes/openapi2proto/internal/option"
+import "github.com/sanposhiho/openapi2proto/internal/option"
 
 const (
 	optkeyAnnotation         = "annotation"

compiler/parameter.go

@@ -1,6 +1,6 @@
 package compiler
 
-import "github.com/NYTimes/openapi2proto/protobuf"
+import "github.com/sanposhiho/openapi2proto/protobuf"
 
 // Parameter is used to represent a parameter.
 type Parameter struct {

compiler/strings.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/NYTimes/openapi2proto/openapi"
+	"github.com/sanposhiho/openapi2proto/openapi"
 )
 
 // since we're not considering unicode here, we're not using unicode.*

compiler/strings_test.go

@@ -3,7 +3,7 @@ package compiler
 import (
 	"testing"
 
-	"github.com/NYTimes/openapi2proto/openapi"
+	"github.com/sanposhiho/openapi2proto/openapi"
 )
 
 type endpointNamingConversionTestCase struct {

go.mod

@@ -1,4 +1,4 @@
-module github.com/NYTimes/openapi2proto
+module github.com/sanposhiho/openapi2proto
 
 go 1.12
 

internal/option/option.go

@@ -1,4 +1,4 @@
-package option // github.com/NYTimes/openapi2proto/internal/option
+package option // github.com/sanposhiho/openapi2proto/internal/option
 
 type Option interface {
 	Name() string

openapi/external.go

@@ -214,7 +214,7 @@ func (c *resolveCtx) resolve(rv reflect.Value) (reflect.Value, error) {
 			refValue = refValue.Elem()
 
 			if refValue.Kind() != reflect.String {
-				return zeroval, errors.Errorf("'$ref' key contains non-string element (%s)", refValue.Type())
+				return rv, nil
 			}
 
 			ref := refValue.String()

openapi/interface.go

@@ -1,7 +1,7 @@
 package openapi
 
 import (
-	"github.com/NYTimes/openapi2proto/internal/option"
+	"github.com/sanposhiho/openapi2proto/internal/option"
 )
 
 const (

openapi/openapi.go

@@ -1,6 +1,6 @@
 // Package openapi contains tools to read in OpenAPI specifications
 // so that they can be passed to the openapi2proto compiler
-package openapi // github.com/NYTimes/openapi2proto/openapi
+package openapi // github.com/sanposhiho/openapi2proto/openapi
 
 import (
 	"bytes"

openapi/openapi_test.go

@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/NYTimes/openapi2proto/openapi"
+	"github.com/sanposhiho/openapi2proto/openapi"
 )
 
 func TestLoadFile(t *testing.T) {

openapi/options.go

@@ -1,6 +1,6 @@
 package openapi
 
-import "github.com/NYTimes/openapi2proto/internal/option"
+import "github.com/sanposhiho/openapi2proto/internal/option"
 
 // WithDir returns an option to specify the directory from
 // which external references should be resolved.

options.go

@@ -1,9 +1,9 @@
 package openapi2proto
 
 import (
-	"github.com/NYTimes/openapi2proto/compiler"
-	"github.com/NYTimes/openapi2proto/internal/option"
-	"github.com/NYTimes/openapi2proto/protobuf"
+	"github.com/sanposhiho/openapi2proto/compiler"
+	"github.com/sanposhiho/openapi2proto/internal/option"
+	"github.com/sanposhiho/openapi2proto/protobuf"
 )
 
 const (

proto_test.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/NYTimes/openapi2proto"
-	"github.com/NYTimes/openapi2proto/compiler"
-	"github.com/NYTimes/openapi2proto/protobuf"
+	"github.com/sanposhiho/openapi2proto"
+	"github.com/sanposhiho/openapi2proto/compiler"
+	"github.com/sanposhiho/openapi2proto/protobuf"
 	"github.com/pmezard/go-difflib/difflib"
 )
 
@@ -151,11 +151,9 @@ func TestGenerateProto(t *testing.T) {
 		{
 			fixturePath: "fixtures/missing_type.json",
 		},
-		/*
-			{
-				fixturePath: "fixtures/kubernetes.json",
-			},
-		*/
+		{
+			fixturePath: "fixtures/kubernetes.json",
+		},
 		{
 			fixturePath: "fixtures/accountv1-0.json",
 		},

protobuf/interface.go

@@ -3,7 +3,7 @@ package protobuf
 import (
 	"io"
 
-	"github.com/NYTimes/openapi2proto/internal/option"
+	"github.com/sanposhiho/openapi2proto/internal/option"
 )
 
 const (

protobuf/options.go

@@ -1,6 +1,6 @@
 package protobuf
 
-import "github.com/NYTimes/openapi2proto/internal/option"
+import "github.com/sanposhiho/openapi2proto/internal/option"
 
 const (
 	optkeyIndent              = "indent"

protobuf/protobuf.go

@@ -1,4 +1,4 @@
 // Package protobuf contains structures to represent a protobuf
 // definition, and tools to create textual representation of the
 // definition.
-package protobuf // github.com/NYTimes/openapi2proto/protobuf
+package protobuf // github.com/sanposhiho/openapi2proto/protobuf

protobuf/protobuf_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NYTimes/openapi2proto/protobuf"
+	"github.com/sanposhiho/openapi2proto/protobuf"
 	"github.com/pmezard/go-difflib/difflib"
 )
 

transpiler.go

@@ -1,11 +1,11 @@
-package openapi2proto // github.com/NYTimes/openapi2proto
+package openapi2proto // github.com/sanposhiho/openapi2proto
 
 import (
 	"io"
 
-	"github.com/NYTimes/openapi2proto/compiler"
-	"github.com/NYTimes/openapi2proto/openapi"
-	"github.com/NYTimes/openapi2proto/protobuf"
+	"github.com/sanposhiho/openapi2proto/compiler"
+	"github.com/sanposhiho/openapi2proto/openapi"
+	"github.com/sanposhiho/openapi2proto/protobuf"
 	"github.com/pkg/errors"
 )