From 3b294c586ae4ba372988a6d6109a34e03d80f954 Mon Sep 17 00:00:00 2001 From: Justin Schuldt Date: Wed, 26 May 2021 14:07:59 -0500 Subject: [PATCH] Use full import path in proto's go_package Change-Id: I1f3592512804ad92506914eda67d9ce59effdc0e --- generate-protos.sh | 2 ++ proto/agent/v1/service.proto | 2 +- proto/node/v1/node.proto | 2 +- proto/publicrpc/v1/publicrpc.proto | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/generate-protos.sh b/generate-protos.sh index 2a63473db..5e69fec47 100755 --- a/generate-protos.sh +++ b/generate-protos.sh @@ -16,10 +16,12 @@ tools/bin/buf protoc \ -Iproto \ -Ithird_party/googleapis \ --plugin tools/bin/protoc-gen-go \ + --go_opt=module=github.com/certusone/wormhole/bridge/pkg \ --go_out=bridge/pkg/ proto/**/**/** tools/bin/buf protoc \ -Iproto \ -Ithird_party/googleapis \ --plugin tools/bin/protoc-gen-go-grpc \ + --go-grpc_opt=module=github.com/certusone/wormhole/bridge/pkg \ --go-grpc_out=bridge/pkg/ proto/**/**/** diff --git a/proto/agent/v1/service.proto b/proto/agent/v1/service.proto index 62230a4ca..2cf8c24ae 100644 --- a/proto/agent/v1/service.proto +++ b/proto/agent/v1/service.proto @@ -4,7 +4,7 @@ package agent.v1; // TODO: documentation -option go_package = "proto/agent/v1;agentv1"; +option go_package = "github.com/certusone/wormhole/bridge/pkg/proto/agent/v1;agentv1"; service Agent { rpc SubmitVAA (SubmitVAARequest) returns (SubmitVAAResponse); diff --git a/proto/node/v1/node.proto b/proto/node/v1/node.proto index 278a7e79e..a4e3565c3 100644 --- a/proto/node/v1/node.proto +++ b/proto/node/v1/node.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package node.v1; -option go_package = "proto/node/v1;nodev1"; +option go_package = "github.com/certusone/wormhole/bridge/pkg/proto/node/v1;nodev1"; import "google/api/annotations.proto"; diff --git a/proto/publicrpc/v1/publicrpc.proto b/proto/publicrpc/v1/publicrpc.proto index 7d688a9ac..e1a43184d 100644 --- a/proto/publicrpc/v1/publicrpc.proto +++ b/proto/publicrpc/v1/publicrpc.proto @@ -4,7 +4,7 @@ syntax = "proto3"; package publicrpc.v1; // only relevant for Go namespace -option go_package = "proto/publicrpc/v1;publicrpcv1"; +option go_package = "github.com/certusone/wormhole/bridge/pkg/proto/publicrpc/v1;publicrpcv1"; // public import will include the required types in the Go output import public "gossip/v1/gossip.proto";