Apply ServiceId as matching field for VPC Endpoint Service

- Use ServiceID as matching field for list operation
- Update synced check to use Available instead of available

Author: knottnt

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-06-16T02:14:15Z"
-  build_hash: e675923dfc54d8b6e09730098c3e3e1056d3c1e9
-  go_version: go1.24.0
-  version: v0.48.0
+  build_date: "2025-07-10T22:19:07Z"
+  build_hash: 580a56e85fed07f60089ef2cae634548b523981b
+  go_version: go1.24.3
+  version: v0.48.0-2-g580a56e
 api_directory_checksum: d162a6e9df2d4861d6c01d42047402b51f341293
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: e6a6ff840d55df735215ac04826122ebf89eb79a
+  file_checksum: a3b7769e44651dbf7cdf955e76e47458b3436550
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -254,12 +254,6 @@ operations:
     operation_type:
       - Delete
     resource_name: VpcEndpointServiceConfiguration
-  CreateVpcEndpointServiceConfiguration:
-    output_wrapper_field_path: ServiceConfiguration
-  DeleteVpcEndpointServiceConfigurations:
-    operation_type:
-      - Delete
-    resource_name: VpcEndpointServiceConfiguration
   CreateFlowLogs:
     operation_type:
     - Create
@@ -1068,7 +1062,10 @@ resources:
       when:
       - path: Status.ServiceState
         in:
-        - available
+        - Available
+    list_operation:
+      match_fields:
+        - ServiceId
     hooks:
       sdk_delete_post_build_request:
         template_path: hooks/vpc_endpoint_service_configuration/sdk_delete_post_build_request.go.tpl

generator.yaml

@@ -254,12 +254,6 @@ operations:
     operation_type:
       - Delete
     resource_name: VpcEndpointServiceConfiguration
-  CreateVpcEndpointServiceConfiguration:
-    output_wrapper_field_path: ServiceConfiguration
-  DeleteVpcEndpointServiceConfigurations:
-    operation_type:
-      - Delete
-    resource_name: VpcEndpointServiceConfiguration
   CreateFlowLogs:
     operation_type:
     - Create
@@ -1068,7 +1062,10 @@ resources:
       when:
       - path: Status.ServiceState
         in:
-        - available
+        - Available
+    list_operation:
+      match_fields:
+        - ServiceId
     hooks:
       sdk_delete_post_build_request:
         template_path: hooks/vpc_endpoint_service_configuration/sdk_delete_post_build_request.go.tpl

pkg/resource/elastic_ip_address/sdk.go

@@ -100,6 +100,8 @@ def test_vpc_endpoint_service_configuration_create_delete(self, ec2_client, simp
         # Check VPC Endpoint Service exists in AWS
         ec2_validator = EC2Validator(ec2_client)
         ec2_validator.assert_vpc_endpoint_service_configuration(resource_id)
+        assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5)
+
 
         # Check that the allowedPrincipal is properly set
         allowed_principals = ec2_validator.get_vpc_endpoint_service_permissions(resource_id)

pkg/resource/vpc_endpoint_service_configuration/manager.go

@@ -27,6 +27,7 @@
 from e2e.replacement_values import REPLACEMENT_VALUES
 from acktest.resources import random_suffix_name
 from acktest.k8s import resource as k8s
+from acktest import tags
 
 from e2e.tests.helper import EC2Validator
 
@@ -41,11 +42,13 @@
 @pytest.fixture
 def vpc_endpoint_service_adoption():
     replacements = REPLACEMENT_VALUES.copy()
-    resource_name = random_suffix_name("vpc-es-adoption", 32)
+    resource_name = random_suffix_name("vpc-es-adoption", 24)
     service_id = get_bootstrap_resources().AdoptedVpcEndpointService.service_id
-    replacements["VPC_ADOPTION_NAME"] = resource_name
+    assert service_id is not None
+
+    replacements["VPC_ENDPOINT_SERVICE_ADOPTED_NAME"] = resource_name
     replacements["ADOPTION_POLICY"] = "adopt"
-    replacements["ADOPTION_FIELDS"] = f"{{\\\"serviceId\\\": \\\"{service_id}\\\"}}"
+    replacements["ADOPTION_FIELDS"] = f"{{\\\"serviceID\\\": \\\"{service_id}\\\"}}"
 
     resource_data = load_ec2_resource(
         "vpc_endpoint_service_adoption",
@@ -77,6 +80,8 @@ class TestVpcAdoption:
     def test_vpc_endpoint_service_configuration_adopt_update(self, ec2_client, vpc_endpoint_service_adoption):
         (ref, cr) = vpc_endpoint_service_adoption
 
+        time.sleep(CREATE_WAIT_AFTER_SECONDS)
+
         assert cr is not None
         assert 'status' in cr
         assert 'serviceID' in cr['status']
@@ -90,22 +95,27 @@ def test_vpc_endpoint_service_configuration_adopt_update(self, ec2_client, vpc_e
         ec2_validator.assert_vpc_endpoint_service_configuration(resource_id)
 
         endpoint_service_config = ec2_validator.get_vpc_endpoint_service_configuration(resource_id)
-        assert len(endpoint_service_config['Tags']) == 1
-        current_tag = endpoint_service_config['Tags'][0]
-        new_tag = {'Key': 'TestName', 'Value': 'test-value'}
 
+        actual_tags = endpoint_service_config['Tags']
+        tags.assert_ack_system_tags(actual_tags)
+
+        name_tag = next((tag for tag in actual_tags if tag['Key'] == 'Name'), None)
+        assert name_tag is not None
+
+        new_tag = {'Key': 'TestName', 'Value': 'test-value'}
         updates = {
-            "spec": {"tags": [current_tag, new_tag]}
+            "spec": {"tags": [name_tag, new_tag]}
         }
         k8s.patch_custom_resource(ref, updates)
         time.sleep(MODIFY_WAIT_AFTER_SECONDS)
 
         assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5)
 
         endpoint_service_config = ec2_validator.get_vpc_endpoint_service_configuration(resource_id)
-        assert len(endpoint_service_config['Tags']) == 2
-        assert endpoint_service_config['Tags'][0] == current_tag
-        assert endpoint_service_config['Tags'][1] == new_tag
+        tags.assert_equal_without_ack_tags(
+            actual=endpoint_service_config['Tags'],
+            expected=[name_tag, new_tag],
+        )