Skip to content

Commit

Permalink
remove github.com/grpc-ecosystem/grpc-gateway unused dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Jeffy Mathew <jeffy.mathew100@gmail.com>
  • Loading branch information
jeffy-mathew committed Mar 2, 2021
1 parent e4cacd0 commit 082861c
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 12 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -465,16 +465,14 @@ PROTO_GOGO_MAPPINGS := $(shell echo \

.PHONY: proto
proto:
# Generate gogo, gRPC-Gateway, swagger, go-validators, gRPC-storage-plugin output.
# Generate gogo, swagger, go-validators, gRPC-storage-plugin output.
#
# -I declares import folders, in order of importance
# This is how proto resolves the protofile imports.
# It will check for the protofile relative to each of these
# folders and use the first one it finds.
#
# --gogo_out generates GoGo Protobuf output with gRPC plugin enabled.
# --grpc-gateway_out generates gRPC-Gateway output.
# --swagger_out generates an OpenAPI 2.0 specification for our gRPC-Gateway endpoints.
# --govalidators_out generates Go validation files for our messages types, if specified.
#
# The lines starting with Mgoogle/... are proto import replacements,
Expand All @@ -495,8 +493,6 @@ proto:
$(PROTO_INCLUDES) \
--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2 \
idl/proto/api_v2/query.proto
### grpc-gateway generates 'query.pb.gw.go' that does not respect (gogoproto.customname) = "TraceID"
### --grpc-gateway_out=$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/ \
### --swagger_out=allow_merge=true:$(PWD)/proto-gen/openapi/ \
$(PROTOC) \
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ require (
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.7.4
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
github.com/grpc-ecosystem/grpc-gateway v1.14.5
github.com/hashicorp/go-hclog v0.15.0
github.com/hashicorp/go-plugin v1.4.0
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
Expand Down
2 changes: 0 additions & 2 deletions plugin/storage/grpc/proto/storage.proto
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ option (gogoproto.marshaler_all) = true;
option (gogoproto.unmarshaler_all) = true;
// Enable custom Size method (Required by Marshal and Unmarshal).
option (gogoproto.sizer_all) = true;
// Enable registration with golang/protobuf for the grpc-gateway.
option (gogoproto.goproto_registration) = true;

message GetDependenciesRequest {
google.protobuf.Timestamp start_time = 1 [
Expand Down
1 change: 0 additions & 1 deletion proto-gen/api_v2/collector.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion proto-gen/api_v2/query.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion proto-gen/api_v2/sampling.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package jaeger
import (
_ "honnef.co/go/tools/cmd/staticcheck"

_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger"
_ "github.com/mjibson/esc"
_ "github.com/securego/gosec/cmd/gosec"
_ "github.com/vektra/mockery/cmd/mockery"
Expand Down

0 comments on commit 082861c

Please sign in to comment.