build: migrate to golang 1.23.x (#2701)

* build: migrate to golang 1.23.x Signed-off-by: Ramkumar Chinchani <[email protected]> * fix: golangci-lint reported errors Signed-off-by: Ramkumar Chinchani <[email protected]> --------- Signed-off-by: Ramkumar Chinchani <[email protected]>
project-zot · Nov 8, 2024 · 5465aa0 · 5465aa0
1 parent a76bfd4
commit 5465aa0
Show file tree

Hide file tree

Showing 33 changed files with 75 additions and 75 deletions.
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v4

diff --git a/.github/workflows/cloc.yaml b/.github/workflows/cloc.yaml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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,7 +31,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -49,7 +49,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         cache: false
-        go-version: 1.22.x
+        go-version: 1.23.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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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,7 +20,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
 
       - name: Run zb
         id: bench
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
 
       - name: Run zb
         id: bench
@@ -82,7 +82,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - uses: ./.github/actions/setup-localstack
       - name: Setup minio service
         run: |
@@ -157,7 +157,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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,13 +18,13 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: '1.22'
+          go-version: '1.23'
       - uses: actions/checkout@v4
       - name: Run linter with GH action
         uses: golangci/golangci-lint-action@v6
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.59.1
+          version: v1.61.0
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/.github/workflows/gqlgen.yaml b/.github/workflows/gqlgen.yaml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
@@ -72,7 +72,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
@@ -90,7 +90,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - uses: ./.github/actions/setup-localstack
 
       - name: Run zb
@@ -127,7 +127,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - uses: ./.github/actions/setup-localstack
 
       - name: Run zb
@@ -175,7 +175,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
@@ -206,7 +206,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

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.22
+    - name: Install go 1.23
       uses: actions/setup-go@v5
       with:
         cache: false
-        go-version: 1.22.x
+        go-version: 1.23.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.22"
+          - "1.23"
     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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v4
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v4
@@ -99,7 +99,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v4
@@ -133,7 +133,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: download all workflow coverage files
         uses: actions/download-artifact@v4
       - 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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.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@v5
         with:
           cache: false
-          go-version: 1.22.x
+          go-version: 1.23.x
       - name: Checkout
         uses: actions/checkout@v4
       - name: Build zot

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ TOOLSDIR := $(shell pwd)/hack/tools
 PATH := bin:$(TOOLSDIR)/bin:$(PATH)
 STACKER := $(shell which stacker)
 GOLINTER := $(TOOLSDIR)/bin/golangci-lint
-GOLINTER_VERSION := v1.59.1
+GOLINTER_VERSION := v1.61.0
 NOTATION := $(TOOLSDIR)/bin/notation
 NOTATION_VERSION := 1.0.0
 COSIGN := $(TOOLSDIR)/bin/cosign

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module zotregistry.dev/zot
 
-go 1.22.8
+go 1.23.2
 
 require (
 	github.com/99designs/gqlgen v0.17.55

diff --git a/pkg/api/controller.go b/pkg/api/controller.go
@@ -78,7 +78,7 @@ func NewController(appConfig *config.Config) *Controller {
 			panic("failed to get member socket")
 		}
 
-		if memberSocket == "" {
+		if memberSocketIdx < 0 || memberSocket == "" {
 			// there is a misconfiguration if the memberSocket cannot be identified
 			logger.Error().
 				Str("members", strings.Join(appConfig.Cluster.Members, ",")).

diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go
@@ -381,7 +381,7 @@ func TestAutoPortSelection(t *testing.T) {
 				break
 			}
 
-			t.Logf(scanner.Text())
+			t.Logf("%s", scanner.Text())
 		}
 
 		So(scanner.Err(), ShouldBeNil)

diff --git a/pkg/api/ldap.go b/pkg/api/ldap.go
@@ -61,7 +61,7 @@ func (lc *LDAPClient) Connect() error {
 					RootCAs:            lc.ClientCAs,
 				}
 
-				if lc.ClientCertificates != nil && len(lc.ClientCertificates) > 0 {
+				if len(lc.ClientCertificates) > 0 {
 					config.Certificates = lc.ClientCertificates
 				}
 
@@ -78,7 +78,7 @@ func (lc *LDAPClient) Connect() error {
 				ServerName:         lc.ServerName,
 				RootCAs:            lc.ClientCAs,
 			}
-			if lc.ClientCertificates != nil && len(lc.ClientCertificates) > 0 {
+			if len(lc.ClientCertificates) > 0 {
 				config.Certificates = lc.ClientCertificates
 			}
 

diff --git a/pkg/cli/client/service.go b/pkg/cli/client/service.go
@@ -962,7 +962,7 @@ func (ref referrersResult) stringPlainText(maxArtifactTypeLen int) (string, erro
 	for _, referrer := range ref {
 		artifactType := ellipsize(referrer.ArtifactType, maxArtifactTypeLen, ellipsis)
 		// digest := ellipsize(godigest.Digest(referrer.Digest).Encoded(), digestWidth, "")
-		size := ellipsize(humanize.Bytes(uint64(referrer.Size)), sizeWidth, ellipsis)
+		size := ellipsize(humanize.Bytes(uint64(referrer.Size)), sizeWidth, ellipsis) //nolint:gosec,lll // refererrer.Size should >= 0
 
 		row := make([]string, refRowWidth)
 		row[refArtifactTypeIndex] = artifactType
@@ -1042,7 +1042,7 @@ func (repo repoStruct) stringPlainText(repoMaxLen, maxTimeLen int, verbose bool)
 
 	row := make([]string, repoRowWidth)
 	row[repoNameIndex] = repoName
-	row[repoSizeIndex] = ellipsize(strings.ReplaceAll(humanize.Bytes(uint64(repoSize)), " ", ""), sizeWidth, ellipsis)
+	row[repoSizeIndex] = ellipsize(strings.ReplaceAll(humanize.Bytes(uint64(repoSize)), " ", ""), sizeWidth, ellipsis) //nolint:gosec,lll // ignore overflow
 	row[repoLastUpdatedIndex] = repoLastUpdated.String()
 	row[repoDownloadsIndex] = strconv.Itoa(repoDownloads)
 	row[repoStarsIndex] = strconv.Itoa(repoStars)
@@ -1335,15 +1335,15 @@ func combineServerAndEndpointURL(serverURL, endPoint string) (string, error) {
 	return newURL.String(), nil
 }
 
-func ellipsize(text string, max int, trailing string) string {
+func ellipsize(text string, maxLength int, trailing string) string {
 	text = strings.TrimSpace(text)
-	if len(text) <= max {
+	if len(text) <= maxLength {
 		return text
 	}
 
 	chopLength := len(trailing)
 
-	return text[:max-chopLength] + trailing
+	return text[:maxLength-chopLength] + trailing
 }
 
 func getImageTableWriter(writer io.Writer) *tablewriter.Table {

diff --git a/pkg/common/common_test.go b/pkg/common/common_test.go
@@ -118,7 +118,7 @@ func TestCommon(t *testing.T) {
 	})
 
 	Convey("Test AreSocketsEqual with equal IPv6 sockets", t, func() {
-		result, err := common.AreSocketsEqual("[::1]:9000", "[0000:0000:0000:0000:0000:0000:0000:00001]:9000")
+		result, err := common.AreSocketsEqual("[::1]:9000", "[0000:0000:0000:0000:0000:0000:0000:0001]:9000")
 		So(err, ShouldBeNil)
 		So(result, ShouldBeTrue)
 	})

diff --git a/pkg/exporter/api/controller_test.go b/pkg/exporter/api/controller_test.go
@@ -30,8 +30,8 @@ import (
 	. "zotregistry.dev/zot/pkg/test/common"
 )
 
-func getRandomLatencyN(max int64) time.Duration {
-	nBig, err := rand.Int(rand.Reader, big.NewInt(max))
+func getRandomLatencyN(maxLatency int64) time.Duration {
+	nBig, err := rand.Int(rand.Reader, big.NewInt(maxLatency))
 	if err != nil {
 		panic(err)
 	}