Skip to content

Commit cad4b3d

Browse files
committed
Add semantic versioning to proto IDL
* (A) proto/types/types.proto - Addition of types module for version extension * (M) proto/tunnel/tunnel.proto * (M) cmd/target/proto/config/target_config.proto - Adjust versioning to semver utilizing the new extension * (M) compile_protos.sh - Adjust protoc compilation, tidy up go mod and regenerate golang stubs
1 parent 125331e commit cad4b3d

File tree

9 files changed

+300
-158
lines changed

9 files changed

+300
-158
lines changed

cmd/target/proto/config/target_config.pb.go

Lines changed: 49 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/target/proto/config/target_config.proto

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
// limitations under the License.
1515
//
1616

17-
// Version: 0.1
18-
1917
syntax = "proto3";
2018

19+
import "github.com/openconfig/grpctunnel/proto/types/types.proto";
20+
2121
package targetconfig;
2222

23+
option (grpctunnel.types.version) = "0.1.0";
24+
2325
option go_package = "github.com/openconfig/grpctunnel/cmd/target/proto/targetconfig";
2426

2527
message TLS {

compile_protos.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,19 @@
1616

1717
set -euo pipefail
1818

19-
proto_imports=".:${GOPATH}/src/google.golang.org/protobuf:${GOPATH}/src"
19+
proto_imports=".:${GOPATH}/src"
2020

2121
# Go
22-
protoc -I=$proto_imports --go_out=paths=source_relative:. proto/tunnel/tunnel.proto --go-grpc_out=.
23-
protoc -I=$proto_imports --go_out=paths=source_relative:. cmd/target/proto/config/target_config.proto --go-grpc_out=.
22+
protoc -I="${proto_imports}" \
23+
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
24+
--go_out=. --go_opt=paths=source_relative proto/types/types.proto
25+
26+
protoc -I="${proto_imports}" \
27+
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
28+
--go_opt=Mproto/types/types.proto=github.com/openconfig/grpctunnel/proto/types \
29+
--go_out=. --go_opt=paths=source_relative proto/tunnel/tunnel.proto
30+
31+
protoc -I="${proto_imports}" \
32+
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
33+
--go_opt=Mproto/types/types.proto=github.com/openconfig/grpctunnel/proto/types \
34+
--go_out=. --go_opt=paths=source_relative cmd/target/proto/config/target_config.proto

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ go 1.14
44

55
require (
66
github.com/cenkalti/backoff/v4 v4.1.1
7-
github.com/golang/protobuf v1.5.2
87
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
98
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
109
golang.org/x/text v0.3.7 // indirect
1110
google.golang.org/genproto v0.0.0-20210811021853-ddbe55d93216 // indirect
1211
google.golang.org/grpc v1.40.0
13-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
1412
google.golang.org/protobuf v1.27.1
1513
)

0 commit comments

Comments
 (0)