From 22f1b9e05ed4b1dc3f3e1f85426a27964b68a5f8 Mon Sep 17 00:00:00 2001 From: Gary Belvin Date: Thu, 16 Mar 2017 18:30:46 +0000 Subject: [PATCH] Update GoogleAPI import path The gRPC ecosystem project updated it's generators to reference the standard googleapi paths in grpc-ecosystem/grpc-gateway#325 This PR makes the same changes in this repo to follow the standard. --- impl/proto/keytransparency_v1_service/gen.go | 4 ++-- .../keytransparency_v1_service.pb.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/impl/proto/keytransparency_v1_service/gen.go b/impl/proto/keytransparency_v1_service/gen.go index f92ae8713..715d6d60d 100644 --- a/impl/proto/keytransparency_v1_service/gen.go +++ b/impl/proto/keytransparency_v1_service/gen.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. keytransparency_v1_service.proto +//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --go_out=,plugins=grpc:. keytransparency_v1_service.proto -//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --grpc-gateway_out=logtostderr=true:. keytransparency_v1_service.proto +//go:generate protoc -I=. -I=$GOPATH/src/ -I=$GOPATH/src/github.com/googleapis/googleapis/ --grpc-gateway_out=logtostderr=true:. keytransparency_v1_service.proto package keytransparency_v1_service diff --git a/impl/proto/keytransparency_v1_service/keytransparency_v1_service.pb.go b/impl/proto/keytransparency_v1_service/keytransparency_v1_service.pb.go index b50909c43..93ea1de3e 100644 --- a/impl/proto/keytransparency_v1_service/keytransparency_v1_service.pb.go +++ b/impl/proto/keytransparency_v1_service/keytransparency_v1_service.pb.go @@ -22,7 +22,7 @@ import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" import keytransparency_v1_types "github.com/google/keytransparency/core/proto/keytransparency_v1_types" -import _ "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api" +import _ "google.golang.org/genproto/googleapis/api/annotations" import ( context "golang.org/x/net/context"