Support attribute update

Author: Nicholas Thomson

apis/v1alpha1/generator.yaml

@@ -172,6 +172,8 @@ resources:
         - InvalidVpcID.Malformed
         - InvalidVpcID.NotFound
   Vpc:
+    update_operation:
+      custom_method_name: customUpdate
     exceptions:
       terminal_codes:
         - InvalidParameterCombination
@@ -187,8 +189,8 @@ resources:
     hooks:
       sdk_create_post_set_output:
         template_path: hooks/vpc/sdk_create_post_set_output.go.tpl
-      sdk_read_one_post_set_output:
-        template_path: hooks/vpc/sdk_read_one_post_set_output.go.tpl
+      sdk_read_many_post_set_output:
+        template_path: hooks/vpc/sdk_read_many_post_set_output.go.tpl
   VpcEndpoint:
     fields:
       VpcId:

generator.yaml

@@ -172,6 +172,8 @@ resources:
         - InvalidVpcID.Malformed
         - InvalidVpcID.NotFound
   Vpc:
+    update_operation:
+      custom_method_name: customUpdate
     exceptions:
       terminal_codes:
         - InvalidParameterCombination
@@ -187,8 +189,8 @@ resources:
     hooks:
       sdk_create_post_set_output:
         template_path: hooks/vpc/sdk_create_post_set_output.go.tpl
-      sdk_read_one_post_set_output:
-        template_path: hooks/vpc/sdk_read_one_post_set_output.go.tpl
+      sdk_read_many_post_set_output:
+        template_path: hooks/vpc/sdk_read_many_post_set_output.go.tpl
   VpcEndpoint:
     fields:
       VpcId:

pkg/resource/vpc/hook.go

@@ -17,6 +17,7 @@ import (
 	"context"
 
 	svcapitypes "github.com/aws-controllers-k8s/ec2-controller/apis/v1alpha1"
+	ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
 	ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
 	svcsdk "github.com/aws/aws-sdk-go/service/ec2"
 )
@@ -135,3 +136,33 @@ func (rm *resourceManager) addAttributesToSpec(
 
 	return nil
 }
+
+func (rm *resourceManager) customUpdate(
+	ctx context.Context,
+	desired *resource,
+	latest *resource,
+	delta *ackcompare.Delta,
+) (updated *resource, err error) {
+	rlog := ackrtlog.FromContext(ctx)
+	exit := rlog.Trace("rm.customUpdateVPC")
+	defer exit(err)
+
+	// Merge in the information we read from the API call above to the copy of
+	// the original Kubernetes object we passed to the function
+	ko := desired.ko.DeepCopy()
+
+	if delta.DifferentAt("Spec.EnableDNSSupport") {
+		if err := rm.syncDNSSupportAttribute(ctx, desired); err != nil {
+			return nil, err
+		}
+	}
+
+	if delta.DifferentAt("Spec.EnableDNSHostnames") {
+		if err := rm.syncDNSHostnamesAttribute(ctx, desired); err != nil {
+			return nil, err
+		}
+	}
+
+	rm.setStatusDefaults(ko)
+	return &resource{ko}, nil
+}

pkg/resource/vpc/sdk.go

@@ -27,6 +27,7 @@
 
 CREATE_WAIT_AFTER_SECONDS = 10
 DELETE_WAIT_AFTER_SECONDS = 10
+MODIFY_WAIT_AFTER_SECONDS = 5
 
 
 def get_vpc(ec2_client, vpc_id: str) -> dict:
@@ -46,6 +47,17 @@ def get_vpc(ec2_client, vpc_id: str) -> dict:
 def vpc_exists(ec2_client, vpc_id: str) -> bool:
     return get_vpc(ec2_client, vpc_id) is not None
 
+def get_vpc_attribute(ec2_client, vpc_id: str, attribute_name: str) -> dict:
+    return ec2_client.describe_vpc_attribute(Attribute=attribute_name, VpcId=vpc_id)
+    
+def get_dns_support(ec2_client, vpc_id: str) -> bool:
+    attribute = get_vpc_attribute(ec2_client, vpc_id, 'enableDnsSupport')
+    return attribute['EnableDnsSupport']['Value']
+
+def get_dns_hostnames(ec2_client, vpc_id: str) -> bool:
+    attribute = get_vpc_attribute(ec2_client, vpc_id, 'enableDnsHostnames')
+    return attribute['EnableDnsHostnames']['Value']
+
 @service_marker
 @pytest.mark.canary
 class TestVpc:
@@ -128,12 +140,30 @@ def test_enable_attributes(self, ec2_client):
         assert exists
 
         # Assert the attributes are set correctly
-        dns_support = ec2_client.describe_vpc_attribute(Attribute='enableDnsSupport', VpcId=resource_id)
-        assert dns_support['EnableDnsSupport']['Value']
-
-        dns_hostnames = ec2_client.describe_vpc_attribute(Attribute='enableDnsHostnames', VpcId=resource_id)
-        assert dns_hostnames['EnableDnsHostnames']['Value']
-
+        assert get_dns_support(ec2_client, resource_id)
+        assert get_dns_hostnames(ec2_client, resource_id)
+
+        # Disable the DNS support
+        updates = {
+            "spec": {"enableDNSSupport": False}
+        }
+        k8s.patch_custom_resource(ref, updates)
+        time.sleep(MODIFY_WAIT_AFTER_SECONDS)
+
+        # Assert DNS support has been updated
+        assert not get_dns_support(ec2_client, resource_id)
+        assert get_dns_hostnames(ec2_client, resource_id)
+
+        # Disable the DNS hostname
+        updates = {
+            "spec": {"enableDNSHostnames": False}
+        }
+        k8s.patch_custom_resource(ref, updates)
+        time.sleep(MODIFY_WAIT_AFTER_SECONDS)
+
+        # Assert DNS hostname has been updated
+        assert not get_dns_support(ec2_client, resource_id)
+        assert not get_dns_hostnames(ec2_client, resource_id)
 
         # Delete k8s resource
         _, deleted = k8s.delete_custom_resource(ref, 2, 5)