build(go): switch to go 1.21

Also update to the latest swaggo version, as the previous one did not work with go 1.21 Signed-off-by: Andrei Aaron <[email protected]>
project-zot · Nov 21, 2023 · 65ce943 · 65ce943
1 parent c7bd2a6
commit 65ce943
Show file tree

Hide file tree

Showing 34 changed files with 176 additions and 49 deletions.
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       # Run benchmark with `go test -bench` and stores the output to a file
       - name: Run benchmark
         run: make BENCH_OUTPUT=ci-cd run-bench

diff --git a/.github/workflows/branch-cov.yaml b/.github/workflows/branch-cov.yaml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -57,7 +57,7 @@ jobs:
       - name: Install other dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           sudo apt-get update
           sudo apt-get install rpm
           sudo apt-get install snapd

diff --git a/.github/workflows/cloc.yaml b/.github/workflows/cloc.yaml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Check out source code
         uses: actions/checkout@v4
       - name: Install dependencies

diff --git a/.github/workflows/cluster.yaml b/.github/workflows/cluster.yaml
@@ -31,11 +31,11 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
           sudo apt-get update
           sudo apt-get -y install rpm uidmap

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -49,7 +49,7 @@ jobs:
       uses: actions/setup-go@v4
       with:
         cache: false
-        go-version: 1.20.x
+        go-version: 1.21.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/compare-binary-size.yaml b/.github/workflows/compare-binary-size.yaml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Checkout zot (main branch)
         run: |
           mkdir -p $GITHUB_WORKSPACE/zot_main

diff --git a/.github/workflows/ecosystem-tools.yaml b/.github/workflows/ecosystem-tools.yaml
@@ -20,11 +20,11 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
           sudo apt-get update
           sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config rpm uidmap

diff --git a/.github/workflows/gc-stress-test.yaml b/.github/workflows/gc-stress-test.yaml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
 
       - name: Run zb
         id: bench
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
 
       - name: Run zb
         id: bench
@@ -82,7 +82,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
       - name: Setup minio service
         run: |
@@ -157,7 +157,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
       - name: Setup minio service
         run: |

diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: actions/checkout@v4
       - name: Run linter with GH action
         uses: golangci/golangci-lint-action@v3

diff --git a/.github/workflows/gqlgen.yaml b/.github/workflows/gqlgen.yaml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install go-licenses
         run: go install github.com/google/go-licenses@latest
       - name: Check for forbidden licenses

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -19,11 +19,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
           sudo apt-get update
           sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config rpm uidmap
@@ -67,11 +67,11 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
       - name: Run sync harness
         run: |
@@ -85,7 +85,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
 
       - name: Run zb
@@ -122,7 +122,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
 
       - name: Run zb

diff --git a/.github/workflows/oci-conformance-action.yaml b/.github/workflows/oci-conformance-action.yaml
@@ -20,11 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    - name: Install go 1.20
+    - name: Install go 1.21
       uses: actions/setup-go@v4
       with:
         cache: false
-        go-version: 1.20.x
+        go-version: 1.21.x
     - name: Checkout this PR
       uses: actions/checkout@v4
     - name: Start zot server

diff --git a/.github/workflows/sync-3rdparty-images.yaml b/.github/workflows/sync-3rdparty-images.yaml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         golang_version:
-          - "1.20"
+          - "1.21"
     runs-on: ubuntu-latest
     steps:
       - name: Log in to GitHub Docker Registry

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -99,7 +99,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -133,7 +133,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: download all workflow coverage files
         uses: actions/download-artifact@v3
       - name: merge code coverage

diff --git a/.github/workflows/tls.yaml b/.github/workflows/tls.yaml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

diff --git a/.github/workflows/web-scan.yaml b/.github/workflows/web-scan.yaml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Checkout
         uses: actions/checkout@v4
       - name: Build zot

diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ ACTION_VALIDATOR_VERSION := v0.5.3
 ZUI_VERSION := commit-fad5572
 ZUI_REPO_OWNER := project-zot
 ZUI_REPO_NAME := zui
-SWAGGER_VERSION := v1.8.12
+SWAGGER_VERSION := v1.16.2
 STACKER := $(TOOLSDIR)/bin/stacker
 BATS := $(TOOLSDIR)/bin/bats
 TESTDATA := $(TOP_LEVEL)/test/data
@@ -331,7 +331,7 @@ swagger:
 update-licenses: check-linux
 	@echo "Detecting and updating licenses ... please be patient!"
 	go install github.com/google/go-licenses@latest
-	$(shell echo "Module | License URL | License" > THIRD-PARTY-LICENSES.md; echo "---|---|---" >> THIRD-PARTY-LICENSES.md; for i in $$(go list -m all  | awk '{print $$1}'); do l=$$(go-licenses csv $$i 2>/dev/null); if [ $$? -ne 0 ]; then continue; fi; echo $$l | tr \, \| | tr ' ' '\n'; done | LC_ALL=C sort -u >> THIRD-PARTY-LICENSES.md)
+	./update_licenses.sh
 	$(eval UNCOMMITED_FILES = $(shell git status --porcelain | grep -c THIRD-PARTY-LICENSES.md))
 	@if [ $(UNCOMMITED_FILES) != 0 ]; then \
 		echo "THIRD-PARTY-LICENSES.md file needs to be updated";\

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
@@ -419,7 +419,6 @@ golang.org/x/crypto/pkcs12|https://cs.opensource.google/go/x/crypto/+/v0.15.0:LI
 golang.org/x/crypto/sha3|https://cs.opensource.google/go/x/crypto/+/v0.15.0:LICENSE|BSD-3-Clause
 golang.org/x/crypto|https://cs.opensource.google/go/x/crypto/+/v0.15.0:LICENSE|BSD-3-Clause
 golang.org/x/exp/constraints|https://cs.opensource.google/go/x/exp/+/7918f672:LICENSE|BSD-3-Clause
-golang.org/x/exp|https://cs.opensource.google/go/x/exp/+/7918f672:LICENSE|BSD-3-Clause
 golang.org/x/mod/semver|https://cs.opensource.google/go/x/mod/+/v0.13.0:LICENSE|BSD-3-Clause
 golang.org/x/mod|https://cs.opensource.google/go/x/mod/+/v0.13.0:LICENSE|BSD-3-Clause
 golang.org/x/net/html|https://cs.opensource.google/go/x/net/+/v0.18.0:LICENSE|BSD-3-Clause

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/build/Dockerfile-conformance b/build/Dockerfile-conformance
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/build/Dockerfile-minimal b/build/Dockerfile-minimal
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/build/Dockerfile-zb b/build/Dockerfile-zb
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/build/Dockerfile-zxp b/build/Dockerfile-zxp
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

diff --git a/build/stacker-minimal.yaml b/build/stacker-minimal.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

diff --git a/build/stacker.yaml b/build/stacker.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |