Update protobuf package (#91)

* Using new proto package

* Used the latest protoc to generate go code, has fully removed the old reference

Co-authored-by: Chrusty <>

cmd/protoc-gen-jsonschema/main.go

@@ -11,9 +11,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/golang/protobuf/proto"
-	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
 	"github.com/sirupsen/logrus"
+	"google.golang.org/protobuf/proto"
+	plugin "google.golang.org/protobuf/types/pluginpb"
 
 	"github.com/chrusty/protoc-gen-jsonschema/internal/converter"
 )

go.mod

@@ -4,7 +4,6 @@ go 1.14
 
 require (
 	github.com/alecthomas/jsonschema v0.0.0-20210918223802-a1d3f4b43d7b
-	github.com/golang/protobuf v1.5.0
 	github.com/iancoleman/orderedmap v0.2.0
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kr/pretty v0.1.0 // indirect

go.sum

@@ -3,7 +3,6 @@ github.com/alecthomas/jsonschema v0.0.0-20210918223802-a1d3f4b43d7b/go.mod h1:/n
 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/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

internal/converter/converter.go

@@ -10,10 +10,10 @@ import (
 	"strings"
 
 	"github.com/alecthomas/jsonschema"
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
 	"github.com/sirupsen/logrus"
+	"google.golang.org/protobuf/proto"
+	descriptor "google.golang.org/protobuf/types/descriptorpb"
+	plugin "google.golang.org/protobuf/types/pluginpb"
 )
 
 const (

internal/converter/converter_test.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/xeipuuv/gojsonschema"
+	"google.golang.org/protobuf/proto"
+	descriptor "google.golang.org/protobuf/types/descriptorpb"
+	plugin "google.golang.org/protobuf/types/pluginpb"
 
 	"github.com/chrusty/protoc-gen-jsonschema/internal/converter/testdata"
 )

internal/converter/proto_package.go

@@ -3,7 +3,7 @@ package converter
 import (
 	"strings"
 
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+	descriptor "google.golang.org/protobuf/types/descriptorpb"
 )
 
 // ProtoPackage describes a package of Protobuf, which is an container of message types.

internal/converter/sourcecodeinfo.go

@@ -1,8 +1,8 @@
 package converter
 
 import (
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+	"google.golang.org/protobuf/proto"
+	descriptor "google.golang.org/protobuf/types/descriptorpb"
 )
 
 // Protobuf tag values for relevant message fields. Full list here:

internal/converter/sourcecodeinfo_test.go

@@ -3,7 +3,7 @@ package converter
 import (
 	"testing"
 
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+	descriptor "google.golang.org/protobuf/types/descriptorpb"
 )
 
 func TestSourceInfoLookup(t *testing.T) {

internal/converter/types.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/alecthomas/jsonschema"
 	"github.com/chrusty/protoc-gen-jsonschema/internal/protos"
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
 	"github.com/iancoleman/orderedmap"
 	"github.com/xeipuuv/gojsonschema"
+	"google.golang.org/protobuf/proto"
+	descriptor "google.golang.org/protobuf/types/descriptorpb"
 )
 
 var (
@@ -481,14 +481,13 @@ func (c *Converter) recursiveConvertMessageType(curPkg *ProtoPackage, msg *descr
 		jsonSchemaType.AdditionalProperties = []byte("true")
 	}
 
-	c.logger.WithField("message_str", proto.MarshalTextString(msg)).Trace("Converting message")
+	c.logger.WithField("message_str", msg.String()).Trace("Converting message")
 	for _, fieldDesc := range msg.GetField() {
 
 		// Check for our custom field options:
 		opts := fieldDesc.GetOptions()
 		if opts != nil && proto.HasExtension(opts, protos.E_FieldOptions) {
-			opt, err := proto.GetExtension(opts, protos.E_FieldOptions)
-			if err == nil {
+			if opt := proto.GetExtension(opts, protos.E_FieldOptions); opt != nil {
 				if fieldOptions, ok := opt.(*protos.FieldOptions); ok {
 
 					// "Ignored" fields are simply skipped: