Bump dependencies in Go services (#2716)

* frontend: Bump Go and gRPC * productcatalogservice: Bump Go and gRPC * shippingservice: Bump Go and gRPC * checkoutservice: Bump Go and gRPC * Replace "as" with "AS" in Dockerfiles * Bump Go in GitHub Actions * Update protos/demo.proto --------- Co-authored-by: Olivier Bourgeois <[email protected]>
GoogleCloudPlatform · Sep 5, 2024 · ca90f35 · ca90f35
1 parent 43947d7
commit ca90f35
Show file tree

Hide file tree

Showing 37 changed files with 12,972 additions and 8,094 deletions.
diff --git a/.github/workflows/ci-main.yaml b/.github/workflows/ci-main.yaml
@@ -39,7 +39,7 @@ jobs:
         dotnet-version: '8.0'
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.22'
+        go-version: '1.23'
     - name: Go Unit Tests
       timeout-minutes: 10
       run: |

diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml
@@ -43,7 +43,7 @@ jobs:
         dotnet-version: '8.0'
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.22'
+        go-version: '1.23'
     - name: Go Unit Tests
       timeout-minutes: 10
       run: |

diff --git a/protos/demo.proto b/protos/demo.proto
@@ -16,6 +16,8 @@ syntax = "proto3";
 
 package hipstershop;
 
+option go_package = "github.com/GoogleCloudPlatform/microservices-demo/hipstershop";
+
 // -----------------Cart service-----------------
 
 service CartService {

diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM eclipse-temurin:21@sha256:d2233012784e0b35d893f7802e28d39e39e9422180b4c6f14ed2fb714b0952e5 as builder
+FROM eclipse-temurin:21@sha256:d2233012784e0b35d893f7802e28d39e39e9422180b4c6f14ed2fb714b0952e5 AS builder
 
 WORKDIR /app
 

diff --git a/src/cartservice/src/Dockerfile b/src/cartservice/src/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # https://mcr.microsoft.com/product/dotnet/sdk
-FROM mcr.microsoft.com/dotnet/sdk:8.0.401-noble@sha256:d37cbb248b78027e3f149ea422bc9dc3bbf5b8c47bd1150e14c9849462235e91 as builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.401-noble@sha256:d37cbb248b78027e3f149ea422bc9dc3bbf5b8c47bd1150e14c9849462235e91 AS builder
 WORKDIR /app
 COPY cartservice.csproj .
 RUN dotnet restore cartservice.csproj \

diff --git a/src/checkoutservice/Dockerfile b/src/checkoutservice/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.23.0-alpine@sha256:d0b31558e6b3e4cc59f6011d79905835108c919143ebecc58f35965bf79948f4 as builder
+FROM golang:1.23.0-alpine@sha256:d0b31558e6b3e4cc59f6011d79905835108c919143ebecc58f35965bf79948f4 AS builder
 WORKDIR /src
 
 # restore dependencies

diff --git a/src/checkoutservice/genproto.sh b/src/checkoutservice/genproto.sh
@@ -16,9 +16,10 @@
 
 # [START gke_checkoutservice_genproto]
 
-PATH=$PATH:$GOPATH/bin
+PATH=$PATH:$(go env GOPATH)/bin
 protodir=../../protos
+outdir=./genproto
 
-protoc --go_out=plugins=grpc:genproto -I $protodir $protodir/demo.proto
+protoc --proto_path=$protodir --go_out=./$outdir --go_opt=paths=source_relative --go-grpc_out=./$outdir --go-grpc_opt=paths=source_relative $protodir/demo.proto
 
 # [END gke_checkoutservice_genproto]