Add tests for adopting VPC endpoint service

Author: knottnt

test/e2e/bootstrap_resources.py

@@ -19,6 +19,7 @@
 from acktest.bootstrapping.s3 import Bucket
 from acktest.bootstrapping.vpc import VPC
 from acktest.bootstrapping.vpc import TransitGateway
+from acktest.bootstrapping.vpc_endpoint_service import VpcEndpointServiceConfiguration
 from e2e import bootstrap_directory
 
 @dataclass
@@ -28,6 +29,7 @@ class BootstrapResources(Resources):
     AdoptedVPC: VPC
     NetworkLoadBalancer: NetworkLoadBalancer
     TestTransitGateway: TransitGateway
+    AdoptedVpcEndpointService: VpcEndpointServiceConfiguration
 
 _bootstrap_resources = None
 

test/e2e/requirements.txt

@@ -1 +1 @@
-acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@72e9d798ad4f22e0e1ff4e227cfd69f7e301479a
+acktest @ git+https://github.com/knottnt/ack-test-infra.git@93adae31a050a11a67567e1e8d3c440b47f4044e

test/e2e/resources/vpc_endpoint_service_adoption.yaml

@@ -0,0 +1,9 @@
+apiVersion: ec2.services.k8s.aws/v1alpha1
+kind: VPCEndpointServiceConfiguration
+metadata:
+  name: $VPC_ENDPOINT_SERVICE_ADOPTED_NAME
+  annotations:
+    services.k8s.aws/adoption-policy: $ADOPTION_POLICY
+    services.k8s.aws/adoption-fields: "$ADOPTION_FIELDS"
+    services.k8s.aws/deletion-policy: retain
+spec: {}

test/e2e/service_bootstrap.py

@@ -19,6 +19,7 @@
 from acktest.bootstrapping.elbv2 import NetworkLoadBalancer
 from acktest.bootstrapping.vpc import VPC
 from acktest.bootstrapping.vpc import TransitGateway
+from acktest.bootstrapping.vpc_endpoint_service import VpcEndpointServiceConfiguration
 from acktest.bootstrapping.s3 import Bucket
 from e2e import bootstrap_directory
 from e2e.bootstrap_resources import BootstrapResources
@@ -37,7 +38,8 @@ def service_bootstrap() -> Resources:
         ),
         NetworkLoadBalancer=NetworkLoadBalancer("e2e-vpc-ep-service-test"),
         AdoptedVPC=VPC(name_prefix="e2e-adopted-vpc", num_public_subnet=1, num_private_subnet=0),
-        TestTransitGateway=TransitGateway()
+        TestTransitGateway=TransitGateway(),
+        AdoptedVpcEndpointService=VpcEndpointServiceConfiguration(name_prefix="e2e-adopted-vpc-es"),
     )
 
     try:

test/e2e/tests/test_vpc_endpoint_service_configuration_adoption.py

@@ -0,0 +1,113 @@
+# 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 Endpoint Service Configuraion Adoption.
+"""
+
+# Default to us-west-2 since that's where prow is deployed
+import logging
+from os import environ
+import time
+
+import pytest
+
+from e2e import service_marker
+from e2e import CRD_GROUP, CRD_VERSION, load_ec2_resource
+from e2e.bootstrap_resources import get_bootstrap_resources
+from e2e.replacement_values import REPLACEMENT_VALUES
+from acktest.resources import random_suffix_name
+from acktest.k8s import resource as k8s
+
+from e2e.tests.helper import EC2Validator
+
+
+REGION = "us-west-2" if environ.get('AWS_DEFAULT_REGION') is None else environ.get('AWS_DEFAULT_REGION')
+RESOURCE_PLURAL = "vpcendpointserviceconfigurations"
+
+CREATE_WAIT_AFTER_SECONDS = 10
+DELETE_WAIT_AFTER_SECONDS = 10
+MODIFY_WAIT_AFTER_SECONDS = 5
+
+@pytest.fixture
+def vpc_endpoint_service_adoption():
+    replacements = REPLACEMENT_VALUES.copy()
+    resource_name = random_suffix_name("vpc-es-adoption", 32)
+    service_id = get_bootstrap_resources().AdoptedVpcEndpointService.service_id
+    replacements["VPC_ADOPTION_NAME"] = resource_name
+    replacements["ADOPTION_POLICY"] = "adopt"
+    replacements["ADOPTION_FIELDS"] = f"{{\\\"serviceId\\\": \\\"{service_id}\\\"}}"
+
+    resource_data = load_ec2_resource(
+        "vpc_endpoint_service_adoption",
+        additional_replacements=replacements,
+    )
+    logging.debug(resource_data)
+
+    ref = k8s.CustomResourceReference(
+        CRD_GROUP, CRD_VERSION, 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_endpoint_service_configuration_adopt_update(self, ec2_client, vpc_endpoint_service_adoption):
+        (ref, cr) = vpc_endpoint_service_adoption
+
+        assert cr is not None
+        assert 'status' in cr
+        assert 'serviceID' in cr['status']
+        resource_id = cr['status']['serviceID']
+
+        assert 'spec' in cr
+        assert 'tags' in cr['spec']
+
+        # Check VPC Endpoint Service exists in AWS
+        ec2_validator = EC2Validator(ec2_client)
+        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'}
+
+        updates = {
+            "spec": {"tags": [current_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
+
+
+
+
+