Skip to content

Add semantic versioning to proto IDL #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add semantic versioning to proto IDL #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cad4b3d
Add semantic versioning to proto IDL
earies Jul 7, 2022
e1280db
Fix typos for SUBSCRIBE/UNSUBSCRIBE in tunnel.proto/tunnel.go
earies Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 50 additions & 47 deletions cmd/target/proto/config/target_config.pb.go
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions cmd/target/proto/config/target_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@
// limitations under the License.
//

// Version: 0.1

syntax = "proto3";

import "github.com/openconfig/grpctunnel/proto/types/types.proto";

package targetconfig;

option (grpctunnel.types.version) = "0.1.0";

option go_package = "github.com/openconfig/grpctunnel/cmd/target/proto/targetconfig";

message TLS {
Expand Down
17 changes: 14 additions & 3 deletions compile_protos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,19 @@

set -euo pipefail

proto_imports=".:${GOPATH}/src/google.golang.org/protobuf:${GOPATH}/src"
proto_imports=".:${GOPATH}/src"

# Go
protoc -I=$proto_imports --go_out=paths=source_relative:. proto/tunnel/tunnel.proto --go-grpc_out=.
protoc -I=$proto_imports --go_out=paths=source_relative:. cmd/target/proto/config/target_config.proto --go-grpc_out=.
protoc -I="${proto_imports}" \
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
--go_out=. --go_opt=paths=source_relative proto/types/types.proto

protoc -I="${proto_imports}" \
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
--go_opt=Mproto/types/types.proto=github.com/openconfig/grpctunnel/proto/types \
--go_out=. --go_opt=paths=source_relative proto/tunnel/tunnel.proto

protoc -I="${proto_imports}" \
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
--go_opt=Mproto/types/types.proto=github.com/openconfig/grpctunnel/proto/types \
--go_out=. --go_opt=paths=source_relative cmd/target/proto/config/target_config.proto
2 changes: 0 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ go 1.14

require (
github.com/cenkalti/backoff/v4 v4.1.1
github.com/golang/protobuf v1.5.2
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20210811021853-ddbe55d93216 // indirect
google.golang.org/grpc v1.40.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
google.golang.org/protobuf v1.27.1
)
Loading