use descriptorpb from github.com/golang/protobuf/protoc-gen-go

grpc-ecosystem · Oct 27, 2020 · cd96c9a · cd96c9a
1 parent 08c6dff
commit cd96c9a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/registry/enum.go b/registry/enum.go
@@ -1,8 +1,9 @@
 package registry
 
 import (
+	descriptorpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
 	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
-	"google.golang.org/protobuf/types/descriptorpb"
 )
 
 func (r *Registry) analyseEnumType(fileData *data.File, packageName, fileName string, parents []string, enum *descriptorpb.EnumDescriptorProto) {

diff --git a/registry/field.go b/registry/field.go
@@ -1,8 +1,9 @@
 package registry
 
 import (
+	descriptorpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
 	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
-	"google.golang.org/protobuf/types/descriptorpb"
 )
 
 // getFieldType generates an intermediate type and leave the rendering logic to choose what to render

diff --git a/registry/file.go b/registry/file.go
@@ -1,9 +1,10 @@
 package registry
 
 import (
-	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
+	descriptorpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
 	log "github.com/sirupsen/logrus" // nolint: depguard
-	"google.golang.org/protobuf/types/descriptorpb"
+
+	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
 )
 
 func (r *Registry) analyseFile(f *descriptorpb.FileDescriptorProto) *data.File {

diff --git a/registry/message.go b/registry/message.go
@@ -1,8 +1,9 @@
 package registry
 
 import (
+	descriptorpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
 	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
-	"google.golang.org/protobuf/types/descriptorpb"
 )
 
 func (r *Registry) analyseMessage(fileData *data.File, packageName, fileName string, parents []string, message *descriptorpb.DescriptorProto) {

diff --git a/registry/registry.go b/registry/registry.go
@@ -1,14 +1,16 @@
 package registry
 
 import (
-	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
-	"git.sqcorp.co/cash/gap/errors"
-	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
-	log "github.com/sirupsen/logrus" // nolint: depguard
-	"google.golang.org/protobuf/types/descriptorpb"
 	"path"
 	"path/filepath"
 	"strings"
+
+	descriptorpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
+	log "github.com/sirupsen/logrus" // nolint: depguard
+
+	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
+	"git.sqcorp.co/cash/gap/errors"
 )
 
 const (

diff --git a/registry/service.go b/registry/service.go
@@ -1,8 +1,9 @@
 package registry
 
 import (
+	descriptorpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
 	"git.sqcorp.co/cash/gap/cmd/protoc-gen-grpc-gateway-ts/data"
-	"google.golang.org/protobuf/types/descriptorpb"
 )
 
 func (r *Registry) analyseService(fileData *data.File, packageName string, fileName string, service *descriptorpb.ServiceDescriptorProto) {