Apply ServiceId as matching field for VPC Endpoint Service

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-08T05:50:37Z"
+  build_hash: 580a56e85fed07f60089ef2cae634548b523981b
+  go_version: go1.24.3
+  version: v0.48.0-2-g580a56e-dirty
 api_directory_checksum: d162a6e9df2d4861d6c01d42047402b51f341293
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: e6a6ff840d55df735215ac04826122ebf89eb79a
+  file_checksum: eeec264d149c1d6c69144d4cbbd6ac1c8f1f8784
   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
@@ -1069,6 +1063,9 @@ resources:
       - path: Status.ServiceState
         in:
         - 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
@@ -1069,6 +1063,9 @@ resources:
       - path: Status.ServiceState
         in:
         - 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

@@ -41,11 +41,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 +79,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']