Merge pull request #1813 from sigstore/update-golangci-lint

Update golangci-lint config to version 2

Author: codysoyland

.github/workflows/lint.yaml

@@ -0,0 +1,24 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: './go.mod'
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v7
+        with:
+          version: v2.0

.github/workflows/tests.yaml

@@ -79,18 +79,3 @@ jobs:
         run: |
           set -e
           addlicense -check -l apache -c 'The Sigstore Authors' -ignore "third_party/**" -v *
-
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
-        with:
-          go-version-file: './go.mod'
-          check-latest: true
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
-        with:
-          version: v1.61
-          args: --timeout=15m

.golangci.yml

@@ -12,46 +12,57 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+version: "2"
+run:
+  issues-exit-code: 1
 linters:
   enable:
     - asciicheck
-    - errcheck
     - errorlint
-    - gofmt
-    - goimports
-    - gosec
     - gocritic
+    - gosec
     - importas
+    - misspell
     - prealloc
     - revive
-    - misspell
-    - stylecheck
+    - staticcheck
     - tparallel
     - unconvert
     - unparam
     - whitespace
-linters-settings:
-  revive:
+  settings:
+    revive:
+      rules:
+        - name: dot-imports
+          arguments:
+            - allowedPackages:
+                - knative.dev/pkg/configmap/testing
+                - knative.dev/pkg/reconciler/testing
+                - github.com/sigstore/policy-controller/pkg/reconciler/testing/v1alpha1
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-     - name: dot-imports
-       arguments:
-          - allowedPackages:
-            - "knative.dev/pkg/configmap/testing"
-            - "knative.dev/pkg/reconciler/testing"
-            - "github.com/sigstore/policy-controller/pkg/reconciler/testing/v1alpha1"
-output:
-  uniq-by-line: false
+      - linters:
+          - errcheck
+          - gosec
+        path: _test\.go
+    paths:
+      - ^third_party/
+      - ^examples/
 issues:
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - errcheck
-        - gosec
   max-issues-per-linter: 0
   max-same-issues: 0
-run:
-  issues-exit-code: 1
-  timeout: 10m
-  skip-dirs:
-    - third_party
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - ^third_party/
+      - ^examples/

pkg/reconciler/testing/v1alpha1/clusterimagepolicy.go

@@ -57,7 +57,7 @@ func WithResourceVersion(resourceVersion string) ClusterImagePolicyOption {
 
 func WithClusterImagePolicyDeletionTimestamp(cip *v1alpha1.ClusterImagePolicy) {
 	t := metav1.NewTime(time.Unix(1e9, 0))
-	cip.ObjectMeta.SetDeletionTimestamp(&t)
+	cip.SetDeletionTimestamp(&t)
 }
 
 func WithImagePattern(ip v1alpha1.ImagePattern) ClusterImagePolicyOption {

pkg/reconciler/testing/v1alpha1/trustroot.go

@@ -58,7 +58,7 @@ func WithTrustRootResourceVersion(resourceVersion string) TrustRootOption {
 
 func WithTrustRootDeletionTimestamp(tr *v1alpha1.TrustRoot) {
 	t := metav1.NewTime(time.Unix(1e9, 0))
-	tr.ObjectMeta.SetDeletionTimestamp(&t)
+	tr.SetDeletionTimestamp(&t)
 }
 
 func WithTrustRootFinalizer(tr *v1alpha1.TrustRoot) {

pkg/webhook/validator.go

@@ -152,7 +152,7 @@ func (v *Validator) ValidatePodScalable(ctx context.Context, ps *policyduckv1bet
 
 	// If we are being scaled down don't block it.
 	if ps.IsScalingDown(ctx) {
-		logging.FromContext(ctx).Debugf("Skipping validations due to scale down request %s/%s", &ps.ObjectMeta.Name, &ps.ObjectMeta.Namespace)
+		logging.FromContext(ctx).Debugf("Skipping validations due to scale down request %s/%s", &ps.Name, &ps.Namespace)
 		return nil
 	}
 
@@ -974,7 +974,7 @@ func (v *Validator) ResolvePodScalable(ctx context.Context, ps *policyduckv1beta
 	}
 
 	if ps.IsScalingDown(ctx) {
-		logging.FromContext(ctx).Debugf("Skipping validations due to scale down request %s/%s", &ps.ObjectMeta.Name, &ps.ObjectMeta.Namespace)
+		logging.FromContext(ctx).Debugf("Skipping validations due to scale down request %s/%s", &ps.Name, &ps.Namespace)
 		return
 	}