Remove EC2-Classic identifiers

Author: Nicholas Thomson

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-03-14T23:35:32Z"
+  build_date: "2022-03-15T18:06:47Z"
   build_hash: 00cd850c16117752abe18558326a508436565b1a
   go_version: go1.17.8
   version: v0.17.2
-api_directory_checksum: 45311575b1cf56326ccad9a2caea143fc104b630
+api_directory_checksum: 380fda39b038b24d5cb78d2680fdfd8f3ac42607
 api_version: v1alpha1
 aws_sdk_go_version: v1.42.0
 generator_config_info:
-  file_checksum: b588c7e44229d7db3737b17b76a68708c71e5b68
+  file_checksum: 8f2761c7fff3c2af0a06aa95685d7a47b8a69345
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/elastic_ip_address.go

@@ -18,6 +18,9 @@ ignore:
     - DeleteRouteInput.RouteTableId
     # support EC2-VPC only
     - DeleteSecurityGroupInput.GroupName
+    # support EC2-VPC only
+    - AllocateAddressInput.Domain
+    - AllocateAddressOutput.Domain
   resource_names:
     - AccountAttribute
     - CapacityReservation
@@ -94,11 +97,6 @@ operations:
     operation_type:
     - List
     resource_name: ElasticIPAddress
-    custom_check_required_fields_missing_method: customCheckRequiredFieldsMissing
-  ModifyAddressAttribute:
-    operation_type:
-    - Update
-    resource_name: ElasticIPAddress
   ReleaseAddress:
     operation_type:
     - Delete
@@ -109,7 +107,6 @@ operations:
     operation_type:
       - Delete
     resource_name: VpcEndpoint
-
 resources:
   DhcpOptions:
     fields:
@@ -180,21 +177,16 @@ resources:
           name: PUBLIC-IP
     list_operation:
       match_fields:
-      # PublicIP and AllocationID are two ways of identifying the same resource
-      # depending on whether they are included as part of EC2-Classic or EC2-VPC,
-      # respectively. As EC2-VPC is the preferred method, we should attempt to
-      # use the AllocationID field whenever possible.
       - AllocationId
     hooks:
+      sdk_create_post_build_request:
+        template_path: hooks/elastic_ip_address/sdk_create_post_build_request.go.tpl
       sdk_delete_post_build_request:
         template_path: hooks/elastic_ip_address/sdk_delete_post_build_request.go.tpl
+      sdk_read_many_pre_build_request:
+        template_path: hooks/elastic_ip_address/sdk_read_many_pre_build_request.go.tpl
       sdk_read_many_post_build_request:
         template_path: hooks/elastic_ip_address/sdk_read_many_post_build_request.go.tpl
-    renames:
-      operations:
-        ModifyAddressAttribute:
-          input_fields:
-            DomainName: Domain
   SecurityGroup:
     fields:
       # support EC2-VPC only

apis/v1alpha1/generator.yaml

@@ -52,12 +52,6 @@ spec:
                   to let Amazon EC2 select an address from the address pool. Alternatively,
                   specify a specific address from the address pool.
                 type: string
-              domain:
-                description: "Indicates whether the Elastic IP address is for use
-                  with instances in a VPC or instances in EC2-Classic. \n Default:
-                  If the Region supports EC2-Classic, the default is standard. Otherwise,
-                  the default is vpc."
-                type: string
               networkBorderGroup:
                 description: "A unique set of Availability Zones, Local Zones, or
                   Wavelength Zones from which Amazon Web Services advertises IP addresses.

apis/v1alpha1/types.go

@@ -18,6 +18,9 @@ ignore:
     - DeleteRouteInput.RouteTableId
     # support EC2-VPC only
     - DeleteSecurityGroupInput.GroupName
+    # support EC2-VPC only
+    - AllocateAddressInput.Domain
+    - AllocateAddressOutput.Domain
   resource_names:
     - AccountAttribute
     - CapacityReservation
@@ -94,11 +97,6 @@ operations:
     operation_type:
     - List
     resource_name: ElasticIPAddress
-    custom_check_required_fields_missing_method: customCheckRequiredFieldsMissing
-  ModifyAddressAttribute:
-    operation_type:
-    - Update
-    resource_name: ElasticIPAddress
   ReleaseAddress:
     operation_type:
     - Delete
@@ -109,7 +107,6 @@ operations:
     operation_type:
       - Delete
     resource_name: VpcEndpoint
-
 resources:
   DhcpOptions:
     fields:
@@ -180,21 +177,16 @@ resources:
           name: PUBLIC-IP
     list_operation:
       match_fields:
-      # PublicIP and AllocationID are two ways of identifying the same resource
-      # depending on whether they are included as part of EC2-Classic or EC2-VPC,
-      # respectively. As EC2-VPC is the preferred method, we should attempt to
-      # use the AllocationID field whenever possible.
       - AllocationId
     hooks:
+      sdk_create_post_build_request:
+        template_path: hooks/elastic_ip_address/sdk_create_post_build_request.go.tpl
       sdk_delete_post_build_request:
         template_path: hooks/elastic_ip_address/sdk_delete_post_build_request.go.tpl
+      sdk_read_many_pre_build_request:
+        template_path: hooks/elastic_ip_address/sdk_read_many_pre_build_request.go.tpl
       sdk_read_many_post_build_request:
         template_path: hooks/elastic_ip_address/sdk_read_many_post_build_request.go.tpl
-    renames:
-      operations:
-        ModifyAddressAttribute:
-          input_fields:
-            DomainName: Domain
   SecurityGroup:
     fields:
       # support EC2-VPC only

apis/v1alpha1/zz_generated.deepcopy.go

@@ -52,12 +52,6 @@ spec:
                   to let Amazon EC2 select an address from the address pool. Alternatively,
                   specify a specific address from the address pool.
                 type: string
-              domain:
-                description: "Indicates whether the Elastic IP address is for use
-                  with instances in a VPC or instances in EC2-Classic. \n Default:
-                  If the Region supports EC2-Classic, the default is standard. Otherwise,
-                  the default is vpc."
-                type: string
               networkBorderGroup:
                 description: "A unique set of Availability Zones, Local Zones, or
                   Wavelength Zones from which Amazon Web Services advertises IP addresses.