Upgrade to actions/cache@v4 (#728)

rlymbur · web-flow · commit 8036bb9027e3 · 2025-05-01T16:28:41.000Z
* Upgrade to actions/cache@v4

* Added option to update golangci-lint

* Migrated golangci-lint configuration

* Addressed linting issues

* Use the latest of docker/setup-buildx-action@v3
diff --git a/.github/workflows/validate-merge-queue-e2e-test.yaml b/.github/workflows/validate-merge-queue-e2e-test.yaml
@@ -37,6 +37,8 @@ jobs:
           cache-dependency-path: test/go.sum
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
       - name: Setup AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
diff --git a/.github/workflows/validate-pull-request-presubmit.yaml b/.github/workflows/validate-pull-request-presubmit.yaml
@@ -18,7 +18,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
           check-latest: true
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,4 +1,32 @@
-# https://golangci-lint.run/usage/configuration
+version: "2"
 linters:
   disable:
-    - errcheck
+    - errcheck
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+    rules:
+      - linters:
+          - staticcheck
+        text: "ST1012:"
+      - linters:
+          - staticcheck
+        text: "QF1003:"
+      - linters:
+          - staticcheck
+        text: "QF1001:"
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/pkg/controllers/accesslogpolicy_controller.go b/pkg/controllers/accesslogpolicy_controller.go
@@ -247,7 +247,7 @@ func (r *accessLogPolicyReconciler) targetRefExists(ctx context.Context, alp *an
 		grpcRoute := &gwv1.GRPCRoute{}
 		err = r.client.Get(ctx, targetRefNamespacedName, grpcRoute)
 	default:
-		return false, fmt.Errorf("Access Log Policy targetRef is for unsupported Kind: %s", alp.Spec.TargetRef.Kind)
+		return false, fmt.Errorf("access Log Policy targetRef is for unsupported Kind: %s", alp.Spec.TargetRef.Kind)
 	}
 
 	if err != nil && !errors.IsNotFound(err) {
@@ -294,10 +294,10 @@ func (r *accessLogPolicyReconciler) updateAccessLogPolicyAnnotations(
 	for _, als := range accessLogSubscriptions {
 		if als.Spec.EventType != core.DeleteEvent {
 			oldAlp := alp.DeepCopy()
-			if alp.ObjectMeta.Annotations == nil {
-				alp.ObjectMeta.Annotations = make(map[string]string)
+			if alp.Annotations == nil {
+				alp.Annotations = make(map[string]string)
 			}
-			alp.ObjectMeta.Annotations[anv1alpha1.AccessLogSubscriptionAnnotationKey] = als.Status.Arn
+			alp.Annotations[anv1alpha1.AccessLogSubscriptionAnnotationKey] = als.Status.Arn
 			if err := r.client.Patch(ctx, alp, client.MergeFrom(oldAlp)); err != nil {
 				r.eventRecorder.Event(alp, corev1.EventTypeWarning, k8s.FailedReconcileEvent,
 					"Failed to update annotation due to "+err.Error())
diff --git a/pkg/controllers/serviceexport_controller.go b/pkg/controllers/serviceexport_controller.go
@@ -121,7 +121,7 @@ func (r *serviceExportReconciler) reconcile(ctx context.Context, req ctrl.Reques
 		return client.IgnoreNotFound(err)
 	}
 
-	if srvExport.ObjectMeta.Annotations["application-networking.k8s.aws/federation"] != "amazon-vpc-lattice" {
+	if srvExport.Annotations["application-networking.k8s.aws/federation"] != "amazon-vpc-lattice" {
 		return nil
 	}
 	r.log.Debugf(ctx, "Found matching service export %s-%s", srvExport.Name, srvExport.Namespace)
diff --git a/pkg/deploy/lattice/listener_manager.go b/pkg/deploy/lattice/listener_manager.go
@@ -109,7 +109,7 @@ func (d *defaultListenerManager) create(ctx context.Context, latticeSvcId string
 	resp, err := d.cloud.Lattice().CreateListenerWithContext(ctx, &listenerInput)
 	if err != nil {
 		return model.ListenerStatus{},
-			fmt.Errorf("Failed CreateListener %s due to %s", aws.StringValue(listenerInput.Name), err)
+			fmt.Errorf("failed CreateListener %s due to %s", aws.StringValue(listenerInput.Name), err)
 	}
 	d.log.Infof(ctx, "Success CreateListener %s, %s", aws.StringValue(resp.Name), aws.StringValue(resp.Id))
 
@@ -280,7 +280,7 @@ func (d *defaultListenerManager) Delete(ctx context.Context, modelListener *mode
 			d.log.Debugf(ctx, "Listener already deleted")
 			return nil
 		}
-		return fmt.Errorf("Failed DeleteListener %s, %s due to %s", modelListener.Status.Id, modelListener.Status.ServiceId, err)
+		return fmt.Errorf("failed DeleteListener %s, %s due to %s", modelListener.Status.Id, modelListener.Status.ServiceId, err)
 	}
 
 	d.log.Infof(ctx, "Success DeleteListener %s, %s", modelListener.Status.Id, modelListener.Status.ServiceId)
diff --git a/pkg/deploy/lattice/rule_synthesizer.go b/pkg/deploy/lattice/rule_synthesizer.go
@@ -87,7 +87,7 @@ func (r *ruleSynthesizer) createOrUpdateRules(ctx context.Context, rule *model.R
 	}
 	status, err := r.ruleManager.Upsert(ctx, rule, stackListener, stackSvc)
 	if err != nil {
-		return fmt.Errorf("Failed RuleManager.Upsert due to %s", err)
+		return fmt.Errorf("failed RuleManager.Upsert due to %s", err)
 	}
 	rule.Status = &status
 
diff --git a/pkg/deploy/lattice/target_group_manager.go b/pkg/deploy/lattice/target_group_manager.go
@@ -103,7 +103,7 @@ func (s *defaultTargetGroupManager) create(ctx context.Context, modelTg *model.T
 	resp, err := lattice.CreateTargetGroupWithContext(ctx, &createInput)
 	if err != nil {
 		return model.TargetGroupStatus{},
-			fmt.Errorf("Failed CreateTargetGroup %s due to %s", latticeTgName, err)
+			fmt.Errorf("failed CreateTargetGroup %s due to %s", latticeTgName, err)
 	}
 	s.log.Infof(ctx, "Success CreateTargetGroup %s", latticeTgName)
 
diff --git a/pkg/deploy/lattice/target_group_synthesizer_test.go b/pkg/deploy/lattice/target_group_synthesizer_test.go
@@ -240,16 +240,16 @@ func Test_DoNotDeleteCases(t *testing.T) {
 		},
 	}
 	svcExportModelTg := baseModelTg
-	svcExportModelTg.Spec.TargetGroupTagFields.K8SSourceType = model.SourceTypeSvcExport
+	svcExportModelTg.Spec.K8SSourceType = model.SourceTypeSvcExport
 
 	mockSvcExportTgBuilder.EXPECT().BuildTargetGroup(ctx, gomock.Any()).Return(&svcExportModelTg, nil)
 
 	stack := core.NewDefaultStack(core.StackID{Name: "foo", Namespace: "bar"})
 	svcModelTg := baseModelTg
 	svcModelTg.ResourceMeta = core.NewResourceMeta(stack, "AWS:VPCServiceNetwork::TargetGroup", "tg-id")
-	svcModelTg.Spec.TargetGroupTagFields.K8SSourceType = model.SourceTypeHTTPRoute
-	svcModelTg.Spec.TargetGroupTagFields.K8SRouteName = "route"
-	svcModelTg.Spec.TargetGroupTagFields.K8SRouteNamespace = "route-ns"
+	svcModelTg.Spec.K8SSourceType = model.SourceTypeHTTPRoute
+	svcModelTg.Spec.K8SRouteName = "route"
+	svcModelTg.Spec.K8SRouteNamespace = "route-ns"
 	stack.AddResource(&svcModelTg)
 
 	mockTGManager.EXPECT().IsTargetGroupMatch(ctx, gomock.Any(), gomock.Any(), gomock.Any()).Return(true, nil)
diff --git a/pkg/deploy/lattice/targets_manager.go b/pkg/deploy/lattice/targets_manager.go
@@ -119,10 +119,10 @@ func (s *defaultTargetsManager) registerTargets(
 		}
 		resp, err := s.cloud.Lattice().RegisterTargetsWithContext(ctx, &registerTargetsInput)
 		if err != nil {
-			registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("Failed to register targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))
+			registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("failed to register targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))
 		}
 		if len(resp.Unsuccessful) > 0 {
-			registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("Failed to register targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",
+			registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("failed to register targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",
 				modelTg.Status.Id, i+1, len(chunks), resp.Unsuccessful))
 		}
 		s.log.Debugf(ctx, "Successfully registered %d targets from VPC Lattice Target Group %s for chunk %d/%d",
@@ -152,10 +152,10 @@ func (s *defaultTargetsManager) deregisterTargets(
 		}
 		resp, err := s.cloud.Lattice().DeregisterTargetsWithContext(ctx, &deregisterTargetsInput)
 		if err != nil {
-			deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("Failed to deregister targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))
+			deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("failed to deregister targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))
 		}
 		if len(resp.Unsuccessful) > 0 {
-			deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("Failed to deregister targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",
+			deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("failed to deregister targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",
 				modelTg.Status.Id, i+1, len(chunks), resp.Unsuccessful))
 		}
 		s.log.Debugf(ctx, "Successfully deregistered %d targets from VPC Lattice Target Group %s for chunk %d/%d", len(resp.Successful), modelTg.Status.Id, i+1, len(chunks))
diff --git a/pkg/gateway/model_build_targetgroup.go b/pkg/gateway/model_build_targetgroup.go
@@ -423,7 +423,7 @@ func buildTargetGroupIpAddressType(svc *corev1.Service) (string, error) {
 	ipFamilies := svc.Spec.IPFamilies
 
 	if len(ipFamilies) != 1 {
-		return "", errors.New("Lattice Target Group only supports single stack IP addresses")
+		return "", errors.New("lattice Target Group only supports single stack IP addresses")
 	}
 
 	// IpFamilies will always have at least 1 element
diff --git a/pkg/gateway/model_build_targets.go b/pkg/gateway/model_build_targets.go
@@ -212,14 +212,14 @@ func (t *latticeTargetsModelBuildTask) getDefinedPorts() map[int32]struct{} {
 
 	isServiceExport := t.serviceExport != nil
 	if isServiceExport {
-		portsAnnotations := strings.Split(t.serviceExport.ObjectMeta.Annotations[portAnnotationsKey], ",")
+		portsAnnotations := strings.Split(t.serviceExport.Annotations[portAnnotationsKey], ",")
 
 		for _, portAnnotation := range portsAnnotations {
 			if portAnnotation != "" {
 				definedPort, err := strconv.ParseInt(portAnnotation, 10, 32)
 				if err != nil {
 					t.log.Infof(context.TODO(), "failed to read Annotations/Port: %s due to %s",
-						t.serviceExport.ObjectMeta.Annotations[portAnnotationsKey], err)
+						t.serviceExport.Annotations[portAnnotationsKey], err)
 				} else {
 					definedPorts[int32(definedPort)] = struct{}{}
 				}
diff --git a/pkg/model/core/stack_test.go b/pkg/model/core/stack_test.go
@@ -96,7 +96,7 @@ func Test_defaultStack_ListResources(t *testing.T) {
 			} else {
 				assert.NoError(t, err)
 				for _, want := range tt.wantFakeResources {
-					want.ResourceMeta.stack = s
+					want.stack = s
 				}
 				sort.Slice(gotFakeResources, func(i, j int) bool {
 					return gotFakeResources[i].ID() < gotFakeResources[j].ID()
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -3,7 +3,7 @@
 declare -a DEPENDENCY_LIST=("go" "awscli" "kubernetes-cli" "eksctl" "helm" "jq" "yq" "make")
 CURRENT_CONTROLLER_VERSION="1.1.0"
 CURRENT_CRD_VERSION="1.2.0"
-GOLANGCI_LINT_VERSION="1.63.4"
+GOLANGCI_LINT_VERSION="2.1.5"
 EKS_POD_IDENTITY_AGENT_VERSION="1.0.0-eksbuild.1"
 
 main() {
@@ -68,7 +68,13 @@ tools() {
             echo "Installing golangci-lint"
             curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v$GOLANGCI_LINT_VERSION
         else
-            echo "golangci-lint is already installed."
+
+            read -p "golangci-lint is already installed, do you want to update? (Y/N): " update_package
+
+            if [[ $update_package == 'Y' || $update_package == 'y' ]]; then
+                echo "Updating golangci-lint"
+                curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v$GOLANGCI_LINT_VERSION
+            fi
         fi
 
         go install github.com/golang/mock/mockgen@v1.6.0

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func (r *serviceExportReconciler) reconcile(ctx context.Context, req ctrl.Reques`
`121`	`121`	`return client.IgnoreNotFound(err)`
`122`	`122`	`}`
`123`	`123`
`124`		`- if srvExport.ObjectMeta.Annotations["application-networking.k8s.aws/federation"] != "amazon-vpc-lattice" {`
	`124`	`+ if srvExport.Annotations["application-networking.k8s.aws/federation"] != "amazon-vpc-lattice" {`
`125`	`125`	`return nil`
`126`	`126`	`}`
`127`	`127`	`r.log.Debugf(ctx, "Found matching service export %s-%s", srvExport.Name, srvExport.Namespace)`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func (d *defaultListenerManager) create(ctx context.Context, latticeSvcId string`
`109`	`109`	`resp, err := d.cloud.Lattice().CreateListenerWithContext(ctx, &listenerInput)`
`110`	`110`	`if err != nil {`
`111`	`111`	`return model.ListenerStatus{},`
`112`		`- fmt.Errorf("Failed CreateListener %s due to %s", aws.StringValue(listenerInput.Name), err)`
	`112`	`+ fmt.Errorf("failed CreateListener %s due to %s", aws.StringValue(listenerInput.Name), err)`
`113`	`113`	`}`
`114`	`114`	`d.log.Infof(ctx, "Success CreateListener %s, %s", aws.StringValue(resp.Name), aws.StringValue(resp.Id))`
`115`	`115`
`@@ -280,7 +280,7 @@ func (d defaultListenerManager) Delete(ctx context.Context, modelListener mode`
`280`	`280`	`d.log.Debugf(ctx, "Listener already deleted")`
`281`	`281`	`return nil`
`282`	`282`	`}`
`283`		`- return fmt.Errorf("Failed DeleteListener %s, %s due to %s", modelListener.Status.Id, modelListener.Status.ServiceId, err)`
	`283`	`+ return fmt.Errorf("failed DeleteListener %s, %s due to %s", modelListener.Status.Id, modelListener.Status.ServiceId, err)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`d.log.Infof(ctx, "Success DeleteListener %s, %s", modelListener.Status.Id, modelListener.Status.ServiceId)`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (r ruleSynthesizer) createOrUpdateRules(ctx context.Context, rule model.R`
`87`	`87`	`}`
`88`	`88`	`status, err := r.ruleManager.Upsert(ctx, rule, stackListener, stackSvc)`
`89`	`89`	`if err != nil {`
`90`		`- return fmt.Errorf("Failed RuleManager.Upsert due to %s", err)`
	`90`	`+ return fmt.Errorf("failed RuleManager.Upsert due to %s", err)`
`91`	`91`	`}`
`92`	`92`	`rule.Status = &status`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (s defaultTargetGroupManager) create(ctx context.Context, modelTg model.T`
`103`	`103`	`resp, err := lattice.CreateTargetGroupWithContext(ctx, &createInput)`
`104`	`104`	`if err != nil {`
`105`	`105`	`return model.TargetGroupStatus{},`
`106`		`- fmt.Errorf("Failed CreateTargetGroup %s due to %s", latticeTgName, err)`
	`106`	`+ fmt.Errorf("failed CreateTargetGroup %s due to %s", latticeTgName, err)`
`107`	`107`	`}`
`108`	`108`	`s.log.Infof(ctx, "Success CreateTargetGroup %s", latticeTgName)`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,10 @@ func (s *defaultTargetsManager) registerTargets(`
`119`	`119`	`}`
`120`	`120`	`resp, err := s.cloud.Lattice().RegisterTargetsWithContext(ctx, &registerTargetsInput)`
`121`	`121`	`if err != nil {`
`122`		`- registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("Failed to register targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))`
	`122`	`+ registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("failed to register targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))`
`123`	`123`	`}`
`124`	`124`	`if len(resp.Unsuccessful) > 0 {`
`125`		`- registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("Failed to register targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",`
	`125`	`+ registerTargetsError = errors.Join(registerTargetsError, fmt.Errorf("failed to register targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",`
`126`	`126`	`modelTg.Status.Id, i+1, len(chunks), resp.Unsuccessful))`
`127`	`127`	`}`
`128`	`128`	`s.log.Debugf(ctx, "Successfully registered %d targets from VPC Lattice Target Group %s for chunk %d/%d",`
`@@ -152,10 +152,10 @@ func (s *defaultTargetsManager) deregisterTargets(`
`152`	`152`	`}`
`153`	`153`	`resp, err := s.cloud.Lattice().DeregisterTargetsWithContext(ctx, &deregisterTargetsInput)`
`154`	`154`	`if err != nil {`
`155`		`- deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("Failed to deregister targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))`
	`155`	`+ deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("failed to deregister targets from VPC Lattice Target Group %s due to %s", modelTg.Status.Id, err))`
`156`	`156`	`}`
`157`	`157`	`if len(resp.Unsuccessful) > 0 {`
`158`		`- deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("Failed to deregister targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",`
	`158`	`+ deregisterTargetsError = errors.Join(deregisterTargetsError, fmt.Errorf("failed to deregister targets from VPC Lattice Target Group %s for chunk %d/%d, unsuccessful targets %v",`
`159`	`159`	`modelTg.Status.Id, i+1, len(chunks), resp.Unsuccessful))`
`160`	`160`	`}`
`161`	`161`	`s.log.Debugf(ctx, "Successfully deregistered %d targets from VPC Lattice Target Group %s for chunk %d/%d", len(resp.Successful), modelTg.Status.Id, i+1, len(chunks))`