feat: bump go to 1.21 (#4846)

* bump go to 1.21, add toolchain go1.21.7 * bump go to 1.21 * fix test --------- Co-authored-by: Egor Balakin <[email protected]>
SAP · Apr 18, 2024 · 077ecfe · 077ecfe
1 parent df0b288
commit 077ecfe
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 19 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
 
       - name: Install Groovy
         run: sudo apt-get update && sudo apt-get install groovy -y

diff --git a/.github/workflows/update-go-dependencies.yml b/.github/workflows/update-go-dependencies.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       - name: Perform update
         run: |
           git checkout -B gh-action-update-golang-dependencies

diff --git a/.github/workflows/upload-go-master.yml b/.github/workflows/upload-go-master.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       - env:
           CGO_ENABLED: 0
         run: |

diff --git a/.github/workflows/verify-go.yml b/.github/workflows/verify-go.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: styfle/[email protected]
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       - name: Cache Golang Packages
         uses: actions/cache@v3
         with:
@@ -43,7 +43,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       - name: Cache Golang Packages
         uses: actions/cache@v3
         with:
@@ -63,8 +63,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
-          # action requires [email protected]
+          go-version: '1.21.x'
       - name: checkout
         uses: actions/checkout@v4
         with:
@@ -79,7 +78,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       - name: Cache Golang Packages
         uses: actions/cache@v3
         with:
@@ -99,7 +98,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       - name: Cache Golang Packages
         uses: actions/cache@v3
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20 AS build-env
+FROM golang:1.21 AS build-env
 COPY . /build
 WORKDIR /build
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/SAP/jenkins-library
 
-go 1.20
+go 1.21
+
+toolchain go1.21.9
 
 // It is a locked dependency of github.com/buildpacks/[email protected]. The maintainers may remove the lock
 // in future releases. Check if 'replace' statement still there in their go.mod file. Remove line below if not.

diff --git a/go.sum b/go.sum
diff --git a/integration/testdata/TestGolangIntegration/golang-project1/go.mod b/integration/testdata/TestGolangIntegration/golang-project1/go.mod
@@ -1,5 +1,5 @@
 module github.com/example/golang-app
 
-go 1.20
+go 1.21
 
 require github.com/gorilla/mux v1.8.0
diff --git a/integration/testdata/TestGolangIntegration/golang-project2/go.mod b/integration/testdata/TestGolangIntegration/golang-project2/go.mod
@@ -1,3 +1,3 @@
 module github.com/example/golang-app
 
-go 1.20
+go 1.21
diff --git a/pkg/http/http_cert_logon_test.go b/pkg/http/http_cert_logon_test.go
@@ -87,7 +87,7 @@ func TestCertificateLogon(t *testing.T) {
 
 	clientPemKey, clientPemCert := GenerateSelfSignedClientAuthCertificate()
 
-	//server
+	// server
 	clientCertPool := x509.NewCertPool()
 	clientCertPool.AppendCertsFromPEM(clientPemCert)
 
@@ -102,7 +102,7 @@ func TestCertificateLogon(t *testing.T) {
 	server.StartTLS()
 	defer server.Close()
 
-	//client
+	// client
 	tlsKeyPair, err := tls.X509KeyPair(clientPemCert, clientPemKey)
 	if err != nil {
 		log.Fatal("Failed to create clients tls key pair")
@@ -131,7 +131,7 @@ func TestCertificateLogon(t *testing.T) {
 		})
 
 		_, err := c.SendRequest("GET", server.URL, nil, nil, nil)
-		assert.ErrorContains(t, err, "bad certificate")
+		assert.ErrorContains(t, err, "certificate required")
 	})
 
 	t.Run("Failure - Login with wrong certificate", func(t *testing.T) {
@@ -150,14 +150,14 @@ func TestCertificateLogon(t *testing.T) {
 		})
 
 		_, err = c.SendRequest("GET", server.URL, nil, nil, nil)
-		assert.ErrorContains(t, err, "bad certificate")
+		assert.ErrorContains(t, err, "unknown certificate authority")
 	})
 
 	t.Run("SanityCheck", func(t *testing.T) {
 		client := &http.Client{
 			Transport: &http.Transport{
 				TLSClientConfig: &tls.Config{
-					//RootCAs:      certPool,
+					// RootCAs:      certPool,
 					InsecureSkipVerify: true,
 					Certificates:       []tls.Certificate{tlsKeyPair},
 				},

diff --git a/src/com/sap/piper/PiperGoUtils.groovy b/src/com/sap/piper/PiperGoUtils.groovy
@@ -30,7 +30,7 @@ class PiperGoUtils implements Serializable {
 
         if (steps.env.REPOSITORY_UNDER_TEST && steps.env.LIBRARY_VERSION_UNDER_TEST) {
             steps.echo("Running in a consumer test, building unit-under-test binary for verification.")
-            steps.dockerExecute(script: steps, dockerImage: 'golang:1.20', dockerOptions: '-u 0', dockerEnvVars: [
+            steps.dockerExecute(script: steps, dockerImage: 'golang:1.21', dockerOptions: '-u 0', dockerEnvVars: [
                 REPOSITORY_UNDER_TEST: steps.env.REPOSITORY_UNDER_TEST,
                 LIBRARY_VERSION_UNDER_TEST: steps.env.LIBRARY_VERSION_UNDER_TEST
             ]) {