Merge branch 'main' into ack-bot/rt-v0.40.0-codegen-v0.40.0

Author: a-hilaly

apis/v1alpha1/ack-generate-metadata.yaml

@@ -7,7 +7,7 @@ api_directory_checksum: 585098fc7c99c27ca523f83e860107d22aaa5a10
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
 generator_config_info:
-  file_checksum: 2c5ef491ef62c9347bcb87918f715692adf727bc
+  file_checksum: 4a977c2334f44fd0ea8d09dd6afe759cd7459eb1
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -351,6 +351,8 @@ resources:
         template_path: hooks/flow_log/sdk_file_end.go.tpl
       post_set_resource_identifiers:
         template_path: hooks/flow_log/post_set_resource_identifiers.go.tpl
+      post_populate_resource_from_annotation:
+        template_path: hooks/flow_log/post_populate_resource_from_annotation.go.tpl
     update_operation:
       custom_method_name: customUpdateFlowLog
   InternetGateway:

generator.yaml

@@ -351,6 +351,8 @@ resources:
         template_path: hooks/flow_log/sdk_file_end.go.tpl
       post_set_resource_identifiers:
         template_path: hooks/flow_log/post_set_resource_identifiers.go.tpl
+      post_populate_resource_from_annotation:
+        template_path: hooks/flow_log/post_populate_resource_from_annotation.go.tpl
     update_operation:
       custom_method_name: customUpdateFlowLog
   InternetGateway:

pkg/resource/flow_log/resource.go

@@ -0,0 +1,11 @@
+	if resourceID, ok := fields["resourceID"]; ok {
+		r.ko.Spec.ResourceID = &resourceID
+	} else {
+		return ackerrors.MissingNameIdentifier
+	}
+
+	if resourceType, ok := fields["resourceType"]; ok {
+			r.ko.Spec.ResourceType = &resourceType
+	} else {
+		return ackerrors.MissingNameIdentifier
+	}

templates/hooks/flow_log/post_populate_resource_from_annotation.go.tpl

@@ -24,6 +24,7 @@
 class BootstrapResources(Resources):
     FlowLogsBucket: Bucket
     SharedTestVPC: VPC
+    AdoptedVPC: VPC
     NetworkLoadBalancer: NetworkLoadBalancer
 
 _bootstrap_resources = None

test/e2e/bootstrap_resources.py

@@ -0,0 +1,8 @@
+apiVersion: ec2.services.k8s.aws/v1alpha1
+kind: Subnet
+metadata:
+  name: $SUBNET_ADOPTION_NAME
+  annotations:
+    services.k8s.aws/adoption-policy: $ADOPTION_POLICY
+    services.k8s.aws/adoption-fields: "$ADOPTION_FIELDS"
+    services.k8s.aws/deletion-policy: retain

test/e2e/resources/subnet_adoption.yaml

@@ -0,0 +1,8 @@
+apiVersion: ec2.services.k8s.aws/v1alpha1
+kind: VPC
+metadata:
+  name: $VPC_ADOPTION_NAME
+  annotations:
+    services.k8s.aws/adoption-policy: $ADOPTION_POLICY
+    services.k8s.aws/adoption-fields: "$ADOPTION_FIELDS"
+    services.k8s.aws/deletion-policy: retain

test/e2e/resources/vpc_adoption.yaml

@@ -30,7 +30,8 @@ def service_bootstrap() -> Resources:
         FlowLogsBucket=Bucket(
             "ack-ec2-controller-flow-log-tests",
         ),
-        NetworkLoadBalancer=NetworkLoadBalancer("e2e-vpc-ep-service-test")
+        NetworkLoadBalancer=NetworkLoadBalancer("e2e-vpc-ep-service-test"),
+        AdoptedVPC=VPC(name_prefix="e2e-adopted-vpc", num_public_subnet=1, num_private_subnet=0)
     )
 
     try:

test/e2e/service_bootstrap.py

