Merge branch 'main' into docs/experimental-features-guide

Author: ADubhlaoich

.github/workflows/ci.yml

@@ -170,7 +170,7 @@ jobs:
       - name: Build binary
         uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
         with:
-          version: v2.3.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
+          version: v2.3.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
           args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/conformance.yml

@@ -82,7 +82,7 @@ jobs:
       - name: Build binary
         uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
         with:
-          version: v2.3.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
+          version: v2.3.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
           args: build --single-target --snapshot --clean
         env:
           TELEMETRY_ENDPOINT: "" # disables sending telemetry

.github/workflows/functional.yml

@@ -69,7 +69,7 @@ jobs:
       - name: Build binary
         uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
         with:
-          version: v2.3.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
+          version: v2.3.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
           args: build --single-target --snapshot --clean
         env:
           TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317

.github/workflows/nfr.yml

@@ -160,7 +160,7 @@ jobs:
           merge-multiple: true
 
       - name: Open a PR with the results
-        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
         with:
           token: ${{ secrets.NGINX_PAT }}
           commit-message: NFR Test Results for NGF version ${{ needs.vars.outputs.version }}

.github/workflows/release-pr.yml

@@ -89,7 +89,7 @@ jobs:
           make generate-all
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
         with:
           token: ${{ secrets.NGINX_PAT }}
           commit-message: Release ${{ inputs.version }}

.golangci.yml

@@ -9,28 +9,36 @@ linters-settings:
     ignore-generated-header: true
     rules:
       - name: blank-imports
+      - name: constant-logical-expr
       - name: context-as-argument
       - name: context-keys-type
+      - name: defer
       - name: dot-imports
         arguments:
           - allowedPackages:
               - github.com/onsi/gomega
               - github.com/onsi/ginkgo/v2
+      - name: duplicated-imports
       - name: empty-block
       - name: error-naming
       - name: error-return
       - name: error-strings
       - name: errorf
       - name: exported
+      - name: import-shadowing
       - name: increment-decrement
       - name: indent-error-flow
       - name: package-comments
       - name: range
+      - name: range-val-address
+      - name: range-val-in-closure
       - name: receiver-naming
       - name: redefines-builtin-id
+      - name: string-of-int
       - name: superfluous-else
       - name: time-naming
       - name: unexported-return
+      - name: unnecessary-stmt
       - name: unreachable-code
       - name: unused-parameter
       - name: var-declaration
@@ -80,9 +88,11 @@ linters:
     - lll
     - loggercheck
     - makezero
+    - mirror
     - misspell
     - musttag
     - nilerr
+    - nilnil
     - noctx
     - nolintlint
     - predeclared

internal/framework/controller/reconciler_test.go

@@ -66,8 +66,11 @@ var _ = Describe("Reconciler", func() {
 		) error {
 			Expect(object).To(BeAssignableToTypeOf(&v1.HTTPRoute{}))
 			Expect(nsname).To(Equal(client.ObjectKeyFromObject(hr)))
+			Expect(hr).ToNot(BeNil())
 
-			hr.DeepCopyInto(object.(*v1.HTTPRoute))
+			hrObj, ok := object.(*v1.HTTPRoute)
+			Expect(ok).To(BeTrue(), "object is not *v1.HTTPRoute")
+			hr.DeepCopyInto(hrObj)
 
 			return nil
 		}

internal/framework/events/first_eventbatch_preparer_test.go

@@ -108,7 +108,8 @@ var _ = Describe("FirstEventBatchPreparer", func() {
 				fakeReader.ListCalls(
 					func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error {
 						httpRoute := v1.HTTPRoute{ObjectMeta: metav1.ObjectMeta{Name: "test"}}
-						typedList := list.(*v1.HTTPRouteList)
+						typedList, ok := list.(*v1.HTTPRouteList)
+						Expect(ok).To(BeTrue(), "expected list to be of type *v1.HTTPRouteList")
 						typedList.Items = append(typedList.Items, httpRoute)
 
 						return nil

internal/framework/helpers/helpers.go

@@ -33,12 +33,12 @@ func GetPointer[T any](v T) *T {
 // making it is possible to use it in tests when comparing against values returned by the fake client.
 // It panics if it fails to process the time.
 func PrepareTimeForFakeClient(t metav1.Time) metav1.Time {
-	bytes, err := t.Marshal()
+	b, err := t.Marshal()
 	if err != nil {
 		panic(fmt.Errorf("failed to marshal time: %w", err))
 	}
 
-	if err = t.Unmarshal(bytes); err != nil {
+	if err = t.Unmarshal(b); err != nil {
 		panic(fmt.Errorf("failed to unmarshal time: %w", err))
 	}
 
@@ -78,10 +78,10 @@ func EqualPointers[T comparable](p1, p2 *T) bool {
 }
 
 // MustExecuteTemplate executes the template with the given data.
-func MustExecuteTemplate(template *template.Template, data interface{}) []byte {
+func MustExecuteTemplate(templ *template.Template, data interface{}) []byte {
 	var buf bytes.Buffer
 
-	if err := template.Execute(&buf, data); err != nil {
+	if err := templ.Execute(&buf, data); err != nil {
 		panic(err)
 	}
 

internal/framework/status/leader_aware_group_updater_test.go

@@ -59,7 +59,8 @@ var _ = Describe("LeaderAwareGroupUpdater", func() {
 
 			if updateNeeded {
 				setter = func(obj client.Object) bool {
-					gc := obj.(*v1.GatewayClass)
+					gc, ok := obj.(*v1.GatewayClass)
+					Expect(ok).To(BeTrue(), "obj is not a *v1.GatewayClass")
 					gc.Status = createGCStatus(condType)
 					return true
 				}