Terminal codes for elastic ip address (#71)

Issue #, if available:  [1362](aws-controllers-k8s/community#1362)

Description of changes:

- Removed existing terminal codes except `InvalidParameterValue` and `InvalidParameterCombination`.
- Added integration tests for the mapped terminal codes.
- Created separate `elastic_ip_invalid_combination` yaml file to test the `InvalidParameterCombination` terminal condition.

Initially added `IPV4Pool` and `address` in the same `elastic_ip_address.yaml` file but tests failed as spec's required for each test were different, so added a separate yaml file in order to easily differentiate the valid and invalid spec combinations of resources for future use.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: LikithaVemulapalli

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-08-15T17:56:40Z"
+  build_date: "2022-08-15T18:59:03Z"
   build_hash: 87477ae8ca8ac6ddb8c565bbd910cc7e30f55ed0
   go_version: go1.18.3
   version: v0.19.3
 api_directory_checksum: ff86d89efc3212fed4eb14bdc83af54601428a83
 api_version: v1alpha1
 aws_sdk_go_version: v1.42.0
 generator_config_info:
-  file_checksum: ca6ca773378da313559135dd2c614353077be06f
+  file_checksum: 2b16ea041c64881794dd4167b1388dd2210045fb
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -196,24 +196,8 @@ resources:
   ElasticIPAddress:
     exceptions:
       terminal_codes:
-      - IdempotentParameterMismatch
-      - InvalidAction
-      - InvalidCharacter
-      - InvalidClientTokenId
-      - InvalidPaginationToken
-      - InvalidParameter
       - InvalidParameterCombination
       - InvalidParameterValue
-      - InvalidQueryParameter
-      - MalformedQueryString
-      - MissingAction
-      - MissingAuthenticationToken
-      - MissingParameter
-      - UnknownParameter
-      - UnsupportedInstanceAttribute
-      - UnsupportedOperation
-      - UnsupportedProtocol
-      - ValidationError
     fields:
       AllocationId:
         is_primary_key: true

generator.yaml

@@ -196,24 +196,8 @@ resources:
   ElasticIPAddress:
     exceptions:
       terminal_codes:
-      - IdempotentParameterMismatch
-      - InvalidAction
-      - InvalidCharacter
-      - InvalidClientTokenId
-      - InvalidPaginationToken
-      - InvalidParameter
       - InvalidParameterCombination
       - InvalidParameterValue
-      - InvalidQueryParameter
-      - MalformedQueryString
-      - MissingAction
-      - MissingAuthenticationToken
-      - MissingParameter
-      - UnknownParameter
-      - UnsupportedInstanceAttribute
-      - UnsupportedOperation
-      - UnsupportedProtocol
-      - ValidationError
     fields:
       AllocationId:
         is_primary_key: true

pkg/resource/elastic_ip_address/sdk.go

@@ -3,4 +3,5 @@ kind: ElasticIPAddress
 metadata:
   name: $ADDRESS_NAME
 spec:
-  domain: vpc
+  domain: vpc
+  publicIPv4Pool: $PUBLIC_IPV4_POOL

test/e2e/resources/elastic_ip_address.yaml

@@ -0,0 +1,8 @@
+apiVersion: ec2.services.k8s.aws/v1alpha1
+kind: ElasticIPAddress
+metadata:
+  name: $ADDRESS_NAME
+spec:
+  domain: vpc
+  publicIPv4Pool: $PUBLIC_IPV4_POOL
+  address: $ADDRESS

test/e2e/resources/invalid/elastic_ip_invalid_combination.yaml

@@ -53,6 +53,7 @@ def test_create_delete(self, ec2_client):
         resource_name = random_suffix_name("elastic-ip-ack-test", 24)
         replacements = REPLACEMENT_VALUES.copy()
         replacements["ADDRESS_NAME"] = resource_name
+        replacements["PUBLIC_IPV4_POOL"] = "amazon"
 
         # Load ElasticIPAddress CR
         resource_data = load_ec2_resource(
@@ -89,4 +90,67 @@ def test_create_delete(self, ec2_client):
 
         # Check Address doesn't exist
         exists = address_exists(ec2_client, resource_id)
-        assert not exists
+        assert not exists
+        
+    def test_terminal_condition_invalid_parameter_value(self):
+        resource_name = random_suffix_name("elastic-ip-ack-fail-1", 24)
+        test_resource_values = REPLACEMENT_VALUES.copy()
+        test_resource_values["ADDRESS_NAME"] = resource_name
+        test_resource_values["PUBLIC_IPV4_POOL"] = "InvalidIpV4Address"
+
+        # Load ElasticIPAddress CR
+        resource_data = load_ec2_resource(
+            "elastic_ip_address",
+            additional_replacements=test_resource_values,
+        )
+        logging.debug(resource_data)
+
+        # Create k8s resource
+        ref = k8s.CustomResourceReference(
+            CRD_GROUP, CRD_VERSION, RESOURCE_PLURAL,
+            resource_name, namespace="default",
+        )
+        k8s.create_custom_resource(ref, resource_data)
+        cr = k8s.wait_resource_consumed_by_controller(ref)
+
+        assert cr is not None
+        assert k8s.get_resource_exists(ref)
+
+        expected_msg = "InvalidParameterValue: invalid value for parameter pool: InvalidIpV4Address"
+        terminal_condition = k8s.get_resource_condition(ref, "ACK.Terminal")
+        # Example condition message:
+        # An error occurred (InvalidParameterValue) when calling the AllocateAddress operation:
+        # invalid value for parameter pool: InvalidIpV4Address
+        assert expected_msg in terminal_condition['message']
+
+    def test_terminal_condition_invalid_parameter_combination(self):
+        resource_name = random_suffix_name("elastic-ip-ack-fail-2", 24)
+        test_resource_values = REPLACEMENT_VALUES.copy()
+        test_resource_values["ADDRESS_NAME"] = resource_name
+        test_resource_values["PUBLIC_IPV4_POOL"] = "amazon"
+        test_resource_values["ADDRESS"] = "52.27.68.220"
+
+        # Load ElasticIPAddress CR
+        resource_data = load_ec2_resource(
+            "invalid/elastic_ip_invalid_combination",
+            additional_replacements=test_resource_values,
+        )
+        logging.debug(resource_data)
+
+        # Create k8s resource
+        ref = k8s.CustomResourceReference(
+            CRD_GROUP, CRD_VERSION, RESOURCE_PLURAL,
+            resource_name, namespace="default",
+        )
+        k8s.create_custom_resource(ref, resource_data)
+        cr = k8s.wait_resource_consumed_by_controller(ref)
+
+        assert cr is not None
+        assert k8s.get_resource_exists(ref)
+
+        expected_msg = "InvalidParameterCombination: The parameter PublicIpv4Pool cannot be used with the parameter Address"
+        terminal_condition = k8s.get_resource_condition(ref, "ACK.Terminal")
+        # Example condition message:
+        # An error occurred (InvalidParameterCombination) when calling the AllocateAddress operation:
+        # The parameter PublicIpv4Pool cannot be used with the parameter Address
+        assert expected_msg in terminal_condition['message']

test/e2e/tests/test_elastic_ip_address.py

@@ -37,6 +37,7 @@ def standard_elastic_address():
 
     replacements = REPLACEMENT_VALUES.copy()
     replacements["ADDRESS_NAME"] = cluster_name
+    replacements["PUBLIC_IPV4_POOL"] = "amazon"
 
     resource_data = load_ec2_resource(
         "elastic_ip_address",