@@ -0,0 +1,94 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may
+# not use this file except in compliance with the License. A copy of the
+# License is located at
+#
+# 	 http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+"""Integration tests for the Subnet Adoption API.
+"""
+
+import pytest
+import time
+import logging
+
+from acktest import tags
+from acktest.resources import random_suffix_name
+from acktest.k8s import resource as k8s
+from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_ec2_resource
+from e2e.bootstrap_resources import get_bootstrap_resources
+from e2e.replacement_values import REPLACEMENT_VALUES
+from e2e.tests.helper import EC2Validator
+
+SUBNET_RESOURCE_PLURAL = "subnets"
+
+CREATE_WAIT_AFTER_SECONDS = 10
+UPDATE_WAIT_AFTER_SECONDS = 10
+DELETE_WAIT_AFTER_SECONDS = 10
+
+@pytest.fixture
+def subnet_adoption(request):
+    replacements = REPLACEMENT_VALUES.copy()
+    resource_name = random_suffix_name("subnet-adoption", 32)
+    subnet_id = get_bootstrap_resources().AdoptedVPC.public_subnets.subnet_ids[0]
+    replacements["SUBNET_ADOPTION_NAME"] = resource_name
+    replacements["ADOPTION_POLICY"] = "adopt"
+    replacements["ADOPTION_FIELDS"] = f"{{\\\"subnetID\\\": \\\"{subnet_id}\\\"}}"
+
+    resource_data = load_ec2_resource(
+        "subnet_adoption",
+        additional_replacements=replacements,
+    )
+    logging.debug(resource_data)
+
+    ref = k8s.CustomResourceReference(
+        CRD_GROUP, CRD_VERSION, SUBNET_RESOURCE_PLURAL,
+        resource_name, namespace="default",
+    )
+    k8s.create_custom_resource(ref, resource_data)
+    time.sleep(CREATE_WAIT_AFTER_SECONDS)
+
+    cr = k8s.wait_resource_consumed_by_controller(ref)
+    assert cr is not None
+    assert k8s.get_resource_exists(ref)
+
+    yield (ref, cr)
+
+    _, deleted = k8s.delete_custom_resource(ref, DELETE_WAIT_AFTER_SECONDS)
+    assert deleted
+
+
+@service_marker
+@pytest.mark.canary
+class TestSubnetAdoption:
+    def test_subnet_adopt_update(self, ec2_client, subnet_adoption):
+        (ref, cr) = subnet_adoption
+
+        assert cr is not None
+        assert 'status' in cr
+        assert 'subnetID' in cr['status']
+        resource_id = cr['status']['subnetID']
+
+        assert 'spec' in cr
+        assert 'vpcID' in cr['spec']
+        assert 'mapPublicIPOnLaunch' in cr['spec']
+        mapPublicIPOnLaunch = not cr['spec']['mapPublicIPOnLaunch']
+        # Check Subnet exists in AWS
+        ec2_validator = EC2Validator(ec2_client)
+        ec2_validator.assert_subnet(resource_id)
+
+        updates = {
+            "spec": {"mapPublicIPOnLaunch": mapPublicIPOnLaunch},
+        }
+        k8s.patch_custom_resource(ref, updates)
+        time.sleep(UPDATE_WAIT_AFTER_SECONDS)
+    
+        assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5)
+        subnet = ec2_validator.get_subnet(resource_id)
+        assert subnet['MapPublicIpOnLaunch'] == mapPublicIPOnLaunch

test/e2e/tests/test_subnet_adoption.py

@@ -0,0 +1,100 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may
+# not use this file except in compliance with the License. A copy of the
+# License is located at
+#
+# 	 http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+"""Integration tests for the Vpc Adoption API.
+"""
+
+import pytest
+import time
+import logging
+
+from acktest import tags
+from acktest.resources import random_suffix_name
+from acktest.k8s import resource as k8s
+from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_ec2_resource
+from e2e.bootstrap_resources import get_bootstrap_resources
+from e2e.replacement_values import REPLACEMENT_VALUES
+from e2e.tests.helper import EC2Validator
+
+VPC_RESOURCE_PLURAL = "vpcs"
+
+CREATE_WAIT_AFTER_SECONDS = 10
+UPDATE_WAIT_AFTER_SECONDS = 10
+DELETE_WAIT_AFTER_SECONDS = 10
+
+@pytest.fixture
+def vpc_adoption(request):
+    replacements = REPLACEMENT_VALUES.copy()
+    resource_name = random_suffix_name("vpc-adoption", 32)
+    vpc_id = get_bootstrap_resources().AdoptedVPC.vpc_id
+    replacements["VPC_ADOPTION_NAME"] = resource_name
+    replacements["ADOPTION_POLICY"] = "adopt"
+    replacements["ADOPTION_FIELDS"] = f"{{\\\"vpcID\\\": \\\"{vpc_id}\\\"}}"
+
+    resource_data = load_ec2_resource(
+        "vpc_adoption",
+        additional_replacements=replacements,
+    )
+    logging.debug(resource_data)
+
+    ref = k8s.CustomResourceReference(
+        CRD_GROUP, CRD_VERSION, VPC_RESOURCE_PLURAL,
+        resource_name, namespace="default",
+    )
+    k8s.create_custom_resource(ref, resource_data)
+    time.sleep(CREATE_WAIT_AFTER_SECONDS)
+
+    cr = k8s.wait_resource_consumed_by_controller(ref)
+    assert cr is not None
+    assert k8s.get_resource_exists(ref)
+
+    yield (ref, cr)
+
+    _, deleted = k8s.delete_custom_resource(ref, DELETE_WAIT_AFTER_SECONDS)
+    assert deleted
+
+
+@service_marker
+@pytest.mark.canary
+class TestVpcAdoption:
+    def test_vpc_adopt_update(self, ec2_client, vpc_adoption):
+        (ref, cr) = vpc_adoption
+
+        assert cr is not None
+        assert 'status' in cr
+        assert 'vpcID' in cr['status']
+        resource_id = cr['status']['vpcID']
+
+        assert 'spec' in cr
+        assert 'tags' in cr['spec']
+
+        # Check VPC exists in AWS
+        ec2_validator = EC2Validator(ec2_client)
+        ec2_validator.assert_vpc(resource_id)
+
+        vpc = ec2_validator.get_vpc(resource_id)
+        assert len(vpc['CidrBlockAssociationSet']) == 1
+        primary_cidr = vpc['CidrBlockAssociationSet'][0]['CidrBlock']
+        secondary_cidr = "10.2.0.0/16"
+        updates = {
+            "spec": {"cidrBlocks": [primary_cidr, secondary_cidr]}
+        }
+        k8s.patch_custom_resource(ref, updates)
+        time.sleep(UPDATE_WAIT_AFTER_SECONDS)
+    
+        assert k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5)
+        
+        vpc = ec2_validator.get_vpc(resource_id)
+        assert len(vpc['CidrBlockAssociationSet']) == 2
+        assert vpc['CidrBlockAssociationSet'][0]['CidrBlock'] == primary_cidr
+        assert vpc['CidrBlockAssociationSet'][1]['CidrBlock'] == secondary_cidr