Combine tests into one function

Doing so becasue there can only be one VPC attachment at a time
and the resource stays in deleting for several minutes.

Author: michaelhtm

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-03-27T03:27:32Z"
+  build_date: "2025-03-28T15:21:59Z"
   build_hash: 3722729cebe6d3c03c7e442655ef0846f91566a2
   go_version: go1.24.0
   version: v0.43.2-7-g3722729
 api_directory_checksum: bb3f7a9b3924fdbe63a4082a9134b3f1f653979b
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: ac3998b266a4a9996bc1c755c573b9aad68a9807
+  file_checksum: 34c308f1552184ca33451041fd787bfd9d32dc5e
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -845,8 +845,6 @@ resources:
     hooks:
       sdk_create_post_build_request:
         template_path: hooks/transit_gateway_vpc_attachment/sdk_create_post_build_request.go.tpl
-      sdk_read_many_post_set_output:
-        template_path: hooks/transit_gateway_vpc_attachment/sdk_read_many_post_set_output.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/transit_gateway_vpc_attachment/sdk_update_pre_build_request.go.tpl
       sdk_update_post_build_request:

generator.yaml

@@ -845,8 +845,6 @@ resources:
     hooks:
       sdk_create_post_build_request:
         template_path: hooks/transit_gateway_vpc_attachment/sdk_create_post_build_request.go.tpl
-      sdk_read_many_post_set_output:
-        template_path: hooks/transit_gateway_vpc_attachment/sdk_read_many_post_set_output.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/transit_gateway_vpc_attachment/sdk_update_pre_build_request.go.tpl
       sdk_update_post_build_request:

pkg/resource/transit_gateway_vpc_attachment/hooks.go

@@ -14,12 +14,31 @@
 package transit_gateway_vpc_attachment
 
 import (
-	"github.com/aws-controllers-k8s/ec2-controller/pkg/tags"
+	"fmt"
+
+	ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	svcsdk "github.com/aws/aws-sdk-go-v2/service/ec2"
 	svcsdktypes "github.com/aws/aws-sdk-go-v2/service/ec2/types"
+
+	"github.com/aws-controllers-k8s/ec2-controller/pkg/tags"
 )
 
+var StatusAvailable = svcsdktypes.TransitGatewayAttachmentStateAvailable
+
+// requeueWaitUntilCanModify returns a `ackrequeue.RequeueNeededAfter` struct
+// explaining the cluster cannot be modified until it reaches an active status.
+func requeueWaitUntilCanModify(r *resource) *ackrequeue.RequeueNeeded {
+	if r.ko.Status.State == nil {
+		return nil
+	}
+	status := *r.ko.Status.State
+	return ackrequeue.Needed(
+		fmt.Errorf("transitGatewayAttachment is in '%s' and state, cannot be modified until '%s'",
+			status, StatusAvailable),
+	)
+}
+
 // updateTagSpecificationsInCreateRequest adds
 // Tags defined in the Spec to CreateDhcpOptionsInput.TagSpecification
 // and ensures the ResourceType is always set to 'transit-gateway-vpc-attachment'
