fix(VPCPeeringConnection): Fix update code path

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2023-12-06T21:43:43Z"
-  build_hash: 892f29d00a4c4ad21a2fa32919921de18190979d
-  go_version: go1.21.1
-  version: v0.27.1
-api_directory_checksum: 6e2d850d97f2f72db31c9bef522eca4ab95b3fcd
+  build_date: "2023-12-12T12:34:35Z"
+  build_hash: 3653329ceeb20015851b8776a6061a3fb0ec2935
+  go_version: go1.21.0
+  version: "3653329"
+api_directory_checksum: d452bf19bfd1496aacdc215bf7cc9ea86c55c122
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
 generator_config_info:
-  file_checksum: d10a62517f87bacf988184f8c454b90b42dee732
+  file_checksum: df1057de840147701c11acfdbed0e28e9b0ddd96
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -818,8 +818,6 @@ resources:
           path: Tags
         compare:
           is_ignored: True
-    update_operation:
-      omit_unchanged_fields: true
     hooks:
       delta_pre_compare:
         code: compareTags(delta, a, b)

generator.yaml

@@ -818,8 +818,6 @@ resources:
           path: Tags
         compare:
           is_ignored: True
-    update_operation:
-      omit_unchanged_fields: true
     hooks:
       delta_pre_compare:
         code: compareTags(delta, a, b)

pkg/resource/vpc_peering_connection/hooks.go

@@ -27,15 +27,15 @@ import (
 
 var (
 	ErrVPCPeeringConnectionCreating = fmt.Errorf(
-		"VPCPerringConnection in '%v' state, cannot be modified or deleted",
+		"VPCPeeringConnection in '%v' state, cannot be modified or deleted",
 		"creating",
 	)
 	ErrVPCPeeringConnectionProvisioning = fmt.Errorf(
-		"VPCPerringConnection in '%v' state, cannot be modified or deleted",
+		"VPCPeeringConnection in '%v' state, cannot be modified or deleted",
 		svcsdk.VpcPeeringConnectionStateReasonCodeProvisioning,
 	)
 	ErrVPCPeeringConnectionDeleting = fmt.Errorf(
-		"VPCPerringConnection in '%v' state, cannot be modified or deleted",
+		"VPCPeeringConnection in '%v' state, cannot be modified or deleted",
 		svcsdk.VpcPeeringConnectionStateReasonCodeDeleting,
 	)
 )

templates/hooks/vpc_peering_connection/sdk_read_many_post_set_output.go.tpl

@@ -1,10 +1,42 @@
 
+
+	if r.ko.Spec.AccepterPeeringConnectionOptions != nil {
+		f0 := &svcapitypes.PeeringConnectionOptionsRequest{}
+		if r.ko.Spec.AccepterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC != nil {
+			f0.AllowEgressFromLocalClassicLinkToRemoteVPC = r.ko.Spec.AccepterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC
+		}
+		if r.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC != nil {
+			f0.AllowEgressFromLocalClassicLinkToRemoteVPC = r.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC
+		}
+		if r.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink != nil {
+			f0.AllowEgressFromLocalVPCToRemoteClassicLink = r.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink
+		}
+		ko.Spec.AccepterPeeringConnectionOptions = f0
+	} else {
+		ko.Spec.AccepterPeeringConnectionOptions = nil
+	}
+	if r.ko.Spec.RequesterPeeringConnectionOptions != nil {
+		f1 := &svcapitypes.PeeringConnectionOptionsRequest{}
+		if r.ko.Spec.RequesterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC != nil {
+			f1.AllowDNSResolutionFromRemoteVPC = r.ko.Spec.RequesterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC
+		}
+		if r.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC != nil {
+			f1.AllowEgressFromLocalClassicLinkToRemoteVPC = r.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC
+		}
+		if r.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink != nil {
+			f1.AllowEgressFromLocalVPCToRemoteClassicLink = r.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink
+		}
+		ko.Spec.RequesterPeeringConnectionOptions = f1
+	} else {
+		ko.Spec.RequesterPeeringConnectionOptions = nil
+	}
+
 	// Artificially trigger detection by delta.DifferentAt("Spec.AcceptRequest")
 	res := &resource{ko}
 	if isVPCPeeringConnectionPendingAcceptance(res) {
 		res.ko.Spec.AcceptRequest = aws.Bool(false)
 	} else if isVPCPeeringConnectionActive(res) || isVPCPeeringConnectionProvisioning(res) {
 		res.ko.Spec.AcceptRequest = aws.Bool(true)
 	} else if isVPCPeeringConnectionCreating(res) {
-		return nil, requeueWaitWhileCreating
-	}
+		return res, requeueWaitWhileCreating
+	}

templates/hooks/vpc_peering_connection/sdk_update_pre_build_request.go.tpl

@@ -1,18 +1,20 @@
 
