feat: upgrade go to 1.23 (#1473)

Co-authored-by: Ludwig <ludwig.bedacht@gmail.com>
wundergraph · Dec 20, 2024 · 4c29d2d · 4c29d2d
1 parent 3c6562c
commit 4c29d2d
Show file tree

Hide file tree

Showing 33 changed files with 88 additions and 53 deletions.
diff --git a/.github/actions/build-push-image/action.yaml b/.github/actions/build-push-image/action.yaml
@@ -25,6 +25,9 @@ inputs:
   push:
     description: "Whether to push the image to the GitHub container registry"
     default: "true"
+  load_Image:
+    description: "Whether to make the image locally available to the build. Doesn't work with multi-platform builds"
+    default: "false"
 
 runs:
   using: "composite"
@@ -46,7 +49,10 @@ runs:
         tags: |
           type=ref,event=branch
           type=ref,event=pr
+          # minimal (short sha)
           type=sha
+          # full length commit sha
+          type=raw,value=sha-${{ github.sha }}
           # set latest tag for default branch
           type=raw,value=latest,enable={{is_default_branch}}
           # use custom value instead of git tag
@@ -72,7 +78,10 @@ runs:
         password: ${{ inputs.token }}
 
     - name: Build & Push Docker Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
+      env:
+        DOCKER_BUILD_SUMMARY: false
+        DOCKER_BUILD_RECORD_UPLOAD: false
       with:
         # This is a limitation of GitHub. Only organization members can push to GitHub Container Registry
         # For now, we will disable the push to the GitHub Container Registry for external contributors
@@ -82,6 +91,7 @@ runs:
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
         platforms: ${{ inputs.image_platforms }}
+        load: ${{ inputs.load_Image == 'true' }}
         outputs:
           type=image,name=target,annotation-index.org.opencontainers.image.description=${{ inputs.image_description }}
           type=image,name=target,annotation-index.org.opencontainers.image.source=https://github.com/wundergraph/cosmo

diff --git a/.github/actions/go-linter/action.yaml b/.github/actions/go-linter/action.yaml
@@ -16,8 +16,8 @@ runs:
       working-directory: ${{ inputs.working-directory }}
 
     - name: Run staticcheck linter
-      uses: dominikh/staticcheck-action@v1.3.0
+      uses: dominikh/staticcheck-action@v1.3.1
       with:
-        version: 2023.1.7
+        version: 2024.1.1
         install-go: false
         working-directory: ${{ inputs.working-directory }}
diff --git a/.github/actions/go/action.yaml b/.github/actions/go/action.yaml
@@ -3,7 +3,7 @@ description: "This action install go and cache modules and build dependencies"
 inputs:
   go-version:
     description: "The go version to install"
-    default: "1.21"
+    default: "1.23"
     required: false
   cache-dependency-path:
     description: "The path to the dependency to cache"

diff --git a/.github/actions/image-scan/action.yaml b/.github/actions/image-scan/action.yaml
@@ -1,6 +1,10 @@
 name: "Image Vulnerability Scan"
 description: "This action performs a Trivy scan on the image and adds a PR comment with the results."
 inputs:
+  name:
+    description: "The name of service"
+    required: true
+
   github_token:
     description: 'GitHub Token'
     required: true
@@ -43,15 +47,24 @@ runs:
       if: success() && steps.scan.outcome == 'success'
       with:
         message: |
-          # Trivy Image scan passed
-          :white_check_mark: No security vulnerabilities found in image `${{ inputs.image_ref }}`.
+          # ${{ inputs.name }} image scan passed
+          :white_check_mark: No security [vulnerabilities](https://github.com/wundergraph/cosmo/security/code-scanning?query=pr%3A${{ github.event.number }}+is%3Aopen+tool%3ATrivy) found in image:
+          
+          ```
+          ${{ inputs.image_ref }}
+          ```
+
 
     - uses: mshick/add-pr-comment@v2
       if: failure() && steps.scan.outcome == 'failure'
       with:
         message: |
-          # Trivy Image scan failed
-          :x: Image `${{ inputs.image_ref }}` has security vulnerabilities.
+          # ${{ inputs.name }} image scan failed
+          :x: Security vulnerabilities found in image:
+          
+          ```
+          ${{ inputs.image_ref }}
+          ```
           
           Please check the security [vulnerabilities](https://github.com/wundergraph/cosmo/security/code-scanning?query=pr%3A${{ github.event.number }}+is%3Aopen+tool%3ATrivy) found in the PR.
           

diff --git a/.github/workflows/router-ci.yaml b/.github/workflows/router-ci.yaml
@@ -184,12 +184,14 @@ jobs:
           image_name: router
           image_description: "Cosmo Router"
           image_platforms: 'linux/amd64'
+          load_Image: 'true'
           push: 'false'
 
       - uses: ./.github/actions/image-scan
         with:
+          name: "Router"
           github_token: ${{secrets.GITHUB_TOKEN}}
-          image_ref: 'ghcr.io/wundergraph/cosmo/router:pr-${{github.event.number}}'
+          image_ref: 'ghcr.io/wundergraph/cosmo/router:sha-${{ github.sha }}'
 
   build_push_image:
     # This is a limitation of GitHub. Only organization members can push to GitHub Container Registry

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -44,9 +44,7 @@ According to best practices, we don't commit the `go.work` or `go.sum` files. Th
 ### Example
 
 ```
-go 1.21.5
-
-toolchain go1.22.0
+go 1.23
 
 use (
 	./demo
@@ -89,7 +87,7 @@ We merge all pull requests in `squash merge` mode. You're not enforced to use [c
 - [Docker Compose V2](https://docs.docker.com/compose/install/)
 - [NodeJS LTS](https://nodejs.org/en/download/)
 - [PNPM 8+](https://pnpm.io/installation)
-- [Go 1.21+](https://golang.org/doc/install)
+- [Go 1.23+](https://golang.org/doc/install)
 - [wgc](https://www.npmjs.com/package/wgc)
 - .env/.env.local (see below)
 

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ setup-build-tools:
 
 setup-dev-tools: setup-build-tools
 	go install github.com/amacneil/dbmate/v2@v2.6.0
-	go install honnef.co/go/tools/cmd/staticcheck@2023.1.7
+	go install honnef.co/go/tools/cmd/staticcheck@2024.1.1
 	go install github.com/yannh/kubeconform/cmd/kubeconform@v0.6.3
 	go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.11.3
 

diff --git a/aws-lambda-router/Makefile b/aws-lambda-router/Makefile
@@ -21,8 +21,7 @@ deploy: build-sam
 	sam deploy
 
 lint:
-	cd adapter && go vet ./...
-	cd adapter && staticcheck ./...
+	staticcheck ./...
 
 test:
 	go test -v ./...

diff --git a/aws-lambda-router/go.mod b/aws-lambda-router/go.mod
@@ -116,7 +116,7 @@ require (
 	go.withmatt.com/connect-brotli v0.4.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect

diff --git a/aws-lambda-router/go.sum b/aws-lambda-router/go.sum
@@ -312,8 +312,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191116160921-f9c825593386/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=

diff --git a/composition-go/go.mod b/composition-go/go.mod
@@ -1,6 +1,6 @@
 module github.com/wundergraph/cosmo/composition-go
 
-go 1.21.0
+go 1.23
 
 require (
 	github.com/dop251/goja v0.0.0-20230906160731-9410bcaa81d2

diff --git a/connect-go/go.mod b/connect-go/go.mod
@@ -1,3 +1,8 @@
 module github.com/wundergraph/cosmo/connect-go
 
-go 1.22.0
+go 1.23
+
+require (
+	connectrpc.com/connect v1.17.0
+	google.golang.org/protobuf v1.36.0
+)
diff --git a/connect-go/go.sum b/connect-go/go.sum
@@ -0,0 +1,10 @@
+connectrpc.com/connect v1.17.0 h1:W0ZqMhtVzn9Zhn2yATuUokDLO5N+gIuBWMOnsQrfmZk=
+connectrpc.com/connect v1.17.0/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
+google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
diff --git a/demo/Dockerfile.availability b/demo/Dockerfile.availability
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/Dockerfile.countries b/demo/Dockerfile.countries
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/Dockerfile.employees b/demo/Dockerfile.employees
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/Dockerfile.family b/demo/Dockerfile.family
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/Dockerfile.hobbies b/demo/Dockerfile.hobbies
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/Dockerfile.mood b/demo/Dockerfile.mood
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/Dockerfile.products b/demo/Dockerfile.products
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/Dockerfile.products_fg b/demo/Dockerfile.products_fg
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 

diff --git a/demo/go.mod b/demo/go.mod
@@ -1,8 +1,8 @@
 module github.com/wundergraph/cosmo/demo
 
-go 1.21.5
+go 1.23
 
-toolchain go1.22.0
+toolchain go1.23.4
 
 require (
 	github.com/99designs/gqlgen v0.17.49
@@ -141,7 +141,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.5.0 // indirect

diff --git a/demo/go.sum b/demo/go.sum
@@ -378,6 +378,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
 golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=

diff --git a/graphqlmetrics/Dockerfile b/graphqlmetrics/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.21 AS builder
+FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/graphqlmetrics/go.mod b/graphqlmetrics/go.mod
@@ -1,6 +1,6 @@
 module github.com/wundergraph/cosmo/graphqlmetrics
 
-go 1.21.0
+go 1.23
 
 require (
 	connectrpc.com/connect v1.16.2
@@ -58,7 +58,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/graphqlmetrics/go.sum b/graphqlmetrics/go.sum
@@ -160,8 +160,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/otelcollector/Dockerfile b/otelcollector/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.21 AS builder
+FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -16,7 +16,7 @@ RUN ./ocb --config otelcol-builder.yaml \
     && chmod +x /app/otelcol-dev/otelcol \
     && /app/otelcol-dev/otelcol --version
 
-FROM --platform=${BUILDPLATFORM} golang:1.21
+FROM --platform=${BUILDPLATFORM} golang:1.23
 
 COPY ./otel-config.yaml /etc/otel-config.yaml
 COPY --from=builder /app/otelcol-dev/otelcol /otelcol

diff --git a/router-tests/go.mod b/router-tests/go.mod
@@ -1,8 +1,6 @@
 module github.com/wundergraph/cosmo/router-tests
 
-go 1.21.5
-
-toolchain go1.22.0
+go 1.23
 
 require (
 	github.com/buger/jsonparser v1.1.1
@@ -159,7 +157,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect

diff --git a/router-tests/go.sum b/router-tests/go.sum
@@ -428,8 +428,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20191116160921-f9c825593386/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/router/Dockerfile b/router/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.21 AS builder
+FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/router/custom.Dockerfile b/router/custom.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/router/go.mod b/router/go.mod
@@ -1,8 +1,6 @@
 module github.com/wundergraph/cosmo/router
 
-go 1.21.5
-
-toolchain go1.22.0
+go 1.23
 
 require (
 	connectrpc.com/connect v1.16.2
@@ -138,7 +136,7 @@ require (
 	go.opentelemetry.io/proto/otlp v1.1.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect