Merge pull request #1469 from omer-vishlitzky/release-ocm-2.13

NO-ISSUE: upgrade go to 1.25

Author: openshift-merge-bot[bot]

.golangci.yml

@@ -1,77 +1,84 @@
-# This file contains all available configuration options
-# with their default values.
-
-# options for analysis running
+version: "2"
 run:
-  # default concurrency is a available CPU number
   concurrency: 4
-
-  # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 10m
-
-  # exit code when at least one issue was found, default is 1
   issues-exit-code: 1
-
-  # include test files or not, default is true
   tests: true
-
-# output configuration options
-output:
-  # print lines of code with issue, default is true
-  print-issued-lines: true
-
-  # print linter name in the end of issue text, default is true
-  print-linter-name: true
-
-issues:
-  # which dirs to skip: issues from them won't be reported;
-  # can use regexp here: generated.*, regexp is applied on full path;
-  # default value is empty list, but default dirs are skipped independently
-  # from this option's value (see skip-dirs-use-default).
-  exclude-dirs:
-    - build
-    - client
-    - docs
-    - models
-    - restapi
-
-  # List of regexps of issue texts to exclude, empty list by default.
-  # But independently from this option we use default exclude patterns,
-  # it can be disabled by `exclude-use-default: false`. To list all
-  # excluded by default patterns execute `golangci-lint run --help`
-  exclude:
-    - G107
-    - G115  # Integer overflow conversion
-    - G402  # support scality DisableSSL
-    - G401  # Use of weak cryptographic primitive
-    - G501  # Blacklisted import `crypto/md5`: weak cryptographic primitive
-    - '"ok" shadows declaration'
-
-  # make issues output unique by line, default is true
-  uniq-by-line: true
-
 linters:
   enable:
-    - gosimple
-    - staticcheck
-    - unused
-    - govet
+    - copyloopvar
     - gocyclo
-    - gofmt
     - gosec
     - unconvert
+  settings:
+    govet:
+      enable:
+        - shadow
+      settings:
+        printf:
+          funcs:
+            - Infof
+            - Warnf
+            - Errorf
+            - Fatalf
+    staticcheck:
+      checks:
+        - "all"
+        - "-ST1001"
+        - "-ST1003"
+        - "-ST1005"
+        - "-ST1011"
+        - "-ST1016"
+        - "-ST1017"
+        - "-ST1019"
+        - "-ST1023"
+        - "-QF1001"
+        - "-QF1002"
+        - "-QF1003"
+        - "-QF1005"
+        - "-QF1006"
+        - "-QF1007"
+        - "-QF1008"
+        - "-QF1011"
+        - "-QF1012"
+    gosec:
+      excludes:
+        - G107
+        - G108
+        - G115
+        - G402
+        - G602
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules: []
+    paths:
+      - build
+      - client
+      - docs
+      - models
+      - restapi
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  uniq-by-line: true
+formatters:
+  enable:
+    - gci
+    - gofmt
     - goimports
-    - copyloopvar
-
-linters-settings:
-  govet:
-    enable:
-      - shadow
-
-    settings:
-      printf:
-        funcs:
-          - Infof
-          - Warnf
-          - Errorf
-          - Fatalf
+  exclusions:
+    generated: lax
+    paths:
+      - build
+      - client
+      - docs
+      - models
+      - restapi
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile.assisted-installer-build

@@ -2,11 +2,11 @@ FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS golang
 
 ENV GOFLAGS=""
 
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.8 && \ 
-  go install golang.org/x/tools/cmd/goimports@v0.1.0 && \
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.8.0 && \ 
+  go install golang.org/x/tools/cmd/goimports@v0.34.0 && \
   go install github.com/onsi/ginkgo/ginkgo@v1.16.1 && \
   go install go.uber.org/mock/mockgen@v0.4.0 && \
-  go install gotest.tools/gotestsum@v1.6.3 && \
+  go install gotest.tools/gotestsum@v1.12.3 && \
   go install github.com/axw/gocov/gocov@v1.1.0 && \
   go install github.com/AlekSi/gocov-xml@v1.1.0
 

go.mod

@@ -1,6 +1,8 @@
 module github.com/openshift/assisted-installer
 