-  	if isVPCPeeringConnectionCreating(desired) {
+  	if isVPCPeeringConnectionCreating(latest) {
 		return desired, requeueWaitWhileCreating
 	}
-	if isVPCPeeringConnectionProvisioning(desired) {
+	if isVPCPeeringConnectionProvisioning(latest) {
 		return desired, requeueWaitWhileProvisioning
 	}
-	if isVPCPeeringConnectionDeleting(desired) {
+	if isVPCPeeringConnectionDeleting(latest) {
 		return desired, requeueWaitWhileDeleting
 	}
-
-	// in case of pending acceptance or accepted state we make the updates.
+	// If the VPC Peering Connection is Pending Acceptance or Active, continue
+
 	if delta.DifferentAt("Spec.Tags") {
 			if err := rm.syncTags(ctx, desired, latest); err != nil {
-				return nil, err
+				// This causes a requeue and the rest of the fields will be synced on the next reconciliation loop
+				ackcondition.SetSynced(desired, corev1.ConditionFalse, nil, nil)
+				return desired, err
 			}
 		}
 
@@ -44,8 +46,38 @@
 		}
 	}
 
+	// Only continue if something other than Tags or certain fields has changed in the Spec
+	if !delta.DifferentExcept("Spec.Tags", "Spec.AcceptRequest") {
+		return desired, nil
+	}
 
-  // Only continue if something other than Tags or certain fields has changed in the Spec
-  if !delta.DifferentExcept("Spec.Tags", "Spec.AcceptRequest") {
-      return desired, nil
-  }
+  	if desired.ko.Spec.AccepterPeeringConnectionOptions != nil {
+		f0 := &svcapitypes.PeeringConnectionOptionsRequest{}
+		if desired.ko.Spec.AccepterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC != nil {
+			f0.AllowDNSResolutionFromRemoteVPC = desired.ko.Spec.AccepterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC
+		}
+		if desired.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC != nil {
+			f0.AllowEgressFromLocalClassicLinkToRemoteVPC = desired.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC
+		}
+		if desired.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink != nil {
+			f0.AllowEgressFromLocalVPCToRemoteClassicLink = desired.ko.Spec.AccepterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink
+		}
+		desired.ko.Spec.AccepterPeeringConnectionOptions = f0
+	} else {
+		desired.ko.Spec.AccepterPeeringConnectionOptions = nil
+	}
+	if desired.ko.Spec.RequesterPeeringConnectionOptions != nil {
+		f1 := &svcapitypes.PeeringConnectionOptionsRequest{}
+		if desired.ko.Spec.RequesterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC != nil {
+			f1.AllowDNSResolutionFromRemoteVPC = desired.ko.Spec.RequesterPeeringConnectionOptions.AllowDNSResolutionFromRemoteVPC
+		}
+		if desired.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC != nil {
+			f1.AllowEgressFromLocalClassicLinkToRemoteVPC = desired.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalClassicLinkToRemoteVPC
+		}
+		if desired.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink != nil {
+			f1.AllowEgressFromLocalVPCToRemoteClassicLink = desired.ko.Spec.RequesterPeeringConnectionOptions.AllowEgressFromLocalVPCToRemoteClassicLink
+		}
+		desired.ko.Spec.RequesterPeeringConnectionOptions = f1
+	} else {
+		desired.ko.Spec.RequesterPeeringConnectionOptions = nil
+	}

test/e2e/resources/vpc_peering_connection.yaml

@@ -6,14 +6,6 @@ spec:
   vpcID: $VPC_ID
   peerVPCID: $PEER_VPC_ID
   acceptRequest: true
-  requesterPeeringConnectionOptions:
-    allowDNSResolutionFromRemoteVPC: true
-    allowEgressFromLocalClassicLinkToRemoteVPC: true
-    allowEgressFromLocalVPCToRemoteClassicLink: true
-  accepterPeeringConnectionOptions:
-    allowDNSResolutionFromRemoteVPC: true
-    allowEgressFromLocalClassicLinkToRemoteVPC: true
-    allowEgressFromLocalVPCToRemoteClassicLink: true
   tags:
     - key: $TAG_KEY
       value: $TAG_VALUE

test/e2e/resources/vpc_peering_connection_peering_options.yaml

@@ -0,0 +1,12 @@
+apiVersion: ec2.services.k8s.aws/v1alpha1
+kind: VPCPeeringConnection
+metadata:
+  name: $VPC_PEERING_CONNECTION_NAME
+spec:
+  vpcID: $VPC_ID
+  peerVPCID: $PEER_VPC_ID
+  acceptRequest: true
+  requesterPeeringConnectionOptions:
+    allowDNSResolutionFromRemoteVPC: true
+  accepterPeeringConnectionOptions:
+    allowDNSResolutionFromRemoteVPC: true