Skip to content

Update grpc_tools_node_protoc_ts to 5.3.2 #38652

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

Closed
mdwn wants to merge 3 commits into from
Closed

Update grpc_tools_node_protoc_ts to 5.3.2 #38652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b21a8ed
Update grpc_tools_node_protoc_ts to 5.3.2
Feb 26, 2024
e1759ce
Update SHA in flake.nix.
Feb 27, 2024
c28e279
Revert generated code changes so that CI will pass.
Feb 27, 2024
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
4 changes: 2 additions & 2 deletions buf-js.gen.yaml
View file
Open in desktop
Copy link
Copy Markdown
Member

@ravicious ravicious Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, long term we want to get rid grpc_tools_node_protoc_ts because we have switched to protobuf-ts. See #37010 and:

teleport/build.assets/genproto.sh

Lines 75 to 94 in eb58a01

# Generate JS protos.
# TODO(ryan): remove once Connect has migrated to the TS protobufs.
[[ $skip_js -eq 0 ]] && echoed buf generate --template=buf-js.gen.yaml \
--path=proto/prehog/ \
--path=proto/teleport/lib/teleterm/ \
--path=api/proto/teleport/accesslist/ \
--path=api/proto/teleport/devicetrust/ \
--path=api/proto/teleport/header/ \
--path=api/proto/teleport/trait/ \
--path=api/proto/teleport/userpreferences/
# Generate TS protos.
[[ $skip_js -eq 0 ]] && echoed buf generate --template=buf-ts.gen.yaml \
--path=proto/prehog/ \
--path=proto/teleport/lib/teleterm/ \
--path=api/proto/teleport/accesslist/ \
--path=api/proto/teleport/devicetrust/ \
--path=api/proto/teleport/header/ \
--path=api/proto/teleport/trait/ \
--path=api/proto/teleport/userpreferences/

I saw your message on Slack about issues with Buildbox. If the version of grpc_tools_node_protoc_ts gives you troubles, you should be able to rip out buf-js.gen.yaml and its use from genproto.sh and leave the buildbox cleanup to us.

Copy link
Copy Markdown
Member

@ravicious ravicious Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v15 uses protobuf-ts, v13 and v14 continue to use grpc_tools_node_protoc_ts.

Copy link
Copy Markdown
Contributor Author

@mdwn mdwn Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any plan to use protobuf-ts for v13/v14 as well?

Copy link
Copy Markdown
Member

@ravicious ravicious Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the switch was done during the test plan in #36921 and we retested v15 soon after that. We wouldn't have time to do the same for v13 and v14 as well.

Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ plugins:
opt: grpc_js
path: grpc_tools_node_protoc_plugin

# https://github.com/agreatfool/grpc_tools_node_protoc_ts/tree/v5.0.1
# https://github.com/agreatfool/grpc_tools_node_protoc_ts/tree/v5.3.2
- name: ts
strategy: all
out: gen/proto/js
path:
- npm
- exec
- --yes
- --package=grpc_tools_node_protoc_ts@5.0.1
- --package=grpc_tools_node_protoc_ts@5.3.2
- --
- protoc-gen-ts
opt: "service=grpc-node"
4 changes: 2 additions & 2 deletions build.assets/flake/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
# These versions are not available from nixpkgs
gogoVersion = "v1.3.2";
helmUnittestVersion = "v1.0.16";
nodeProtocTsVersion = "v5.0.1";
nodeProtocTsVersion = "v5.3.2";
grpcToolsVersion = "1.12.4";
libpcscliteVersion = "1.9.9-teleport";

Expand Down Expand Up @@ -150,7 +150,7 @@
owner = "agreatfool";
repo = "grpc_tools_node_protoc_ts";
rev = nodeProtocTsVersion;
sha256 = "sha256-kDrflQVENjOY7ei3+D3Znx4eUDPoja8UGG2Phv1eptA=";
sha256 = "sha256-tIshow1lPwN+mNajyRRVkmP8UfgQ9zOAvnmmvwndQhw=";
};

npmDepsHash = "sha256-fxOyItDkkv5OAmtScD9ykq26Meh6qyZSDmWegeh+GRY=";
Expand Down
2 changes: 1 addition & 1 deletion build.assets/versions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ BUF_VERSION ?= v1.29.0
# Keep in sync with api/proto/buf.yaml (and buf.lock).
GOGO_PROTO_TAG ?= v1.3.2
NODE_GRPC_TOOLS_VERSION ?= 1.12.4
NODE_PROTOC_TS_VERSION ?= 5.0.1
NODE_PROTOC_TS_VERSION ?= 5.3.2
PROTOC_VERSION ?= 3.20.3