-go 1.21
+go 1.25.0
+
+toolchain go1.25.5
 
 require (
 	github.com/PuerkitoBio/rehttp v1.4.0

src/assisted_installer_controller/assisted_installer_controller.go

@@ -18,18 +18,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/thoas/go-funk"
-
 	"github.com/hashicorp/go-version"
 	metal3v1alpha1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
 	configv1 "github.com/openshift/api/config/v1"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	certificatesv1 "k8s.io/api/certificates/v1"
-	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	mapiv1beta1 "github.com/openshift/api/machine/v1beta1"
 	"github.com/openshift/assisted-installer/src/common"
 	"github.com/openshift/assisted-installer/src/config"
@@ -38,6 +29,13 @@ import (
 	"github.com/openshift/assisted-installer/src/ops"
 	"github.com/openshift/assisted-installer/src/utils"
 	"github.com/openshift/assisted-service/models"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/thoas/go-funk"
+	certificatesv1 "k8s.io/api/certificates/v1"
+	v1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -472,7 +470,7 @@ func (c *controller) PostInstallConfigs(ctx context.Context, wg *sync.WaitGroup)
 	}
 
 	errMessage := ""
-	err, data := c.postInstallConfigs(ctx)
+	data, err := c.postInstallConfigs(ctx)
 	// Even if the context was cancelled, the error is sent to the assisted service.
 	// The timeouts will be handled by the service
 	if err != nil {
@@ -487,7 +485,7 @@ func (c *controller) PostInstallConfigs(ctx context.Context, wg *sync.WaitGroup)
 	c.sendCompleteInstallation(ctx, success, errMessage, data)
 }
 
-func (c *controller) postInstallConfigs(ctx context.Context) (error, map[string]interface{}) {
+func (c *controller) postInstallConfigs(ctx context.Context) (map[string]interface{}, error) {
 	var err error
 	var data map[string]interface{}
 
@@ -499,12 +497,12 @@ func (c *controller) postInstallConfigs(ctx context.Context) (error, map[string]
 		data = map[string]interface{}{clusterOperatorReportKey: report}
 	}
 	if err != nil {
-		return errors.Wrapf(err, "Stopped waiting for cluster operators to be available"), data
+		return data, errors.Wrapf(err, "Stopped waiting for cluster operators to be available")
 	}
 
 	err = c.waitOnStage(ctx, models.FinalizingStageAddingRouterCa, failedOperatorRetry*time.Second, c.addRouterCAToClusterCA)
 	if err != nil {
-		return errors.Wrapf(err, "Stopped waiting for router ca data"), data
+		return data, errors.Wrapf(err, "Stopped waiting for router ca data")
 	}
 
 	// Wait for OLM operators

src/assisted_installer_controller/assisted_installer_controller_test.go

@@ -14,31 +14,28 @@ import (
 	"testing"
 	"time"
 
-	batchV1 "k8s.io/api/batch/v1"
-	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	apischema "k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-
+	"github.com/go-openapi/strfmt"
 	"github.com/google/uuid"
 	metal3v1alpha1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
-	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
-	"github.com/openshift/assisted-installer/src/common"
-	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
-	certificatesv1 "k8s.io/api/certificates/v1"
-
-	"github.com/go-openapi/strfmt"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/sirupsen/logrus"
-	gomock "go.uber.org/mock/gomock"
-
 	configv1 "github.com/openshift/api/config/v1"
+	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
+	"github.com/openshift/assisted-installer/src/common"
 	"github.com/openshift/assisted-installer/src/inventory_client"
 	"github.com/openshift/assisted-installer/src/k8s_client"
 	"github.com/openshift/assisted-installer/src/ops"
 	"github.com/openshift/assisted-service/models"
+	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	"github.com/sirupsen/logrus"
+	gomock "go.uber.org/mock/gomock"
+	batchV1 "k8s.io/api/batch/v1"
+	certificatesv1 "k8s.io/api/certificates/v1"
+	v1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	apischema "k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestValidator(t *testing.T) {

src/assisted_installer_controller/operator_handler.go

@@ -3,16 +3,15 @@ package assisted_installer_controller
 import (
 	"context"
 
+	"github.com/openshift/assisted-installer/src/k8s_client"
+	"github.com/openshift/assisted-installer/src/utils"
+	"github.com/openshift/assisted-service/models"
 	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/sirupsen/logrus"
 	batchV1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
-
-	"github.com/openshift/assisted-installer/src/k8s_client"
-	"github.com/openshift/assisted-installer/src/utils"
-	"github.com/openshift/assisted-service/models"
 )
 
 const (

src/common/common.go

@@ -15,7 +15,6 @@ import (
 	"github.com/openshift/assisted-installer/src/k8s_client"
 	"github.com/openshift/assisted-installer/src/utils"
 	"github.com/openshift/assisted-service/models"
-
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/thoas/go-funk"

src/common/common_test.go

@@ -259,7 +259,7 @@ var _ = Describe("verify common", func() {
 		}
 
 		for _, test := range tests {
-			test := test
+
 			It(fmt.Sprintf("platform %v, invoker %v, version %v, cluster %v, is expected to remove uninitialized taint = %v", test.PlatformType, test.Invoker, test.VersionOpenshift, test.Cluster, test.ExpectedRemoveUninitializedTaint), func() {
 				if test.PlatformType == models.PlatformTypeVsphere {
 					mockbmclient.EXPECT().GetCluster(gomock.Any(), false).Return(test.Cluster, nil).Times(1)
@@ -306,7 +306,7 @@ var _ = Describe("verify common", func() {
 			}
 
 			for _, test := range tests {
-				test := test
+
 				It(test.TestName, func() {
 					mockbmclient.EXPECT().GetCluster(gomock.Any(), false).Return(test.Cluster, nil).Times(1)
 					hasValidvSphereCredentials := HasValidvSphereCredentials(context.TODO(), mockbmclient, mockkcclient, l)
@@ -352,7 +352,7 @@ var _ = Describe("verify common", func() {
 			}
 
 			for _, test := range configMapTests {
-				test := test
+
 				It(test.TestName, func() {
 					mockbmclient.EXPECT().GetCluster(gomock.Any(), false).Return(nil, errors.New("some error")).Times(1)
 					mockkcclient.EXPECT().GetConfigMap(gomock.Any(), gomock.Any()).Return(test.ConfigMap, nil).Times(1)

src/config/config.go

@@ -3,9 +3,8 @@ package config
 import (
 	"encoding/json"
 	"flag"
-	"os"
-
 	"fmt"
+	"os"
 
 	"github.com/kelseyhightower/envconfig"
 	"github.com/openshift/assisted-installer/src/utils"

src/coreos_logger/coreos_installer_log_writer.go

@@ -6,9 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/openshift/assisted-installer/src/utils"
-
 	"github.com/openshift/assisted-installer/src/inventory_client"
+	"github.com/openshift/assisted-installer/src/utils"
 	"github.com/openshift/assisted-service/models"
 	"github.com/sirupsen/logrus"
 )