Update codegen base image (#4968)

* Update codegen base image from alpine to debian to update go version and use protoc-gen-js Signed-off-by: Yoshiki Fujikane <[email protected]> * Add generated files Signed-off-by: Yoshiki Fujikane <[email protected]> * Add .gitatributes Signed-off-by: Yoshiki Fujikane <[email protected]> --------- Signed-off-by: Yoshiki Fujikane <[email protected]>
pipe-cd · Jun 13, 2024 · 7e27cad · 7e27cad
1 parent 8129078
commit 7e27cad
Show file tree

Hide file tree

Showing 55 changed files with 234 additions and 86 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+**/*_pb.js linguist-generated=true
diff --git a/pkg/app/helloworld/service/service.pb.go b/pkg/app/helloworld/service/service.pb.go
diff --git a/pkg/app/helloworld/service/service_grpc.pb.go b/pkg/app/helloworld/service/service_grpc.pb.go
diff --git a/pkg/app/pipedv1/cmd/piped/service/service.pb.go b/pkg/app/pipedv1/cmd/piped/service/service.pb.go
diff --git a/pkg/app/pipedv1/cmd/piped/service/service_grpc.pb.go b/pkg/app/pipedv1/cmd/piped/service/service_grpc.pb.go
diff --git a/pkg/app/server/service/apiservice/service.pb.go b/pkg/app/server/service/apiservice/service.pb.go
diff --git a/pkg/app/server/service/apiservice/service_grpc.pb.go b/pkg/app/server/service/apiservice/service_grpc.pb.go
diff --git a/pkg/app/server/service/pipedservice/service.pb.go b/pkg/app/server/service/pipedservice/service.pb.go
diff --git a/pkg/app/server/service/pipedservice/service_grpc.pb.go b/pkg/app/server/service/pipedservice/service_grpc.pb.go
diff --git a/pkg/app/server/service/webservice/service.pb.auth.go b/pkg/app/server/service/webservice/service.pb.auth.go
diff --git a/pkg/app/server/service/webservice/service.pb.go b/pkg/app/server/service/webservice/service.pb.go
diff --git a/pkg/app/server/service/webservice/service_grpc.pb.go b/pkg/app/server/service/webservice/service_grpc.pb.go
diff --git a/pkg/model/analysis_result.pb.go b/pkg/model/analysis_result.pb.go
diff --git a/pkg/model/apikey.pb.go b/pkg/model/apikey.pb.go
diff --git a/pkg/model/application.pb.go b/pkg/model/application.pb.go
diff --git a/pkg/model/application_live_state.pb.go b/pkg/model/application_live_state.pb.go
diff --git a/pkg/model/command.pb.go b/pkg/model/command.pb.go
diff --git a/pkg/model/common.pb.go b/pkg/model/common.pb.go
diff --git a/pkg/model/deployment.pb.go b/pkg/model/deployment.pb.go
diff --git a/pkg/model/deployment_chain.pb.go b/pkg/model/deployment_chain.pb.go
diff --git a/pkg/model/event.pb.go b/pkg/model/event.pb.go
diff --git a/pkg/model/insight.pb.go b/pkg/model/insight.pb.go
diff --git a/pkg/model/logblock.pb.go b/pkg/model/logblock.pb.go
diff --git a/pkg/model/notificationevent.pb.go b/pkg/model/notificationevent.pb.go
diff --git a/pkg/model/piped.pb.go b/pkg/model/piped.pb.go
diff --git a/pkg/model/piped_stat.pb.go b/pkg/model/piped_stat.pb.go
diff --git a/pkg/model/planpreview.pb.go b/pkg/model/planpreview.pb.go
diff --git a/pkg/model/project.pb.go b/pkg/model/project.pb.go
diff --git a/pkg/model/rbac.pb.go b/pkg/model/rbac.pb.go
diff --git a/pkg/model/role.pb.go b/pkg/model/role.pb.go
diff --git a/pkg/model/user.pb.go b/pkg/model/user.pb.go
diff --git a/pkg/plugin/api/v1alpha1/platform/api.pb.go b/pkg/plugin/api/v1alpha1/platform/api.pb.go
diff --git a/pkg/plugin/api/v1alpha1/platform/api_grpc.pb.go b/pkg/plugin/api/v1alpha1/platform/api_grpc.pb.go
diff --git a/tool/codegen/Dockerfile b/tool/codegen/Dockerfile
@@ -1,26 +1,26 @@
 # Builder image to build go program.
-FROM golang:1.20.4-alpine3.16 as BUILDER
+FROM golang:1.22.4 as BUILDER
 
 COPY protoc-gen-auth /protoc-gen-auth
 RUN cd /protoc-gen-auth \
   && go build -o /usr/local/bin/protoc-gen-auth . \
   && chmod +x /usr/local/bin/protoc-gen-auth
 
 # Codegen image which is actually being used.
-FROM golang:1.20.4-alpine3.16
+FROM golang:1.22.4
 
 # This is version of protobuf installed in the image.
 # See https://pkgs.alpinelinux.org/packages?name=protobuf&branch=v3.16
 # NOTE: Start from protobuf v3.20.1, the protoc-gen-js is not included in protobuf package.
-ENV PROTOC_VER=3.18.1
+ENV PROTOC_GEN_JS_VER=3.21.2
 ENV PROTOC_GEN_GO_VER=1.27.1
 ENV PROTOC_GEN_GRPC_WEB_VER=1.3.1
 ENV PROTOC_GEN_GO_GRPC_VER=1.2.0
 ENV PROTOC_GEN_VALIDATE_VER=0.6.6
 ENV GOMOCK_VER=1.6.0
 
 # dependecies and protoc
-RUN apk --no-cache add wget bash protobuf-dev protobuf
+RUN apt update && apt install -y protobuf-compiler
 
 # protoc-gen-go
 RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v${PROTOC_GEN_GO_VER}
@@ -41,6 +41,17 @@ RUN go install github.com/envoyproxy/protoc-gen-validate@v${PROTOC_GEN_VALIDATE_
   && rm protoc-gen-validate.tar.gz \
   && mv /go/src/github.com/envoyproxy/protoc-gen-validate-${PROTOC_GEN_VALIDATE_VER} /go/src/github.com/envoyproxy/protoc-gen-validate
 
+# protoc-gen-js
+# This is a workaround to use it  https://github.com/protocolbuffers/protobuf-javascript/issues/127#issuecomment-1361047597
+RUN for target in x86_64 aarch_64; do \
+  mkdir /protoc-gen-js-${target} && cd /protoc-gen-js-${target} \
+  && wget https://github.com/protocolbuffers/protobuf-javascript/releases/download/v${PROTOC_GEN_JS_VER}/protobuf-javascript-${PROTOC_GEN_JS_VER}-linux-${target}.tar.gz \
+  && tar xvfz protobuf-javascript-${PROTOC_GEN_JS_VER}-linux-${target}.tar.gz \
+  && chmod +x bin/protoc-gen-js \
+  && rm -rf protobuf-javascript-${PROTOC_GEN_JS_VER}-linux-${target}.tar.gz; \
+  done && \
+  mv /protoc-gen-js-aarch_64/ /protoc-gen-js-aarch64/ 
+
 # protoc-gen-auth
 COPY --from=BUILDER /usr/local/bin/protoc-gen-auth /usr/local/bin/
 

diff --git a/tool/codegen/codegen.sh b/tool/codegen/codegen.sh
@@ -56,6 +56,17 @@ jsOutDirs=(
   "web/api_client"
 )
 
+# Check the arch for protc-gen-js
+arch=$(uname -m);
+protocGenJsSupportArch=("x86_64" "aarch64")
+if [[ ! " ${protocGenJsSupportArch[@]} " =~ " ${arch} " ]]; then
+  echo "Unsupported architecture: $arch"
+  exit 1
+fi
+
+protocGenJsIncludePath="/protoc-gen-js-${arch}"
+protocGenJsPath="/protoc-gen-js-${arch}/bin/protoc-gen-js"
+
 i=0
 while [ $i -lt ${#jsProtoDirs[*]} ]; do
   inDir=${jsProtoDirs[$i]}
@@ -72,7 +83,9 @@ while [ $i -lt ${#jsProtoDirs[*]} ]; do
   echo "generating new JS files..."
   protoc \
     -I . \
+    -I ${protocGenJsIncludePath} \
     -I /go/src/github.com/envoyproxy/protoc-gen-validate \
+    --plugin=protoc-gen-js=${protocGenJsPath} \
     --js_out=import_style=commonjs:. \
     --grpc-web_out=import_style=commonjs+dts,mode=grpcweb:. \
     ${inDir}/*.proto