Use github.com/golang/protobuf/descriptor ForMessage and fix CI from not rebasing (#857)

* Use github.com/golang/protobuf/descriptor ForMessage instead of extracting FileDescriptorProto ourselves and fixing generated stream.swagger.json

* Fixing bazel and removing dead code

* remove required github.com/golang/protobuf/descriptor

* revert removing github.com/go-resty/resty

Author: mechinn

Gopkg.lock

@@ -146,7 +146,12 @@
         },
         "float_value": {
           "type": "number",
-          "format": "float"
+          "format": "float",
+          "default": "0.2",
+          "description": "Float value field",
+          "required": [
+            "float_value"
+          ]
         },
         "double_value": {
           "type": "number",
@@ -264,7 +269,9 @@
         "url": "https://github.com/grpc-ecosystem/grpc-gateway"
       },
       "required": [
-        "uuid"
+        "uuid",
+        "int64_value",
+        "double_value"
       ]
     },
     "examplepbNumericEnum": {

examples/proto/examplepb/stream.swagger.json

@@ -17,6 +17,7 @@ go_library(
         "//protoc-gen-grpc-gateway/generator:go_default_library",
         "//protoc-gen-swagger/options:go_default_library",
         "@com_github_golang_glog//:go_default_library",
+        "@com_github_golang_protobuf//descriptor:go_default_library_gen",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@io_bazel_rules_go//proto/wkt:any_go_proto",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",

protoc-gen-swagger/genswagger/BUILD.bazel

@@ -9,8 +9,12 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
+	pbdescriptor "github.com/golang/protobuf/descriptor"
 	"github.com/golang/protobuf/proto"
+	protocdescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
+	"github.com/golang/protobuf/ptypes/any"
+	"github.com/grpc-ecosystem/grpc-gateway/internal"
 	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
 	gen "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator"
 	swagger_options "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
@@ -133,3 +137,25 @@ func (g *generator) Generate(targets []*descriptor.File) ([]*plugin.CodeGenerato
 	}
 	return files, nil
 }
+
+//AddStreamError Adds grpc.gateway.runtime.StreamError and google.protobuf.Any to registry for stream responses
+func AddStreamError(reg *descriptor.Registry) error {
+	//load internal protos
+	any := fileDescriptorProtoForMessage(&any.Any{})
+	streamError := fileDescriptorProtoForMessage(&internal.StreamError{})
+	if err := reg.Load(&plugin.CodeGeneratorRequest{
+		ProtoFile: []*protocdescriptor.FileDescriptorProto{
+			any,
+			streamError,
+		},
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func fileDescriptorProtoForMessage(msg pbdescriptor.Message) *protocdescriptor.FileDescriptorProto {
+	fdp, _ := pbdescriptor.ForMessage(msg)
+	fdp.SourceCodeInfo = &protocdescriptor.SourceCodeInfo{}
+	return fdp
+}

protoc-gen-swagger/genswagger/generator.go

@@ -1,8 +1,6 @@
 package genswagger
 
 import (
-	"bytes"
-	"compress/gzip"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -15,9 +13,6 @@ import (
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	pbdescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/grpc-ecosystem/grpc-gateway/internal"
 	"github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor"
 	swagger_options "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
 )
@@ -326,56 +321,6 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject,
 	}
 }
 
-//AddStreamError Adds internal.StreamError and Any to registry for stream responses
-func AddStreamError(reg *descriptor.Registry) error {
-	//load internal protos
-	any, err := fileDescriptorProtoFromProtoDescriptor(&any.Any{})
-	if err != nil {
-		return err
-	}
-	streamError, err := fileDescriptorProtoFromProtoDescriptor(&internal.StreamError{})
-	if err != nil {
-		return err
-	}
-	if err := reg.Load(&plugin.CodeGeneratorRequest{
-		ProtoFile: []*pbdescriptor.FileDescriptorProto{
-			any,
-			streamError,
-		},
-	}); err != nil {
-		return err
-	}
-	return nil
-}
-
-type protoDescriptor interface {
-	Descriptor() ([]byte, []int)
-}
-
-func fileDescriptorProtoFromProtoDescriptor(pd protoDescriptor) (*pbdescriptor.FileDescriptorProto, error) {
-	pdd, _ := pd.Descriptor()
-	r, err := gzip.NewReader(bytes.NewReader(pdd))
-	if err != nil {
-		return nil, err
-	}
-	var buf bytes.Buffer
-	_, err = buf.ReadFrom(r)
-	if err != nil {
-		return nil, err
-	}
-	err = r.Close()
-	if err != nil {
-		return nil, err
-	}
-	fdp := &pbdescriptor.FileDescriptorProto{}
-	if err := proto.Unmarshal(buf.Bytes(), fdp); err != nil {
-		return nil, err
-	}
-	//hide the fact that we are loading this from the pb.go instead of the proto directly
-	fdp.SourceCodeInfo = &pbdescriptor.SourceCodeInfo{}
-	return fdp, nil
-}
-
 func renderMessagesAsStreamDefinition(messages messageMap, d swaggerDefinitionsObject, reg *descriptor.Registry) {
 	for name, msg := range messages {
 		if skipRenderingRef(name) {