Fix webhook interface method validateUpdate args

Author: rajeshvenkata

.github/workflows/golangci-lint.yml

@@ -11,16 +11,16 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           check-latest: true
           cache: true
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.55.2
-          # Disable package caching to avoid a double cache with setup-go.
-          skip-pkg-cache: true
+          version: v2.1.0
+          only-new-issues: true
           args: --timeout 10m
+  

.github/workflows/vulnerability.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           show-progress: false
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
         with:
           base-ref: ${{ github.event.pull_request.base.sha || github.event.before || github.sha }}
           head-ref: ${{ github.event.pull_request.head.sha || github.sha }}

.golangci.yml

@@ -1,4 +1,49 @@
+version: "2"
 run:
   timeout: 10m
-  skip-dirs:
-    - "api/v1alpha3"
+linters:
+  enable:
+    - gocyclo
+    - godot
+    - nakedret
+    - revive
+  settings:
+    gocyclo:
+      min-complexity: 10
+    godot:
+      exclude:
+        - (?i)^\s*todo
+      period: true
+  exclusions:
+    generated: lax
+    presets:
+      - common-false-positives
+      - std-error-handling
+    paths:
+      - zz_generated.*\.go$
+      - .*/mocks
+      - internal/aws-sdk-go-v2
+      - builtin$
+      - examples$
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+formatters:
+  enable:
+    - gci
+    - gofumpt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/aws/etcdadm-controller)
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - zz_generated.*\.go$
+      - .*/mocks
+      - internal/aws-sdk-go-v2
+      - builtin$
+      - examples$

api/v1beta1/etcdadmcluster_webhook.go

@@ -86,7 +86,7 @@ func (r *EtcdadmCluster) ValidateCreate(_ context.Context, obj runtime.Object) (
 }
 
 // ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type
-func (r *EtcdadmCluster) ValidateUpdate(_ context.Context, obj, old runtime.Object) (admission.Warnings, error) {
+func (r *EtcdadmCluster) ValidateUpdate(_ context.Context, old, obj runtime.Object) (admission.Warnings, error) {
 	etcdadmCluster, ok := obj.(*EtcdadmCluster)
 	if !ok {
 		return nil, fmt.Errorf("expected an EtcdadmCluster but got %T", obj)
@@ -153,4 +153,4 @@ func (r *EtcdadmCluster) validateCommon() (allErrs field.ErrorList) {
 	}
 
 	return allErrs
-}
+}

api/v1beta1/etcdadmcluster_webhook_test.go

@@ -69,7 +69,7 @@ func TestEtcdadmClusterValidateUpdateCastFail(t *testing.T) {
 	config := &EtcdadmCluster{}
 
 	// Call ValidateUpdate with the wrong type
-	warnings, err := config.ValidateUpdate(context.TODO(), wrongType, &EtcdadmCluster{})
+	warnings, err := config.ValidateUpdate(context.TODO(), &EtcdadmCluster{}, wrongType)
 
 	// Verify that an error is returned
 	g.Expect(warnings).To(BeNil())