Upgrade Go to 1.25 (#6011)

* Upgrade Go to 1.25

* Upgrade to golangci-lint v2

* Remove use of apt-key

.go-version

@@ -1 +1 @@
-1.24.4
+1.25.0

.golangci.yml

@@ -1,77 +1,93 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
-    - staticcheck
+    - bodyclose
-    - stylecheck
     - errcheck
     - misspell
-    - bodyclose
+    - staticcheck
-
+  exclusions:
-issues:
+    generated: lax
-  exclude-rules:
+    presets:
-    - linters:
+      - comments
-        - stylecheck
+      - common-false-positives
-      text: "ST1005:"
+      - legacy
-    - linters:
+      - std-error-handling
-        - stylecheck
+    rules:
-      text: "ST1003:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'ST1005:'
-      text: "SA1019: pbs.AuthorizedWorkerList is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'ST1003:'
-      text: "SA1019: item.GetGrantScopeId is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: pbs.AuthorizedWorkerList is deprecated:'
-      text: "SA1019: out.GrantScopeId is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: item.GetGrantScopeId is deprecated:'
-      text: "SA1019: authorized.GetWorkerKeyIdentifiers is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: out.GrantScopeId is deprecated:'
-      text: "SA1019: result.GetAuthorizedWorkers is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: authorized.GetWorkerKeyIdentifiers is deprecated:'
-      text: "SA1019: item.GetWorkerFilter is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: result.GetAuthorizedWorkers is deprecated:'
-      text: "SA1019: out.GetWorkerFilter is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: item.GetWorkerFilter is deprecated:'
-      text: "SA1019: out.WorkerFilter is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: out.GetWorkerFilter is deprecated:'
-      text: "SA1019: req.GetTokenType is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: out.WorkerFilter is deprecated:'
-      text: "SA1019: s.resp.GetPkcs8HostKeys is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: req.GetTokenType is deprecated:'
-      text: "SA1019: s.resp.GetCredentials is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: s.resp.GetPkcs8HostKeys is deprecated:'
-      text: 'SA1019: got.GetAuthorizedWorkers is deprecated:'
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: s.resp.GetCredentials is deprecated:'
-      text: 'SA1019: gotAuthorizedWorkers.GetWorkerKeyIdentifiers is deprecated:'
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: got.GetAuthorizedWorkers is deprecated:'
-      text: 'SA1019: tc.want.GetAuthorizedWorkers is deprecated:'
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: gotAuthorizedWorkers.GetWorkerKeyIdentifiers is deprecated:'
-      text: 'SA1019: wantAuthorizedWorkers.GetWorkerKeyIdentifiers is deprecated:'
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: tc.want.GetAuthorizedWorkers is deprecated:'
-      text: "SA1019: authorizedWorkerList.WorkerKeyIdentifiers is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: wantAuthorizedWorkers.GetWorkerKeyIdentifiers is deprecated:'
-      text: "SA1019: req.GetConnectedWorkerKeyIdentifiers is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: authorizedWorkerList.WorkerKeyIdentifiers is deprecated:'
-      text: "SA1019: j.GetId is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: req.GetConnectedWorkerKeyIdentifiers is deprecated:'
-      text: "SA1019: pbs.StatusRequest is deprecated:"
+      - linters:
-    - linters:
+          - staticcheck
-        - staticcheck
+        text: 'SA1019: j.GetId is deprecated:'
-      text: "SA1019: pbs.StatusResponse is deprecated:"
+      - linters:
+          - staticcheck
+        text: 'SA1019: pbs.StatusRequest is deprecated:'
+      - linters:
+          - staticcheck
+        text: 'SA1019: pbs.StatusResponse is deprecated:'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -37,7 +37,7 @@ golangci-lint:
 
 	if [ "$(GOLINT_INSTALLED)" = "" ]; then \
 		curl -sSfL \
-			https://raw.githubusercontent.com/golangci/golangci-lint/3f6f9043a8d0048ec075d2ace970b256cdf37a96/install.sh | sh -s -- -b $(GO_PATH)/bin v1.64.7; \
+			https://raw.githubusercontent.com/golangci/golangci-lint/3f6f9043a8d0048ec075d2ace970b256cdf37a96/install.sh | sh -s -- -b $(GO_PATH)/bin v2.4.0; \
 	fi;
 
 .PHONY: cleangen

api/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/api
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/coder/websocket v1.8.13

enos/modules/test_e2e_docker/test.sh

@@ -17,16 +17,22 @@ apt update
 # default-mysql-client is used for mysql tests
 # wget is used for downloading external dependencies and repository keys
 # apt-transport-https enables HTTPS transport for APT repositories
-apt install unzip pass lsb-release postgresql-client default-mysql-client wget apt-transport-https -y
+apt install unzip pass lsb-release postgresql-client default-mysql-client wget apt-transport-https  -y
 
 # Function to install Cassandra
 install_cassandra() {
   # Add Cassandra repository key
-  wget -q -O - https://www.apache.org/dist/cassandra/KEYS | apt-key add -
+  wget -O cassandra.keys https://www.apache.org/dist/cassandra/KEYS
-  
+
+  # Convert key to gpg format
+  gpg --no-default-keyring --keyring ./temp-keyring.gpg --import cassandra.keys
+  gpg --no-default-keyring --keyring ./temp-keyring.gpg --export --output cassandra.gpg
+  rm ./temp-keyring.gpg cassandra.keys
+  mv cassandra.gpg /etc/apt/keyrings/cassandra.gpg
+
   # Add Cassandra repository
-  echo "deb https://debian.cassandra.apache.org 41x main" | tee -a /etc/apt/sources.list.d/cassandra.sources.list
+  echo "deb [signed-by=/etc/apt/keyrings/cassandra.gpg] https://debian.cassandra.apache.org 41x main" | tee -a /etc/apt/sources.list.d/cassandra.sources.list
-  
+
   # Update package list and install Cassandra
   apt update
   apt install cassandra -y
@@ -40,9 +46,9 @@ install_cassandra
 export KEY_PW=boundary
 gpg --generate-key --batch <<eoGpgConf
     %echo Started!
-    Key-Type: default
+    Key-Type: RSA
     Key-Length: default
-    Subkey-Type: default
+    Subkey-Type: RSA
     Name-Real: boundary
     Name-Comment: default
     Name-Email: default

go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary
 
-go 1.24.4
+go 1.25.0
 
 replace github.com/hashicorp/boundary/api => ./api
 

plugins/boundary/mains/aws/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/boundary/mains/aws
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/boundary-plugin-aws v0.5.1

plugins/boundary/mains/azure/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/boundary/mains/azure
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/boundary-plugin-azure v0.2.0

plugins/boundary/mains/gcp/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/boundary/mains/gcp
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/boundary-plugin-gcp v0.1.0

plugins/boundary/mains/minio/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/boundary/mains/minio
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/boundary-plugin-minio v0.1.7

plugins/kms/mains/alicloudkms/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/kms/mains/alicloudkms
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.8

plugins/kms/mains/awskms/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/kms/mains/awskms
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.8

plugins/kms/mains/azurekeyvault/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/kms/mains/azurekeyvault
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.8

plugins/kms/mains/gcpckms/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/kms/mains/gcpckms
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.8

plugins/kms/mains/ocikms/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/kms/mains/ocikms
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.8

plugins/kms/mains/transit/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/plugins/kms/mains/transit
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.8

sdk/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/boundary/sdk
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/coder/websocket v1.8.13