@@ -47,7 +66,6 @@ func updateTagSpecificationsInCreateRequest(r *resource,
 func compareSubnetIDs(desiredSubnetIDs, latestSubnetIDs []*string) ([]string, []string) {
 
 	toAdd, toRemove := []string{}, []string{}
-
 	desired, latest := aws.ToStringSlice(desiredSubnetIDs), aws.ToStringSlice(latestSubnetIDs)
 
 	for _, d := range desired {

pkg/resource/transit_gateway_vpc_attachment/sdk.go

@@ -14,5 +14,5 @@
 	}
 
 	if *latest.ko.Status.State != string(svcsdktypes.TransitGatewayAttachmentStateAvailable) {
-		
+		return desired, requeueWaitUntilCanModify(desired)
 	}

templates/hooks/transit_gateway_vpc_attachment/sdk_read_many_post_set_output.go.tpl

@@ -15,6 +15,7 @@
 """
 
 from typing import Union, Dict
+import time
 
 
 class EC2Validator:
@@ -214,11 +215,26 @@ def assert_transit_gateway(self, tgw_id: str, exists=True):
             pass
         assert res_found is exists
 
+    def wait_transit_gateway_state(self, tgw_id: str, state: str):
+        is_state = False
+        max_tries = 5
+        try:
+            for tries in range(max_tries):
+                transit_gateway = self.ec2_client.describe_transit_gateways(TransitGatewayIds=[tgw_id])
+                if transit_gateway['TransitGateways'][0]['State'] == state:
+                    is_state=True
+                    break
+                else:
+                    time.sleep(30)
+        except:
+            pass
+        return is_state
+
     def get_transit_gateway_vpc_attachment(self, attachment_id: str) -> Union[None, Dict]:
         try:
             aws_res = self.ec2_client.describe_transit_gateway_vpc_attachments(TransitGatewayAttachmentIds=[attachment_id])
-            if len(aws_res["TransitGateways"]) > 0:
-                return aws_res["TransitGateways"][0]
+            if len(aws_res["TransitGatewayVpcAttachments"]) > 0:
+                return aws_res["TransitGatewayVpcAttachments"][0]
             return None
         except self.ec2_client.exceptions.ClientError:
             return None

templates/hooks/transit_gateway_vpc_attachment/sdk_update_pre_build_request.go.tpl

@@ -27,39 +27,44 @@
 from e2e.bootstrap_resources import get_bootstrap_resources
 from e2e.tests.helper import EC2Validator
 
-REGION = "us-west-2" if environ.get('AWS_DEFAULT_REGION') is None else environ.get('AWS_DEFAULT_REGION')
 RESOURCE_PLURAL = "transitgatewayvpcattachments"
 
 CREATE_WAIT_AFTER_SECONDS = 30
-DELETE_WAIT_AFTER_SECONDS = 180
-MAX_WAIT_FOR_SYNCED_SECONDS = 180
 MODIFY_WAIT_AFTER_SECONDS = 30
+WAIT_PERIOD = 30
 
-@pytest.fixture(scope="module")
-def simple_tgw_attachment(request):
-    test_resource_values = REPLACEMENT_VALUES.copy()
+@pytest.fixture
+def simple_tgw_attachment(request, ec2_client):
     resource_name = random_suffix_name("tgw-attachment-test", 24)
 
     test_vpc = get_bootstrap_resources().SharedTestVPC
     test_tgw = get_bootstrap_resources().TestTransitGateway
+
+    tgw_id = test_tgw.transit_gateway_id
+
+    ec2_validator = EC2Validator(ec2_client)
+    is_available = ec2_validator.wait_transit_gateway_state(tgw_id=tgw_id, state='available')
+    assert is_available
 
-    test_resource_values["TGWVA_NAME"] = resource_name
-    test_resource_values["VPC_ID"] = test_vpc.vpc_id
-    test_resource_values["TGW_ID"] = test_tgw.transit_gateway_id
-    test_resource_values["SUBNET_ID"] = test_vpc.public_subnets.subnet_ids[0]
+    replacements = REPLACEMENT_VALUES.copy()
+
+    replacements["TGWVA_NAME"] = resource_name
+    replacements["VPC_ID"] = test_vpc.vpc_id
+    replacements["TGW_ID"] = test_tgw.transit_gateway_id
+    replacements["SUBNET_ID"] = test_vpc.public_subnets.subnet_ids[0]
 
     marker = request.node.get_closest_marker("resource_data")
     if marker is not None:
         data = marker.args[0]
         if 'tag_key' in data:
-            test_resource_values["TAG_KEY"] = data["tag_key"]
+            replacements["TAG_KEY"] = data['tag_key']
         if 'tag_value' in data:
-            test_resource_values["TAG_VALUE"] = data["tag_value"]
+            replacements["TAG_VALUE"] = data['tag_value']
 
     # Load TGW Attachment CR
     resource_data = load_ec2_resource(
         "transitgateway_vpc_attachment",
-        additional_replacements=test_resource_values,
+        additional_replacements=replacements,
     )
     logging.debug(resource_data)
 
@@ -89,14 +94,14 @@ def simple_tgw_attachment(request):
 class TestTransitGatewayVPCAttachment:
 
     @pytest.mark.resource_data({'tag_key': 'initialtagkey', 'tag_value': 'initialtagvalue'})
-    def test_crud_tags(self, ec2_client, simple_tgw_attachment):
+    def test_crud(self, ec2_client, simple_tgw_attachment):
         (ref, cr) = simple_tgw_attachment
 
         assert k8s.wait_on_condition(
             ref,
             "ACK.ResourceSynced",
             "True",
-            wait_periods=MAX_WAIT_FOR_SYNCED_SECONDS,
+            wait_periods=WAIT_PERIOD,
         )
 
         time.sleep(CREATE_WAIT_AFTER_SECONDS)
@@ -143,26 +148,12 @@ def test_crud_tags(self, ec2_client, simple_tgw_attachment):
             actual=attachment["Tags"],
         )
 
-    @pytest.mark.resource_data({'tag_key': 'initialtagkey', 'tag_value': 'initialtagvalue'})
-    def test_update_options(self, ec2_client, simple_tgw_attachment):
-        (ref, cr) = simple_tgw_attachment
-        
-
-        assert k8s.wait_on_condition(
-            ref,
-            "ACK.ResourceSynced",
-            "True",
-            wait_periods=MAX_WAIT_FOR_SYNCED_SECONDS,
-        )
-
-        attachment_id = cr["status"]["id"]
-
         # Update options
+        # dns support is enabled by default
         updates = {
             "spec": {
                 "options": {
                     "dnsSupport": "disable",
-                    "ipv6Support": "enable"
                 }
             }
         }
@@ -171,28 +162,13 @@ def test_update_options(self, ec2_client, simple_tgw_attachment):
         time.sleep(MODIFY_WAIT_AFTER_SECONDS)
 
         # Check resource synced successfully
-        assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5)
+        assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=WAIT_PERIOD)
 
         # Verify the update in AWS
         ec2_validator = EC2Validator(ec2_client)
         attachment = ec2_validator.get_transit_gateway_vpc_attachment(attachment_id)
 
         assert attachment["Options"]["DnsSupport"] == "disable"
-        assert attachment["Options"]["Ipv6Support"] == "enable"
-
-    @pytest.mark.resource_data({'tag_key': 'initialtagkey', 'tag_value': 'initialtagvalue'})
-    def test_update_subnet_ids(self, ec2_client, simple_tgw_attachment):
-        (ref, cr) = simple_tgw_attachment
-        
-        
-        assert k8s.wait_on_condition(
-            ref,
-            "ACK.ResourceSynced",
-            "True",
-            wait_periods=MAX_WAIT_FOR_SYNCED_SECONDS,
-        )
-
-        attachment_id = cr["status"]["id"]
 
         # Update subnet ids
         test_vpc = get_bootstrap_resources().SharedTestVPC
@@ -206,10 +182,10 @@ def test_update_subnet_ids(self, ec2_client, simple_tgw_attachment):
         time.sleep(MODIFY_WAIT_AFTER_SECONDS)
 
         # Check resource synced successfully
-        assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5)
+        assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=WAIT_PERIOD)
 
         # Verify the update in AWS
         ec2_validator = EC2Validator(ec2_client)
         attachment = ec2_validator.get_transit_gateway_vpc_attachment(attachment_id)
 
-        assert attachment["SubnetIds"] == test_vpc.public_subnets.subnet_ids
+        assert set(attachment["SubnetIds"]) == set(test_vpc.public_subnets.subnet_ids)