Skip to content

Commit e7ae8d8

Browse files
govargoRobert Bailey
govargo
and
Robert Bailey
authored
Migrade from github.com/golang/protobuf to google.golang.org/protobuf (googleforgames#2786)
Co-authored-by: Robert Bailey <[email protected]>
1 parent 8cde4bc commit e7ae8d8

File tree

762 files changed

+111574
-35397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

762 files changed

+111574
-35397
lines changed

‎build/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ Table of Contents
6565
* [make gen-install](#make-gen-install)
6666
* [make gen-embedded-openapi](#make-gen-embedded-openapi)
6767
* [make gen-crd-client](#make-gen-crd-client)
68+
* [make gen-allocation-grpc](#make-gen-allocation-grpc)
6869
* [make gen-all-sdk-grpc](#make-gen-all-sdk-grpc)
6970
* [make gen-sdk-grpc](#make-gen-sdk-grpc)
7071
* [Build Image Targets](#build-image-targets)
@@ -664,6 +665,9 @@ This should be run against a clean or brand new cluster, as external CRD's or sc
664665
#### `make gen-crd-client`
665666
Generate the Custom Resource Definition client(s)
666667

668+
#### `make gen-allocation-grpc`
669+
Generate the allocator gRPC code
670+
667671
#### `make gen-all-sdk-grpc`
668672
Generate the SDK gRPC server and client code for all SDKs.
669673

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

+35-14
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,56 @@
1616

1717
set -ex
1818

19+
header() {
20+
cat /go/src/agones.dev/agones/build/boilerplate.go.txt "$1" | sponge "$1"
21+
}
22+
1923
export GO111MODULE=on
2024

2125
mkdir -p /go/src/
2226
cp -r /go/src/agones.dev/agones/vendor/* /go/src/
2327

2428
cd /go/src/agones.dev/agones
25-
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
26-
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
29+
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway
30+
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2
2731

2832
outputpath=pkg/allocation/go
2933
protopath=proto/allocation
3034
googleapis=/go/src/agones.dev/agones/proto/googleapis
35+
gatewaygrpc=/go/src/agones.dev/agones/proto/grpc-gateway
3136
protofile=${protopath}/allocation.proto
3237

38+
rm ./${outputpath}/allocation.pb.go || true
39+
rm ./${outputpath}/allocation.gw.pb.go || true
40+
rm ./${outputpath}/allocation_grpc.pb.go || true
41+
42+
# generate the go code
43+
protoc -I ${googleapis} -I ${gatewaygrpc} -I . -I ./vendor ${protofile} --go_out=proto --go-grpc_opt=require_unimplemented_servers=false --go-grpc_out=proto
44+
45+
# generate grpc gateway
46+
protoc -I ${googleapis} -I ${gatewaygrpc} -I . -I ./vendor ${protofile} --go_out=proto --grpc-gateway_out=logtostderr=true:proto
47+
48+
# generate openapi v2
49+
protoc -I ${googleapis} -I ${gatewaygrpc} -I . -I ./vendor ${protofile} --openapiv2_opt=logtostderr=true,simple_operation_ids=true,disable_default_errors=true --openapiv2_out=json_names_for_fields=false,logtostderr=true:.
50+
51+
# hard coding because protoc-gen-openapiv2 doesn't work well in description
52+
cat ./${protopath}/allocation.swagger.json | jq '.definitions.allocationAllocationRequest.properties.multiClusterSetting |= .+{"description": "If specified, multi-cluster policies are applied. Otherwise, allocation will happen locally."}' | sponge ./${protopath}/allocation.swagger.json
53+
cat ./${protopath}/allocation.swagger.json | jq '.definitions.allocationAllocationRequest.properties.requiredGameServerSelector |= .+{"description": "Deprecated: Please use gameServerSelectors instead. This field is ignored if the\ngameServerSelectors field is set\nThe required allocation. Defaults to all GameServers."}' | sponge ./${protopath}/allocation.swagger.json
54+
cat ./${protopath}/allocation.swagger.json | jq '.definitions.allocationAllocationRequest.properties.scheduling |= .+{"description": "Scheduling strategy. Defaults to \"Packed\"."}' | sponge ./${protopath}/allocation.swagger.json
55+
cat ./${protopath}/allocation.swagger.json | jq '.definitions.allocationAllocationRequest.properties.metaPatch |= .+{"title": "Deprecated: Please use metadata instead. This field is ignored if the\nmetadata field is set"}' | sponge ./${protopath}/allocation.swagger.json
56+
cat ./${protopath}/allocation.swagger.json | jq '.definitions.allocationAllocationRequest.properties.metadata |= .+{"title": "Metadata is optional custom metadata that is added to the game server at\nallocation. You can use this to tell the server necessary session data"}' | sponge ./${protopath}/allocation.swagger.json
57+
cat ./${protopath}/allocation.swagger.json | jq '.definitions.allocationMultiClusterSetting.properties.policySelector |= .+{"description": "Selects multi-cluster allocation policies to apply. If not specified, all multi-cluster allocation policies are to be applied."}' | sponge ./${protopath}/allocation.swagger.json
3358

34-
protoc -I ${googleapis} -I . -I ./vendor ${protofile} --go_out=plugins=grpc:.
35-
protoc -I ${googleapis} -I . -I ./vendor ${protofile} --grpc-gateway_out=logtostderr=true:.
36-
protoc -I ${googleapis} -I . -I ./vendor ${protofile} --swagger_out=logtostderr=true:.
3759
jq 'del(.schemes[] | select(. == "http"))' ./${protopath}/allocation.swagger.json > ./${outputpath}/allocation.swagger.json
3860

39-
cat ./build/boilerplate.go.txt ./${protopath}/allocation.pb.go >> ./allocation.pb.go
40-
cat ./build/boilerplate.go.txt ./${protopath}/allocation.pb.gw.go >> ./allocation.pb.gw.go
61+
rm ${protopath}/allocation.swagger.json
4162

42-
goimports -w ./allocation.pb.go
43-
goimports -w ./allocation.pb.gw.go
63+
header ${protopath}/allocation.pb.go
64+
header ${protopath}/allocation.pb.gw.go
65+
header ${protopath}/allocation_grpc.pb.go
4466

45-
mv ./allocation.pb.go ./${outputpath}/allocation.pb.go
46-
mv ./allocation.pb.gw.go ./${outputpath}/allocation.gw.pb.go
67+
mv ${protopath}/allocation.pb.go ${outputpath}/allocation.pb.go
68+
mv ${protopath}/allocation.pb.gw.go ${outputpath}/allocation.pb.gw.go
69+
mv ${protopath}/allocation_grpc.pb.go ${outputpath}/allocation_grpc.pb.go
4770

48-
rm ./${protopath}/allocation.pb.go
49-
rm ./${protopath}/allocation.pb.gw.go
50-
rm ./${protopath}/allocation.swagger.json
71+
goimports -w ./${outputpath}

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

+11-2
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,23 @@ header() {
2222

2323
sdk=/go/src/agones.dev/agones/proto/sdk
2424
googleapis=/go/src/agones.dev/agones/proto/googleapis
25+
gatewaygrpc=/go/src/agones.dev/agones/proto/grpc-gateway
2526
protoc_intermediate=/go/src/agones.dev/agones/sdks/cpp/.generated
2627
protoc_destination=/go/src/agones.dev/agones/sdks/cpp
2728

2829
mkdir -p ${protoc_intermediate}
2930
mkdir -p ${protoc_destination}/src/agones
3031
mkdir -p ${protoc_destination}/src/google
32+
mkdir -p ${protoc_destination}/src/protoc-gen-openapiv2
3133
mkdir -p ${protoc_destination}/include/agones
3234
mkdir -p ${protoc_destination}/include/google/api
35+
mkdir -p ${protoc_destination}/include/protoc-gen-openapiv2/options
3336

3437
cd /go/src/agones.dev/agones/sdks/cpp
3538
find -name '*.pb.*' -delete
3639
cd /go/src/agones.dev/agones
37-
protoc -I ${googleapis} -I ${sdk} --grpc_out=${protoc_intermediate} --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` sdk.proto
38-
protoc -I ${googleapis} -I ${sdk} --cpp_out=dllexport_decl=AGONES_EXPORT:${protoc_intermediate} sdk.proto ${googleapis}/google/api/annotations.proto ${googleapis}/google/api/http.proto
40+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk} --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` --grpc_out=${protoc_intermediate} sdk.proto
41+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk} --cpp_out=dllexport_decl=AGONES_EXPORT:${protoc_intermediate} sdk.proto ${googleapis}/google/api/annotations.proto ${googleapis}/google/api/http.proto ${gatewaygrpc}/protoc-gen-openapiv2/options/annotations.proto ${gatewaygrpc}/protoc-gen-openapiv2/options/openapiv2.proto
3942

4043
cd ${protoc_intermediate}
4144
header sdk.grpc.pb.cc ${protoc_destination}/src/agones
@@ -49,4 +52,10 @@ header http.pb.cc ${protoc_destination}/src/google
4952
header annotations.pb.h ${protoc_destination}/include/google/api
5053
header http.pb.h ${protoc_destination}/include/google/api
5154

55+
cd ${protoc_intermediate}/protoc-gen-openapiv2/options
56+
header annotations.pb.cc ${protoc_destination}/src/protoc-gen-openapiv2
57+
header openapiv2.pb.cc ${protoc_destination}/src/protoc-gen-openapiv2
58+
header annotations.pb.h ${protoc_destination}/include/protoc-gen-openapiv2/options
59+
header openapiv2.pb.h ${protoc_destination}/include/protoc-gen-openapiv2/options
60+
5261
rm -r ${protoc_intermediate}

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

+45-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,52 @@
1616

1717
set -ex
1818

19+
header() {
20+
cat /go/src/agones.dev/agones/build/boilerplate.go.txt "$1" | sponge "$1"
21+
}
22+
1923
sdk=/go/src/agones.dev/agones/proto/sdk
2024
googleapis=/go/src/agones.dev/agones/proto/googleapis
25+
protoc_intermediate=/go/src/agones.dev/agones/sdks/csharp/proto
2126
protoc_destination=/go/src/agones.dev/agones/sdks/csharp/sdk/generated
2227

23-
# Generate C# proto file `Sdk.cs`
24-
protoc --csharp_out=${protoc_destination} -I ${sdk} -I ${googleapis} --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` sdk.proto
25-
protoc --csharp_out=${protoc_destination} -I ${sdk}/alpha -I ${googleapis} --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` alpha.proto
26-
# Generate proto stub?
27-
protoc --grpc_out=${protoc_destination} -I ${sdk} -I ${googleapis} --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` sdk.proto
28-
protoc --grpc_out=${protoc_destination} -I ${sdk}/alpha -I ${googleapis} --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` alpha.proto
28+
# Create temporary proto files
29+
mkdir -p ${protoc_intermediate}
30+
cp -r ${sdk} ${protoc_intermediate}
31+
32+
# Remove protoc-gen-openapiv2 definitions because C# package doesn't support grpc-gateway
33+
sed -i -e 's/import "protoc-gen-openapiv2\/options\/annotations.proto";//' ${protoc_intermediate}/sdk/sdk.proto
34+
sed -i -e 's/option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {//' ${protoc_intermediate}/sdk/sdk.proto
35+
sed -i -e 's/info: {//' ${protoc_intermediate}/sdk/sdk.proto
36+
sed -i -e 's/title: "sdk.proto";//' ${protoc_intermediate}/sdk/sdk.proto
37+
sed -i -z 's/version: "version not set";\n };//' ${protoc_intermediate}/sdk/sdk.proto
38+
sed -i -e 's/schemes: HTTP;//' ${protoc_intermediate}/sdk/sdk.proto
39+
sed -i -e 's/consumes: "application\/json";//' ${protoc_intermediate}/sdk/sdk.proto
40+
sed -i -z 's/produces: "application\/json";\n};//' ${protoc_intermediate}/sdk/sdk.proto
41+
sed -i -e 's/bool disabled = 1.*/bool disabled = 1;/' ${protoc_intermediate}/sdk/sdk.proto
42+
43+
sed -i -e 's/import "protoc-gen-openapiv2\/options\/annotations.proto";//' ${protoc_intermediate}/sdk/alpha/alpha.proto
44+
sed -i -e 's/option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {//' ${protoc_intermediate}/sdk/alpha/alpha.proto
45+
sed -i -e 's/info: {//' ${protoc_intermediate}/sdk/alpha/alpha.proto
46+
sed -i -e 's/title: "alpha.proto";//' ${protoc_intermediate}/sdk/alpha/alpha.proto
47+
sed -i -z 's/version: "version not set";\n };//' ${protoc_intermediate}/sdk/alpha/alpha.proto
48+
sed -i -e 's/schemes: HTTP;//' ${protoc_intermediate}/sdk/alpha/alpha.proto
49+
sed -i -e 's/consumes: "application\/json";//' ${protoc_intermediate}/sdk/alpha/alpha.proto
50+
sed -i -z 's/produces: "application\/json";\n};//' ${protoc_intermediate}/sdk/alpha/alpha.proto
51+
sed -i -e 's/bool bool = 1.*/bool bool = 1;/' ${protoc_intermediate}/sdk/alpha/alpha.proto
52+
53+
# Generate C# proto file like `Sdk.cs`
54+
protoc -I ${googleapis} -I ${protoc_intermediate}/sdk --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` --csharp_out=${protoc_destination} ${protoc_intermediate}/sdk/sdk.proto
55+
protoc -I ${googleapis} -I ${protoc_intermediate}/sdk/alpha --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` --csharp_out=${protoc_destination} ${protoc_intermediate}/sdk/alpha/alpha.proto
56+
57+
# Generate grpc file like `SdkGrpc.cs`
58+
protoc -I ${googleapis} -I ${protoc_intermediate}/sdk --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` --grpc_out=${protoc_destination} ${protoc_intermediate}/sdk/sdk.proto
59+
protoc -I ${googleapis} -I ${protoc_intermediate}/sdk/alpha --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` --grpc_out=${protoc_destination} ${protoc_intermediate}/sdk/alpha/alpha.proto
60+
61+
cd ${protoc_destination}
62+
header Alpha.cs
63+
header AlphaGrpc.cs
64+
header Sdk.cs
65+
header SdkGrpc.cs
66+
67+
rm -rf ${protoc_intermediate}

‎build/build-sdk-images/go/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
2828

2929
ENV PATH /usr/local/go/bin:/go/bin:$PATH
3030

31-
# install go-proto-gen 1.1
32-
RUN go install github.com/golang/protobuf/[email protected] && \
31+
# install protoc-gen-go
32+
RUN go install google.golang.org/protobuf/cmd/[email protected] && \
33+
go install google.golang.org/grpc/cmd/[email protected] && \
3334
go install golang.org/x/tools/cmd/goimports@latest
3435

3536

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

+24-15
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,52 @@ header() {
2222

2323
sdk=/go/src/agones.dev/agones/proto/sdk
2424
googleapis=/go/src/agones.dev/agones/proto/googleapis
25+
gatewaygrpc=/go/src/agones.dev/agones/proto/grpc-gateway
2526

2627
export GO111MODULE=on
2728

2829
mkdir -p /go/src/
2930
cp -r /go/src/agones.dev/agones/vendor/* /go/src/
3031

3132
cd /go/src/agones.dev/agones
32-
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
33-
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
33+
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway
34+
go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2
3435

3536
mkdir -p ./pkg/sdk/{alpha,beta} || true
3637

38+
rm ./pkg/sdk/beta/beta.pb.go || true
39+
rm ./pkg/sdk/alpha/alpha.pb.go || true
40+
rm ./pkg/sdk/beta/beta_grpc.pb.go || true
41+
rm ./pkg/sdk/alpha/alpha_grpc.pb.go || true
3742
rm ./pkg/sdk/beta/beta.pb.gw.go || true
3843
rm ./pkg/sdk/alpha/alpha.pb.gw.go || true
3944

4045
# generate the go code for each feature stage
41-
protoc -I ${googleapis} -I ${sdk} sdk.proto --go_out=plugins=grpc:pkg/sdk
42-
protoc -I ${googleapis} -I ${sdk}/alpha alpha.proto --go_out=plugins=grpc:pkg/sdk/alpha
43-
protoc -I ${googleapis} -I ${sdk}/beta beta.proto --go_out=plugins=grpc:pkg/sdk/beta
46+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk} sdk.proto --go_out=pkg --go-grpc_opt=require_unimplemented_servers=false --go-grpc_out=pkg
47+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/alpha alpha.proto --go_out=pkg/sdk --go-grpc_opt=require_unimplemented_servers=false --go-grpc_out=pkg/sdk
48+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/beta beta.proto --go_out=pkg/sdk --go-grpc_opt=require_unimplemented_servers=false --go-grpc_out=pkg/sdk
4449

4550
# generate grpc gateway
46-
protoc -I ${googleapis} -I ${sdk} sdk.proto --grpc-gateway_out=logtostderr=true:pkg/sdk
47-
protoc -I ${googleapis} -I ${sdk}/alpha alpha.proto --grpc-gateway_out=logtostderr=true:pkg/sdk/alpha
48-
protoc -I ${googleapis} -I ${sdk}/beta beta.proto --grpc-gateway_out=logtostderr=true:pkg/sdk/beta
51+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk} sdk.proto --grpc-gateway_out=logtostderr=true:pkg
52+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/alpha alpha.proto --grpc-gateway_out=logtostderr=true:pkg/sdk
53+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/beta beta.proto --grpc-gateway_out=logtostderr=true:pkg/sdk
4954

50-
protoc -I ${googleapis} -I ${sdk} sdk.proto --swagger_out=logtostderr=true:sdks/swagger
51-
protoc -I ${googleapis} -I ${sdk}/alpha alpha.proto --swagger_out=logtostderr=true:sdks/swagger
52-
protoc -I ${googleapis} -I ${sdk}/beta beta.proto --swagger_out=logtostderr=true:sdks/swagger
55+
# generate openapi v2
56+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk} sdk.proto --openapiv2_opt=logtostderr=true,simple_operation_ids=true,disable_default_errors=true --openapiv2_out=json_names_for_fields=false,logtostderr=true:sdks/swagger
57+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/alpha alpha.proto --openapiv2_opt=logtostderr=true,simple_operation_ids=true,disable_default_errors=true --openapiv2_out=json_names_for_fields=false,logtostderr=true:sdks/swagger
58+
protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/beta beta.proto --openapiv2_opt=logtostderr=true,simple_operation_ids=true,disable_default_errors=true --openapiv2_out=json_names_for_fields=false,logtostderr=true:sdks/swagger
5359

54-
jq 'del(.schemes[] | select(. == "https"))' ./sdks/swagger/sdk.swagger.json | sponge ./sdks/swagger/sdk.swagger.json
55-
jq 'del(.schemes[] | select(. == "https"))' ./sdks/swagger/alpha.swagger.json | sponge ./sdks/swagger/alpha.swagger.json
56-
jq 'del(.schemes[] | select(. == "https"))' ./sdks/swagger/beta.swagger.json | sponge ./sdks/swagger/beta.swagger.json
60+
# hard coding because protoc-gen-openapiv2 doesn't work well in Stream and doesn't generate 'googlerpcStatus' and 'protobufAny' definitions
61+
cat sdks/swagger/sdk.swagger.json | jq '.definitions |= .+{"googlerpcStatus": {"type": "object", "properties": { "code": { "type": "integer", "format": "int32"}, "message": { "type":"string"}, "details": { "type": "array", "items": { "$ref": "#/definitions/protobufAny"}}}}}' | sponge sdks/swagger/sdk.swagger.json
62+
cat sdks/swagger/sdk.swagger.json | jq '.definitions |= .+{"protobufAny": { "type": "object", "properties": { "@type": { "type": "string" }}, "additionalProperties": {}},}' | sponge sdks/swagger/sdk.swagger.json
5763

5864
header ./pkg/sdk/sdk.pb.go
59-
header ./pkg/sdk/sdk.pb.gw.go
6065
header ./pkg/sdk/alpha/alpha.pb.go
6166
header ./pkg/sdk/beta/beta.pb.go
67+
header ./pkg/sdk/sdk.pb.gw.go
68+
header ./pkg/sdk/sdk_grpc.pb.go
69+
header ./pkg/sdk/alpha/alpha_grpc.pb.go
70+
header ./pkg/sdk/beta/beta_grpc.pb.go
6271

6372
# these files may not exist if there are no grpc services
6473
if [ -f "./pkg/sdk/alpha/alpha.pb.gw.go" ]; then

‎build/build-sdk-images/node/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN echo "deb-src [signed-by=$KEYRING] https://deb.nodesource.com/$VERSION $DIST
3535
RUN apt-get update && apt-get install -y nodejs
3636

3737
# Installing request is to address a bug with node-pre-gyp
38-
RUN npm install --unsafe-perm --global [email protected] grpc-tools@1.8.1
38+
RUN npm install --unsafe-perm --global [email protected] grpc-tools@1.11.3
3939

4040
# code generation scripts
4141
COPY *.sh /root/

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

+11-4
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,28 @@ header() {
2222

2323
sdk=/go/src/agones.dev/agones/proto/sdk
2424
googleapis=/go/src/agones.dev/agones/proto/googleapis
25+
gatewaygrpc=/go/src/agones.dev/agones/proto/grpc-gateway
2526

2627
mkdir -p ./sdks/nodejs/lib/alpha
2728

2829
cd /go/src/agones.dev/agones
2930

30-
grpc_tools_node_protoc --proto_path=${googleapis} --proto_path=${sdk} --js_out=import_style=commonjs,binary:./sdks/nodejs/lib google/api/annotations.proto google/api/http.proto
31-
grpc_tools_node_protoc --proto_path=${googleapis} --proto_path=${sdk}/alpha --js_out=import_style=commonjs,binary:./sdks/nodejs/lib/alpha google/api/annotations.proto google/api/http.proto
31+
grpc_tools_node_protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk} --js_out=import_style=commonjs,binary:./sdks/nodejs/lib google/api/annotations.proto google/api/http.proto protoc-gen-openapiv2/options/annotations.proto protoc-gen-openapiv2/options/openapiv2.proto
32+
grpc_tools_node_protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/alpha --js_out=import_style=commonjs,binary:./sdks/nodejs/lib/alpha google/api/annotations.proto google/api/http.proto protoc-gen-openapiv2/options/annotations.proto protoc-gen-openapiv2/options/openapiv2.proto
3233

33-
grpc_tools_node_protoc --proto_path=${googleapis} --proto_path=${sdk} --grpc_out=generate_package_definition:./sdks/nodejs/lib --js_out=import_style=commonjs,binary:./sdks/nodejs/lib sdk.proto
34-
grpc_tools_node_protoc --proto_path=${googleapis} --proto_path=${sdk}/alpha --grpc_out=generate_package_definition:./sdks/nodejs/lib/alpha --js_out=import_style=commonjs,binary:./sdks/nodejs/lib/alpha alpha.proto
34+
grpc_tools_node_protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk} --grpc_out=generate_package_definition:./sdks/nodejs/lib --js_out=import_style=commonjs,binary:./sdks/nodejs/lib sdk.proto
35+
grpc_tools_node_protoc -I ${googleapis} -I ${gatewaygrpc} -I ${sdk}/alpha --grpc_out=generate_package_definition:./sdks/nodejs/lib/alpha --js_out=import_style=commonjs,binary:./sdks/nodejs/lib/alpha alpha.proto
3536

3637
header ./sdks/nodejs/lib/sdk_pb.js
38+
header ./sdks/nodejs/lib/sdk_grpc_pb.js
3739
header ./sdks/nodejs/lib/google/api/annotations_pb.js
3840
header ./sdks/nodejs/lib/google/api/http_pb.js
41+
header ./sdks/nodejs/lib/protoc-gen-openapiv2/options/annotations_pb.js
42+
header ./sdks/nodejs/lib/protoc-gen-openapiv2/options/openapiv2_pb.js
3943

4044
header ./sdks/nodejs/lib/alpha/alpha_pb.js
45+
header ./sdks/nodejs/lib/alpha/alpha_grpc_pb.js
4146
header ./sdks/nodejs/lib/alpha/google/api/annotations_pb.js
4247
header ./sdks/nodejs/lib/alpha/google/api/http_pb.js
48+
header ./sdks/nodejs/lib/alpha/protoc-gen-openapiv2/options/annotations_pb.js
49+
header ./sdks/nodejs/lib/alpha/protoc-gen-openapiv2/options/openapiv2_pb.js

0 commit comments

Comments
 (0)