Merge pull request #1759 from jhutar/fix45-probes

feat(KONFLUX-11678): Update release lib and get us to Go 1.25

Author: psturc

.github/workflows/PR.yaml

@@ -6,24 +6,28 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup Golang
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: '1.24'
+          go-version: '1.25'
       - run: go version
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v9
         with:
           args: --timeout=10m
-          version: v1.64.5
+          version: v2.8.0
       - name: Run Gosec Security Scanner
-        uses: securego/gosec@v2.20.0
+        uses: securego/gosec@v2.22.11
         with:
           # we let the report trigger content trigger a failure using the GitHub Security features.
           args: "-no-fail -fmt sarif -out results.sarif ./..."
+      - name: Cleanup results.sarif file
+        # This is workaround for https://github.com/securego/gosec/issues/1482
+        run: |
+          jq '(.runs[].results[].fixes[]? | select(.artifactChanges == null)).artifactChanges = [{"artifactLocation": {"uri": "unknown"}, "replacements": [{"deletedRegion": {"startLine": 1}}]}]' results.sarif > results.sarif.tmp && mv results.sarif.tmp results.sarif
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           # Path to SARIF file relative to the root of the repository
           sarif_file: results.sarif
@@ -32,8 +36,10 @@ jobs:
     name: Unit tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup Golang
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.25'
       - name: Run unit tests
         run: make test/unit

.golangci.yml

@@ -1,6 +1,25 @@
-issues:
-  exclude:
-    - composites
+version: "2"
 linters:
   enable:
     - ginkgolinter
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - path: (.+)\.go$
+        text: composites
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
 ENV GOBIN=$HOME/bin
 
 USER root
@@ -83,7 +83,7 @@ RUN ARCH=${TARGETARCH} && \
     rm -rf oras_${ORAS_VERSION}_*.tar.gz oras-install/ && \
     oras version
 
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24
+FROM registry.access.redhat.com/ubi9/go-toolset:1.25
 USER root
 
 WORKDIR /konflux-e2e

go.mod

@@ -249,7 +249,7 @@ func (i *InstallAppStudio) CheckOperatorsReady() (err error) {
 				klog.Fatal(err)
 			}
 
-			if !(application.Status.Sync.Status == "Synced" && application.Status.Health.Status == "Healthy") {
+			if application.Status.Sync.Status != "Synced" || application.Status.Health.Status != "Healthy" {
 				klog.Infof("Application %s not ready", app.Name)
 				count++
 			} else if strings.Contains(application.String(), ("context deadline exceeded")) {

go.sum

@@ -48,7 +48,7 @@ func ExecuteTestAction(rctx *rulesengine.RuleCtx) error {
 		if err != nil {
 			return fmt.Errorf("can't convert %q to an int to configure the amount of ginkgo procs", procs)
 		}
-		rctx.CLIConfig.Procs = procsInt
+		rctx.Procs = procsInt
 		rctx.NoColor = true
 	}
 

magefiles/installation/install.go

@@ -459,7 +459,7 @@ func NewRuleCtx() *RuleCtx {
 	var reporterConfig = types.NewDefaultReporterConfig()
 	var cliConfig = types.NewDefaultCLIConfig()
 	var goFlagsConfig = types.NewDefaultGoFlagsConfig()
-	var envData map[string]any = make(map[string]any)
+	envData := make(map[string]any)
 
 	r := &RuleCtx{cliConfig,
 		suiteConfig,

magefiles/rulesengine/repos/common.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/konflux-ci/e2e-tests/pkg/logs"
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
-	. "github.com/onsi/ginkgo/v2"
+	ginkgo "github.com/onsi/ginkgo/v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -104,7 +104,7 @@ func (s *SuiteController) GetPodLogs(pod *corev1.Pod) map[string][]byte {
 	for _, c := range containers {
 		log, err := utils.GetContainerLogs(s.KubeInterface(), pod.Name, c.Name, pod.Namespace)
 		if err != nil {
-			GinkgoWriter.Printf("error getting logs for pod/container %s/%s: %v\n", pod.Name, c.Name, err.Error())
+			ginkgo.GinkgoWriter.Printf("error getting logs for pod/container %s/%s: %v\n", pod.Name, c.Name, err.Error())
 			continue
 		}
 

magefiles/rulesengine/types.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/konflux-ci/e2e-tests/pkg/constants"
-	. "github.com/konflux-ci/e2e-tests/pkg/constants"
 	"github.com/konflux-ci/e2e-tests/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
@@ -163,12 +162,12 @@ func (s *SuiteController) AddRegistryAuthSecretToSA(registryAuth, namespace stri
 		return fmt.Errorf("%s", "failed to get registry auth secret")
 	}
 
-	_, err := s.CreateRegistryAuthSecret(RegistryAuthSecretName, namespace, quayToken)
+	_, err := s.CreateRegistryAuthSecret(constants.RegistryAuthSecretName, namespace, quayToken)
 	if err != nil {
 		return err
 	}
 
-	err = s.LinkSecretToServiceAccount(namespace, RegistryAuthSecretName, DefaultPipelineServiceAccount, true)
+	err = s.LinkSecretToServiceAccount(namespace, constants.RegistryAuthSecretName, constants.DefaultPipelineServiceAccount, true)
 	if err != nil {
 		return err
 	}