Skip to content

Commit b8242b0

Browse files
heartrobotninjamarkmandel
authored andcommitted
Add proto directory and update tooling.
Adding proto files to proto directory Adding proto files to proto directory
1 parent 063fc93 commit b8242b0

9 files changed

Lines changed: 591 additions & 180 deletions

File tree

‎build/build-image/gen-grpc-cpp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ header() {
2020
cat /go/src/agones.dev/agones/build/boilerplate.go.txt $1 >> /tmp/cpp/$1 && mv /tmp/cpp/$1 .
2121
}
2222

23-
googleapis=/go/src/agones.dev/agones/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
23+
googleapis=/go/src/agones.dev/agones/proto/googleapis
2424

2525
cd /go/src/agones.dev/agones/sdks/cpp
2626
find -name '*.pb.*' -delete

‎build/build-sdk-images/cpp/gen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ header() {
2020
cat /go/src/agones.dev/agones/build/boilerplate.go.txt ./$1 >> $2/$1
2121
}
2222

23-
googleapis=/go/src/agones.dev/agones/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
23+
googleapis=/go/src/agones.dev/agones/proto/googleapis
2424
protoc_intermediate=/go/src/agones.dev/agones/sdks/cpp/.generated
2525
protoc_destination=/go/src/agones.dev/agones/sdks/cpp
2626

‎build/build-sdk-images/go/gen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cd /go/src/agones.dev/agones
2525
go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
2626
go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
2727

28-
googleapis=/go/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
28+
googleapis=/go/src/agones.dev/agones/proto/googleapis
2929

3030

3131
protoc -I ${googleapis} -I . sdk.proto --go_out=plugins=grpc:pkg/sdk

‎build/build-sdk-images/node/gen.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ header() {
2020
cat ./build/boilerplate.go.txt $1 >> ./tmp.js && mv ./tmp.js $1
2121
}
2222

23-
googleapis=/go/src/agones.dev/agones/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
23+
googleapis=/go/src/agones.dev/agones/proto/googleapis
2424

2525
cd /go/src/agones.dev/agones
2626

2727
protoc -I ${googleapis} -I . --grpc_out=./sdks/nodejs/lib --plugin=protoc-gen-grpc=`which grpc_node_plugin` sdk.proto
28-
protoc -I ${googleapis} -I . --js_out=import_style=commonjs,binary:./sdks/nodejs/lib sdk.proto ${googleapis}/google/api/annotations.proto ${googleapis}/google/api/http.proto
28+
protoc -I ${googleapis} -I . --js_out=import_style=commonjs,binary:./sdks/nodejs/lib sdk.proto ${googleapis}/google/api/annotations.proto ${googleapis}/google/api/http.proto
2929

3030
header ./sdks/nodejs/lib/sdk_pb.js
3131
header ./sdks/nodejs/lib/google/api/annotations_pb.js

‎build/build-sdk-images/rust/gen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -ex
1818

19-
googleapis=/go/src/agones.dev/agones/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
19+
googleapis=/go/src/agones.dev/agones/proto/googleapis
2020

2121
cd /go/src/agones.dev/agones
2222

‎pkg/sdk/sdk.pb.go‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright (c) 2015, Google Inc.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
syntax = "proto3";
16+
17+
package google.api;
18+
19+
import "google/api/http.proto";
20+
import "google/protobuf/descriptor.proto";
21+
22+
option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
23+
option java_multiple_files = true;
24+
option java_outer_classname = "AnnotationsProto";
25+
option java_package = "com.google.api";
26+
option objc_class_prefix = "GAPI";
27+
28+
extend google.protobuf.MethodOptions {
29+
// See `HttpRule`.
30+
HttpRule http = 72295728;
31+
}

0 commit comments

Comments
 (0)