diff --git a/cmd/Godeps/Godeps.json b/cmd/Godeps/Godeps.json index bbe21f869..c274cccd4 100644 --- a/cmd/Godeps/Godeps.json +++ b/cmd/Godeps/Godeps.json @@ -65,18 +65,6 @@ "ImportPath": "github.com/dustin/go-humanize", "Rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0" }, - { - "ImportPath": "github.com/gengo/grpc-gateway/runtime", - "Rev": "dcb844349dc5d2cb0300fdc4d2d374839d0d2e13" - }, - { - "ImportPath": "github.com/gengo/grpc-gateway/runtime/internal", - "Rev": "dcb844349dc5d2cb0300fdc4d2d374839d0d2e13" - }, - { - "ImportPath": "github.com/gengo/grpc-gateway/utilities", - "Rev": "dcb844349dc5d2cb0300fdc4d2d374839d0d2e13" - }, { "ImportPath": "github.com/ghodss/yaml", "Rev": "73d445a93680fa1a78ae23a5839bad48f32ba1ee" @@ -106,6 +94,21 @@ "ImportPath": "github.com/google/btree", "Rev": "7d79101e329e5a3adf994758c578dab82b90c017" }, + { + "ImportPath": "github.com/grpc-ecosystem/grpc-gateway/runtime", + "Comment": "v1.0.0-8-gf52d055", + "Rev": "f52d055dc48aec25854ed7d31862f78913cf17d1" + }, + { + "ImportPath": "github.com/grpc-ecosystem/grpc-gateway/runtime/internal", + "Comment": "v1.0.0-8-gf52d055", + "Rev": "f52d055dc48aec25854ed7d31862f78913cf17d1" + }, + { + "ImportPath": "github.com/grpc-ecosystem/grpc-gateway/utilities", + "Comment": "v1.0.0-8-gf52d055", + "Rev": "f52d055dc48aec25854ed7d31862f78913cf17d1" + }, { "ImportPath": "github.com/inconshreveable/mousetrap", "Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/LICENSE.txt b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/LICENSE.txt similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/LICENSE.txt rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/LICENSE.txt diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/context.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/context.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/context.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/context.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/convert.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/convert.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/convert.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/convert.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/doc.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/doc.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/doc.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/doc.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/errors.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go similarity index 98% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/errors.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go index c499eb35a..7d7a9b224 100644 --- a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/errors.go +++ b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go @@ -104,6 +104,7 @@ func DefaultHTTPError(ctx context.Context, marshaler Marshaler, w http.ResponseW } handleForwardResponseServerMetadata(w, md) + handleForwardResponseTrailerHeader(w, md) st := HTTPStatusFromCode(grpc.Code(err)) w.WriteHeader(st) if _, err := w.Write(buf); err != nil { diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/handler.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go similarity index 98% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/handler.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go index a9c48782c..bafa4285f 100644 --- a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/handler.go +++ b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go @@ -6,8 +6,8 @@ import ( "net/http" "net/textproto" - "github.com/gengo/grpc-gateway/runtime/internal" "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime/internal" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/grpclog" diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/internal/stream_chunk.pb.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.pb.go similarity index 59% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/internal/stream_chunk.pb.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.pb.go index b5e9069e5..524e0d3c3 100644 --- a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/internal/stream_chunk.pb.go +++ b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.pb.go @@ -43,23 +43,23 @@ func (*StreamError) ProtoMessage() {} func (*StreamError) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*StreamError)(nil), "gengo.grpc.gateway.runtime.StreamError") + proto.RegisterType((*StreamError)(nil), "grpc.gateway.runtime.StreamError") } func init() { proto.RegisterFile("runtime/internal/stream_chunk.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 182 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x34, 0x8e, 0x3d, 0xef, 0x82, 0x30, - 0x10, 0x87, 0xc3, 0xff, 0x15, 0x8e, 0x8d, 0xa9, 0xd1, 0x41, 0xa3, 0x8b, 0x53, 0x19, 0xfc, 0x06, - 0x1a, 0xbf, 0x00, 0x6c, 0x2e, 0xa4, 0xe2, 0xa5, 0x10, 0xa5, 0x25, 0xd7, 0x23, 0xc6, 0xd5, 0x4f, - 0x2e, 0x2d, 0x32, 0xde, 0xf3, 0xdc, 0x93, 0xfc, 0x60, 0x4b, 0x83, 0xe1, 0xb6, 0xc3, 0xbc, 0x35, - 0x8c, 0x64, 0xd4, 0x3d, 0x77, 0x4c, 0xa8, 0xba, 0xaa, 0x6e, 0x06, 0x73, 0x93, 0x3d, 0x59, 0xb6, - 0xd9, 0x42, 0xa3, 0xd1, 0x56, 0x6a, 0xea, 0x6b, 0xa9, 0x15, 0xe3, 0x43, 0x3d, 0xe5, 0xa7, 0xdb, - 0xbc, 0x22, 0x48, 0xcb, 0x90, 0x9c, 0x88, 0x2c, 0x65, 0x4b, 0x48, 0xfc, 0x5f, 0x55, 0xdb, 0x2b, - 0x8a, 0x68, 0x1d, 0xed, 0x7e, 0x8b, 0xd8, 0x83, 0xe3, 0x78, 0x7b, 0xd9, 0x30, 0xf7, 0x93, 0xfc, - 0x9a, 0xa4, 0x07, 0x41, 0x0a, 0xf8, 0xef, 0xd0, 0x39, 0xa5, 0x51, 0x7c, 0x8f, 0x2a, 0x29, 0xe6, - 0x33, 0x5b, 0x41, 0x1a, 0x32, 0xc7, 0x8a, 0x07, 0x27, 0x7e, 0x82, 0x05, 0x8f, 0xca, 0x40, 0x0e, - 0x70, 0x8e, 0xe7, 0xfd, 0x97, 0xbf, 0xb0, 0x79, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x7f, - 0x7d, 0x56, 0xda, 0x00, 0x00, 0x00, + // 180 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2e, 0x2a, 0xcd, 0x2b, + 0xc9, 0xcc, 0x4d, 0xd5, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0xcc, 0xd1, 0x2f, 0x2e, 0x29, + 0x4a, 0x4d, 0xcc, 0x8d, 0x4f, 0xce, 0x28, 0xcd, 0xcb, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, + 0x12, 0x49, 0x2f, 0x2a, 0x48, 0xd6, 0x4b, 0x4f, 0x2c, 0x49, 0x2d, 0x4f, 0xac, 0xd4, 0x83, 0xea, + 0x50, 0x6a, 0x62, 0xe4, 0xe2, 0x0e, 0x06, 0x2b, 0x76, 0x2d, 0x2a, 0xca, 0x2f, 0x12, 0x92, 0xe6, + 0xe2, 0x04, 0xa9, 0x8b, 0x4f, 0xce, 0x4f, 0x49, 0x95, 0x60, 0x54, 0x60, 0xd4, 0x60, 0x0d, 0xe2, + 0x00, 0x09, 0x38, 0x03, 0xf9, 0x20, 0xc9, 0x8c, 0x92, 0x92, 0x02, 0x88, 0x24, 0x13, 0x44, 0x12, + 0x24, 0x00, 0x96, 0x94, 0xe0, 0x62, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x95, 0x60, 0x06, + 0x4a, 0x71, 0x06, 0xc1, 0xb8, 0x42, 0xf2, 0x5c, 0xdc, 0x60, 0x6d, 0xc5, 0x25, 0x89, 0x25, 0xa5, + 0xc5, 0x12, 0x2c, 0x60, 0x59, 0x2e, 0x90, 0x50, 0x30, 0x58, 0xc4, 0x89, 0x2b, 0x8a, 0x03, 0xe6, + 0xf2, 0x24, 0x36, 0xb0, 0x6b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x07, 0x92, 0xb6, + 0xd4, 0x00, 0x00, 0x00, } diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/internal/stream_chunk.proto b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.proto similarity index 87% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/internal/stream_chunk.proto rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.proto index c076b9b3b..f7fba56c3 100644 --- a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/internal/stream_chunk.proto +++ b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package gengo.grpc.gateway.runtime; +package grpc.gateway.runtime; option go_package = "internal"; // StreamError is a response type which is returned when diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshal_json.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_json.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshal_json.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_json.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshal_jsonpb.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_jsonpb.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshal_jsonpb.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_jsonpb.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshaler.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshaler.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshaler.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshaler.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshaler_registry.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshaler_registry.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/marshaler_registry.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshaler_registry.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/mux.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/mux.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/mux.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/mux.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/pattern.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go similarity index 99% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/pattern.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go index 1c3aa1110..3947dbea0 100644 --- a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/pattern.go +++ b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/gengo/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "google.golang.org/grpc/grpclog" ) diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/proto2_convert.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto2_convert.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/proto2_convert.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto2_convert.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/query.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go similarity index 98% rename from cmd/vendor/github.com/gengo/grpc-gateway/runtime/query.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go index 3455b2b72..56a919a52 100644 --- a/cmd/vendor/github.com/gengo/grpc-gateway/runtime/query.go +++ b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "google.golang.org/grpc/grpclog" ) diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/utilities/doc.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/doc.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/utilities/doc.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/doc.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/utilities/pattern.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/pattern.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/utilities/pattern.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/pattern.go diff --git a/cmd/vendor/github.com/gengo/grpc-gateway/utilities/trie.go b/cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/trie.go similarity index 100% rename from cmd/vendor/github.com/gengo/grpc-gateway/utilities/trie.go rename to cmd/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/trie.go