Build using Go 1.25.0 (#791)

thegridman · web-flow · commit 96bc32fcce01 · 2025-08-20T09:51:18.000+03:00
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.24.4
+1.25.0
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,26 +1,47 @@
 # options for analysis running
+version: "2"
+
 run:
   # include test files or not, default is true
   tests: true
 
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: disable
+    paths:
+      - data/
+
 linters:
+  settings:
+    staticcheck:
+      dot-import-whitelist:
+        - github.com/onsi/gomeg
   enable:
     - asasalint
     - asciicheck
     - bidichk
     - bodyclose
     - gocritic
-    - gofmt
 
-issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    # Exclude some linters from running on data files.
-    - path: pkg/data
-      linters:
-        - gofmt
-    # Exclude some linters from running on tests files.
-    - path: test\.go
-      linters:
-        - gosec
-        - bodyclose
+  exclusions:
+    presets:
+      - common-false-positives
+    paths:
+      - utils/docgen/main.go
+      - utils/linkcheck/main.go
+    rules:
+      - path: _test\.go
+        linters:
+          - gosec
+          - bodyclose
+          - errcheck
+      - path: test/
+        linters:
+          - staticcheck
+        text: "ST1001:"
+      - path: pkg/fakes/
+        linters:
+          - staticcheck
+        text: "ST1001:"
diff --git a/Makefile b/Makefile
@@ -881,8 +881,7 @@ code-review: $(BUILD_TARGETS)/generate golangci copyright  ## Full code review a
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: golangci
 golangci: $(TOOLS_BIN)/golangci-lint ## Go code review
-	$(TOOLS_BIN)/golangci-lint run -v --timeout=5m --exclude='G402:' --exclude='G101:' --exclude='G114:' --exclude-dirs=.*/fakes --exclude-files=zz_.*,generated/*,pkg/data/assets... ./api/... ./controllers/... ./pkg/... ./runner/...
-	$(TOOLS_BIN)/golangci-lint run -v --timeout=5m --exclude='G107:' --exclude='G101:' --exclude='G112:' --exclude='SA4005:' --exclude='should not use dot imports' ./test/... ./pkg/fakes/...
+	$(TOOLS_BIN)/golangci-lint run -v --timeout=5m
 
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -2969,7 +2968,7 @@ get-istio: $(BUILD_PROPS) $(BUILD_OUTPUT)/istio-config.yaml ## Download Istio to
 # ----------------------------------------------------------------------------------------------------------------------
 $(TOOLS_BIN)/golangci-lint:
 	@mkdir -p $(TOOLS_BIN)
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v1.64.7
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh --header $(GH_AUTH) | sh -s -- -b $(TOOLS_BIN) v2.4.0
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Display the full version string for the artifacts that would be built.
diff --git a/api/v1/coherence_types.go b/api/v1/coherence_types.go
@@ -11,6 +11,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/go-logr/logr"
 	"github.com/go-test/deep"
 	"github.com/oracle/coherence-operator/pkg/operator"
@@ -26,13 +31,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
-	"os"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"strconv"
-	"strings"
-	"time"
 )
 
 // Common Coherence API structs
@@ -2985,7 +2986,7 @@ type Resources struct {
 
 func (in Resources) MarshalJSON() ([]byte, error) {
 	buffer := bytes.NewBufferString("{")
-	buffer.WriteString(fmt.Sprintf(`"apiVersion":"%d"`, in.Version))
+	_, _ = fmt.Fprintf(buffer, `"apiVersion":"%d"`, in.Version)
 	buffer.WriteString(`, "kind": "Resources"`)
 	buffer.WriteString(`, "items":[`)
 
diff --git a/api/v1/coherence_webhook_job.go b/api/v1/coherence_webhook_job.go
@@ -9,6 +9,7 @@ package v1
 import (
 	"context"
 	"fmt"
+
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
@@ -68,7 +69,7 @@ func (in *CoherenceJob) Default(_ context.Context, obj runtime.Object) error {
 	}
 
 	// set the default replicas if not present
-	if spec.CoherenceResourceSpec.Replicas == nil {
+	if spec.Replicas == nil {
 		spec.SetReplicas(spec.GetReplicas())
 	}
 
diff --git a/api/v1/coherencejobresource_types.go b/api/v1/coherencejobresource_types.go
@@ -8,6 +8,7 @@ package v1
 
 import (
 	"fmt"
+
 	"github.com/oracle/coherence-operator/pkg/operator"
 	"golang.org/x/mod/semver"
 	batchv1 "k8s.io/api/batch/v1"
@@ -544,10 +545,10 @@ func (in *CoherenceJobResourceSpec) GetRestartPolicy() *corev1.RestartPolicy {
 // return either the actual Replica value or the default (DefaultReplicas const)
 // if the Replicas field is nil.
 func (in *CoherenceJobResourceSpec) GetReplicas() int32 {
-	if in == nil || in.CoherenceResourceSpec.Replicas == nil {
+	if in == nil || in.Replicas == nil {
 		return DefaultJobReplicas
 	}
-	return *in.CoherenceResourceSpec.Replicas
+	return *in.Replicas
 }
 
 // GetWkaIPFamily returns the IP Family of the headless Service used for Coherence WKA.
diff --git a/api/v1/coherenceresource_types.go b/api/v1/coherenceresource_types.go
@@ -8,6 +8,7 @@ package v1
 
 import (
 	"fmt"
+
 	"github.com/oracle/coherence-operator/pkg/operator"
 	"golang.org/x/mod/semver"
 	appsv1 "k8s.io/api/apps/v1"
@@ -186,7 +187,7 @@ func (in *Coherence) GetReplicas() int32 {
 // SetReplicas sets the number of replicas required for a deployment.
 func (in *Coherence) SetReplicas(replicas int32) {
 	if in != nil {
-		in.Spec.CoherenceResourceSpec.Replicas = &replicas
+		in.Spec.Replicas = &replicas
 	}
 }
 
diff --git a/controllers/job/job_controller.go b/controllers/job/job_controller.go
@@ -9,6 +9,8 @@ package job
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/go-logr/logr"
 	coh "github.com/oracle/coherence-operator/api/v1"
 	"github.com/oracle/coherence-operator/controllers/reconciler"
@@ -25,7 +27,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"time"
 )
 
 const (
@@ -260,8 +261,8 @@ func (in *ReconcileJob) patchJob(ctx context.Context, deployment coh.CoherenceRe
 	current := job.DeepCopy()
 
 	// We NEVER patch finalizers
-	original.ObjectMeta.Finalizers = current.ObjectMeta.Finalizers
-	desired.ObjectMeta.Finalizers = current.ObjectMeta.Finalizers
+	original.Finalizers = current.Finalizers
+	desired.Finalizers = current.Finalizers
 
 	// We need to ensure we do not create a patch due to differences in
 	// Job Status, so we blank out the status fields
diff --git a/controllers/statefulset/statefulset_controller.go b/controllers/statefulset/statefulset_controller.go
@@ -9,6 +9,10 @@ package statefulset
 import (
 	"context"
 	"fmt"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/go-logr/logr"
 	coh "github.com/oracle/coherence-operator/api/v1"
 	"github.com/oracle/coherence-operator/controllers/reconciler"
@@ -25,12 +29,9 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
-	"os"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"strings"
-	"time"
 )
 
 const (
@@ -455,8 +456,8 @@ func (in *ReconcileStatefulSet) maybePatchStatefulSet(ctx context.Context, deplo
 	}
 
 	// We NEVER patch finalizers
-	original.ObjectMeta.Finalizers = current.ObjectMeta.Finalizers
-	desired.ObjectMeta.Finalizers = current.ObjectMeta.Finalizers
+	original.Finalizers = current.Finalizers
+	desired.Finalizers = current.Finalizers
 
 	// We need to ensure we do not create a patch due to differences in
 	// StatefulSet Status, so we blank out the status fields
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ module github.com/oracle/coherence-operator
 // See ./.go-version for the go compiler version used when building binaries
 //
 // https://go.dev/doc/modules/gomod-ref#go
-go 1.24.4
+go 1.25.0
 
 require (
 	github.com/distribution/reference v0.6.0
diff --git a/pkg/management/coherence_management.go b/pkg/management/coherence_management.go
@@ -148,7 +148,7 @@ func query(cl *http.Client, url string, v interface{}) (int, error) {
 	}
 
 	if response != nil {
-		defer response.Body.Close()
+		defer func() { _ = response.Body.Close() }()
 	}
 
 	if err != nil {
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -11,6 +11,11 @@ import (
 	"crypto/tls"
 	"flag"
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
 	"github.com/go-logr/logr"
 	"github.com/oracle/coherence-operator/pkg/clients"
 	"github.com/oracle/coherence-operator/pkg/data"
@@ -19,11 +24,7 @@ import (
 	"github.com/spf13/viper"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/version"
-	"os"
-	"path/filepath"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"strings"
-	"time"
 )
 
 const (
@@ -553,7 +554,7 @@ func NewCipherSuiteConfig(v *viper.Viper, log logr.Logger) (func(c *tls.Config),
 
 	if allDenied && len(allowList) == 0 {
 		return func(c *tls.Config) {},
-			fmt.Errorf("The --%s command line flag has denied all cipher suites but no allowed suites have been specified using the %s flag ", FlagCipherDenyList, FlagCipherAllowList)
+			fmt.Errorf("the --%s command line flag has denied all cipher suites but no allowed suites have been specified using the %s flag ", FlagCipherDenyList, FlagCipherAllowList)
 	}
 
 	for _, name := range allowList {
diff --git a/pkg/runner/cmd_server.go b/pkg/runner/cmd_server.go
@@ -9,12 +9,13 @@ package runner
 import (
 	"bufio"
 	"fmt"
+	"os"
+	"strings"
+
 	v1 "github.com/oracle/coherence-operator/api/v1"
 	"github.com/oracle/coherence-operator/pkg/runner/run_details"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"os"
-	"strings"
 )
 
 const (
@@ -124,7 +125,7 @@ func readLines(path string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer file.Close()
+	defer func() { _ = file.Close() }()
 
 	var lines []string
 	scanner := bufio.NewScanner(file)
diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -11,6 +11,16 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/fsnotify/fsnotify"
 	"github.com/go-logr/logr"
 	v1 "github.com/oracle/coherence-operator/api/v1"
@@ -20,17 +30,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"io"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"net/http"
-	"net/url"
-	"os"
-	"os/exec"
-	"path/filepath"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"strconv"
-	"strings"
-	"time"
 )
 
 // The code that actually starts the process in the Coherence container.
@@ -443,16 +444,16 @@ func configureCommand(details *run_details.RunDetails) error {
 	}
 
 	gc := strings.ToLower(details.Getenv(v1.EnvVarJvmGcCollector))
-	switch {
-	case gc == "g1":
+	switch gc {
+	case "g1":
 		details.AddMemoryOption("-XX:+UseG1GC")
-	case gc == "cms":
+	case "cms":
 		details.AddMemoryOption("-XX:+UseConcMarkSweepGC")
-	case gc == "parallel":
+	case "parallel":
 		details.AddMemoryOption("-XX:+UseParallelGC")
-	case gc == "serial":
+	case "serial":
 		details.AddMemoryOption("-XX:+UseSerialGC")
-	case gc == "zgc":
+	case "zgc":
 		details.AddMemoryOption("-XX:+UseZGC")
 	}
 
@@ -948,7 +949,7 @@ func httpGet(urlString string, client http.Client) (string, int, error) {
 		return "", http.StatusInternalServerError, errors.Wrapf(err, "failed to get URL %s", urlString)
 	}
 	//noinspection GoUnhandledErrorResult
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
diff --git a/pkg/runner/runner_initialise_test.go b/pkg/runner/runner_initialise_test.go
diff --git a/test/certification/certifiy_deployment_test.go b/test/certification/certifiy_deployment_test.go
diff --git a/test/e2e/helper/e2e-helpers.go b/test/e2e/helper/e2e-helpers.go
diff --git a/test/e2e/helper/rest_helpers.go b/test/e2e/helper/rest_helpers.go
diff --git a/test/e2e/local/clustering_test.go b/test/e2e/local/clustering_test.go
diff --git a/utils/docgen/main.go b/utils/docgen/main.go
diff --git a/utils/linkcheck/main.go b/utils/linkcheck/main.go

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ package v1`
`9`	`9`	`import (`
`10`	`10`	`"context"`
`11`	`11`	`"fmt"`
	`12`	`+`
`12`	`13`	`batchv1 "k8s.io/api/batch/v1"`
`13`	`14`	`corev1 "k8s.io/api/core/v1"`
`14`	`15`	`apiequality "k8s.io/apimachinery/pkg/api/equality"`
`@@ -68,7 +69,7 @@ func (in *CoherenceJob) Default(_ context.Context, obj runtime.Object) error {`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`// set the default replicas if not present`
`71`		`- if spec.CoherenceResourceSpec.Replicas == nil {`
	`72`	`+ if spec.Replicas == nil {`
`72`	`73`	`spec.SetReplicas(spec.GetReplicas())`
`73`	`74`	`}`
`74`	`75`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ package v1`
`8`	`8`
`9`	`9`	`import (`
`10`	`10`	`"fmt"`
	`11`	`+`
`11`	`12`	`"github.com/oracle/coherence-operator/pkg/operator"`
`12`	`13`	`"golang.org/x/mod/semver"`
`13`	`14`	`appsv1 "k8s.io/api/apps/v1"`
`@@ -186,7 +187,7 @@ func (in *Coherence) GetReplicas() int32 {`
`186`	`187`	`// SetReplicas sets the number of replicas required for a deployment.`
`187`	`188`	`func (in *Coherence) SetReplicas(replicas int32) {`
`188`	`189`	`if in != nil {`
`189`		`- in.Spec.CoherenceResourceSpec.Replicas = &replicas`
	`190`	`+ in.Spec.Replicas = &replicas`
`190`	`191`	`}`
`191`	`192`	`}`
`192`	`193`