Skip to content

Install @protobuf-ts/plugin in the build containers #37010

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
ryanclark wants to merge 2 commits into from
Closed

Install @protobuf-ts/plugin in the build containers #37010

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
fed5a1c
Install @protobuf-ts/plugin in the docker containers
ryanclark Jan 22, 2024
ea2f7a2
Use npm exec so buf uses the correct protoc-gen-ts
ryanclark Jan 22, 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
7 changes: 7 additions & 0 deletions buf-js.gen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,11 @@ plugins:
- name: ts
strategy: all
out: gen/proto/js
path:
- npm
- exec
- --yes
- --package=grpc_tools_node_protoc_ts@5.0.1
- --
- protoc-gen-ts
opt: "service=grpc-node"
3 changes: 2 additions & 1 deletion build.assets/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ RUN helm plugin install https://github.com/vbehar/helm3-unittest && \
# Install JS gRPC tools.
ARG NODE_GRPC_TOOLS_VERSION # eg, "1.12.4"
ARG NODE_PROTOC_TS_VERSION # eg, "5.0.1"
RUN npm install --global "grpc-tools@$NODE_GRPC_TOOLS_VERSION" "grpc_tools_node_protoc_ts@$NODE_PROTOC_TS_VERSION"
ARG PROTOBUF_TS_PLUGIN_VERSION # eg, "2.9.3"
RUN npm install --global "grpc-tools@$NODE_GRPC_TOOLS_VERSION" "grpc_tools_node_protoc_ts@$NODE_PROTOC_TS_VERSION" "@protobuf-ts/plugin@$PROTOBUF_TS_PLUGIN_VERSION"
Copy link
Copy Markdown
Contributor

@jakule jakule Jan 22, 2024

Choose a reason for hiding this comment

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

Is this needed in the Ci container? We're not using it to generate proto files.

Copy link
Copy Markdown
Member Author

@ryanclark ryanclark Jan 22, 2024

Choose a reason for hiding this comment

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

Yes, the usage is in a follow up PR


# Install protoc.
ARG PROTOC_VERSION # eg, "3.20.2"
Expand Down
5 changes: 4 additions & 1 deletion build.assets/Dockerfile-grpcbox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ RUN go install "github.com/gogo/protobuf/protoc-gen-gogofast@$GOGO_PROTO_TAG"
ARG NODE_GRPC_TOOLS_VERSION
# eg, "5.0.1"
ARG NODE_PROTOC_TS_VERSION
RUN npm install --global "grpc-tools@$NODE_GRPC_TOOLS_VERSION" "grpc_tools_node_protoc_ts@$NODE_PROTOC_TS_VERSION"
# @protobuf-ts/plugin
# eg, "2.9.3"
ARG PROTOBUF_TS_PLUGIN_VERSION
RUN npm install --global "grpc-tools@$NODE_GRPC_TOOLS_VERSION" "grpc_tools_node_protoc_ts@$NODE_PROTOC_TS_VERSION" "@protobuf-ts/plugin@$PROTOBUF_TS_PLUGIN_VERSION"

# protoc
# eg, "3.20.2"
Expand Down
1 change: 1 addition & 0 deletions build.assets/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ buildbox:
--build-arg GOGO_PROTO_TAG=$(GOGO_PROTO_TAG) \
--build-arg NODE_GRPC_TOOLS_VERSION=$(NODE_GRPC_TOOLS_VERSION) \
--build-arg NODE_PROTOC_TS_VERSION=$(NODE_PROTOC_TS_VERSION) \
--build-arg PROTOBUF_TS_PLUGIN_VERSION=$(PROTOBUF_TS_PLUGIN_VERSION) \
--build-arg PROTOC_VERSION=$(PROTOC_VERSION) \
--cache-from $(BUILDBOX) \
$(if $(PUSH),--push,--load) \
Expand Down
1 change: 1 addition & 0 deletions build.assets/grpcbox.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ grpcbox:
--build-arg GOGO_PROTO_TAG=$(GOGO_PROTO_TAG) \
--build-arg NODE_GRPC_TOOLS_VERSION=$(NODE_GRPC_TOOLS_VERSION) \
--build-arg NODE_PROTOC_TS_VERSION=$(NODE_PROTOC_TS_VERSION) \
--build-arg PROTOBUF_TS_PLUGIN_VERSION=$(PROTOBUF_TS_PLUGIN_VERSION) \
--build-arg PROTOC_VERSION=$(PROTOC_VERSION) \
-f Dockerfile-grpcbox \
-t "$(GRPCBOX)" \
Expand Down
2 changes: 2 additions & 0 deletions build.assets/versions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ DEVTOOLSET ?= devtoolset-12
BUF_VERSION ?= v1.28.0
# Keep in sync with api/proto/buf.yaml (and buf.lock).
GOGO_PROTO_TAG ?= v1.3.2
# TODO(ryan): remove once Connect has migrated to the TS protobufs.
NODE_GRPC_TOOLS_VERSION ?= 1.12.4
NODE_PROTOC_TS_VERSION ?= 5.0.1
PROTOBUF_TS_PLUGIN_VERSION ?= 2.9.3
PROTOC_VERSION ?= 3.20.3