Skip to content

Commit d9c466c

Browse files
committed
Add leeway script to update protobuf generated code
1 parent 7d1844b commit d9c466c

File tree

4 files changed

+37
-33
lines changed

4 files changed

+37
-33
lines changed

components/BUILD.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,16 @@ scripts:
8787
+ if .payload == null then "" else .payload | " payload:" + tostring end
8888
+ if .error == null then "" else .error | "\n" + tostring end
8989
) catch $line'
90+
- name: generate-code-from-protobuf
91+
srcs:
92+
- components/**/*
93+
script: |
94+
COMPONENTS=( content-service-api image-builder-api registry-facade-api supervisor-api ws-daemon-api ws-manager-api )
95+
96+
for COMPONENT in "${COMPONENTS[@]}";do
97+
echo "Generating code for component $COMPONENT..."
98+
pushd $COMPONENT > /dev/null
99+
leeway build components/$COMPONENT/typescript:lib
100+
./generate.sh
101+
popd > /dev/null
102+
done

components/supervisor-api/generate.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ local_go_protoc() {
2828
-I /usr/lib/protoc/include -I$COMPONENTS_DIR -I. -I$THIRD_PARTY_INCLUDES \
2929
--go_out=go \
3030
--go_opt=paths=source_relative \
31+
--go-grpc_out=go \
32+
--go-grpc_opt=paths=source_relative \
3133
*.proto
3234
}
3335

scripts/protoc-generator.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
#!/bin/bash
22

3-
# TODO (aledbf) remove nvm dependency
4-
source /home/gitpod/.nvm/nvm.sh || true
5-
63
install_dependencies() {
7-
go get google.golang.org/protobuf/cmd/protoc-gen-go
8-
go get google.golang.org/protobuf/runtime/[email protected]
9-
go get google.golang.org/protobuf/reflect/[email protected]
10-
go get google.golang.org/protobuf/types/known/[email protected]
4+
go install google.golang.org/protobuf/cmd/[email protected]
5+
6+
go get google.golang.org/protobuf/runtime/[email protected]
7+
go get google.golang.org/protobuf/reflect/[email protected]
8+
go get google.golang.org/protobuf/types/known/[email protected]
119

12-
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc
10+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
1311

1412
go get github.com/golang/mock/[email protected]
1513

@@ -34,6 +32,8 @@ typescript_protoc() {
3432

3533
pushd typescript > /dev/null
3634

35+
yarn add [email protected] -d
36+
3737
rm -rf $MODULE_DIR/typescript/src/*pb*.*
3838

3939
protoc \

yarn.lock

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4608,7 +4608,7 @@
46084608
"@types/history" "*"
46094609
"@types/react" "*"
46104610

4611-
"@types/react@*", "@types/react@17.0.0", "@types/react@^17.0.0":
4611+
"@types/react@*", "@types/react@^17.0.0":
46124612
version "17.0.0"
46134613
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8"
46144614
integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw==
@@ -11335,6 +11335,15 @@ grpc@^1.21.1:
1133511335
node-pre-gyp "^0.15.0"
1133611336
protobufjs "^5.0.3"
1133711337

11338+
11339+
version "5.1.3"
11340+
resolved "https://registry.yarnpkg.com/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.1.3.tgz#c24d6470b6f0204a7ec920cee0f057fcb11eea66"
11341+
integrity sha512-BiElSWEmRgrhWFV/+yFtRiqxC3D/nrk1g0GezJ/9ZrJxUvu/0sBVeqe4rTmkFFqQVZTRX1+MNOVeOJKDmQ41Xg==
11342+
dependencies:
11343+
google-protobuf "3.12.4"
11344+
handlebars "4.7.6"
11345+
handlebars-helpers "0.10.0"
11346+
1133811347
grpc_tools_node_protoc_ts@^5.1.0:
1133911348
version "5.1.0"
1134011349
resolved "https://registry.yarnpkg.com/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.1.0.tgz#7ff0706bedc8902187fc1163bcd307156206c91d"
@@ -14921,7 +14930,7 @@ mz@^2.4.0:
1492114930
object-assign "^4.0.1"
1492214931
thenify-all "^1.0.0"
1492314932

14924-
nan@2.14.1, nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.9.2:
14933+
nan@^2.12.1, nan@^2.13.2, nan@^2.9.2:
1492514934
version "2.14.1"
1492614935
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
1492714936
integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
@@ -15491,13 +15500,6 @@ onetime@^5.1.0:
1549115500
dependencies:
1549215501
mimic-fn "^2.1.0"
1549315502

15494-
15495-
version "7.2.1"
15496-
resolved "https://registry.yarnpkg.com/oniguruma/-/oniguruma-7.2.1.tgz#51775834f7819b6e31aa878706aa7f65ad16b07f"
15497-
integrity sha512-WPS/e1uzhswPtJSe+Zls/kAj27+lEqZjCmRSjnYk/Z4L2Mu+lJC2JWtkZhPJe4kZeTQfz7ClcLyXlI4J68MG2w==
15498-
dependencies:
15499-
nan "^2.14.0"
15500-
1550115503
open@^7.0.2:
1550215504
version "7.4.2"
1550315505
resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
@@ -17658,7 +17660,7 @@ react-dev-utils@^11.0.2:
1765817660
strip-ansi "6.0.0"
1765917661
text-table "0.2.0"
1766017662

17661-
react-dom@17.0.1, react-dom@^17.0.1:
17663+
react-dom@^17.0.1:
1766217664
version "17.0.1"
1766317665
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
1766417666
integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
@@ -17787,7 +17789,7 @@ [email protected]:
1778717789
optionalDependencies:
1778817790
fsevents "^2.1.3"
1778917791

17790-
react@17.0.1, react@^17.0.1:
17792+
react@^17.0.1:
1779117793
version "17.0.1"
1779217794
resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
1779317795
integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
@@ -21036,24 +21038,11 @@ vm-browserify@^1.0.1:
2103621038
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
2103721039
integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
2103821040

21039-
vscode-jsonrpc@^5.0.0, vscode-jsonrpc@^5.0.1:
21041+
vscode-jsonrpc@^5.0.0:
2104021042
version "5.0.1"
2104121043
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794"
2104221044
integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==
2104321045

21044-
21045-
version "3.15.3"
21046-
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz#3fa9a0702d742cf7883cb6182a6212fcd0a1d8bb"
21047-
integrity sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==
21048-
dependencies:
21049-
vscode-jsonrpc "^5.0.1"
21050-
vscode-languageserver-types "3.15.1"
21051-
21052-
21053-
version "3.15.1"
21054-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
21055-
integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
21056-
2105721046
vscode-uri@^1.0.1:
2105821047
version "1.0.8"
2105921048
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"

0 commit comments

Comments
 (0)