Refactor and simplify describe attrs

Author: Nicholas Thomson

pkg/resource/vpc/hook.go

@@ -16,22 +16,52 @@ package vpc
 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"
 )
 
+type DNSAttrs struct {
+	EnableSupport   *bool
+	EnableHostnames *bool
+}
+
 func newDescribeVpcAttributePayload(
-	r *resource,
+	vpcID string,
 	attribute string,
 ) *svcsdk.DescribeVpcAttributeInput {
 	res := &svcsdk.DescribeVpcAttributeInput{}
-	res.SetVpcId(*r.ko.Status.VPCID)
+	res.SetVpcId(vpcID)
 	res.SetAttribute(attribute)
 	return res
 }
 
+func (rm *resourceManager) getDNSAttributes(
+	ctx context.Context,
+	vpcID string,
+) (res *DNSAttrs, err error) {
+	res = &DNSAttrs{}
+	dnsSupport, err := rm.sdkapi.DescribeVpcAttributeWithContext(
+		ctx,
+		newDescribeVpcAttributePayload(vpcID, svcsdk.VpcAttributeNameEnableDnsSupport),
+	)
+	if err != nil {
+		return nil, err
+	}
+	res.EnableSupport = dnsSupport.EnableDnsSupport.Value
+
+	dnsHostnames, err := rm.sdkapi.DescribeVpcAttributeWithContext(
+		ctx,
+		newDescribeVpcAttributePayload(vpcID, svcsdk.VpcAttributeNameEnableDnsHostnames),
+	)
+	if err != nil {
+		return nil, err
+	}
+	res.EnableHostnames = dnsHostnames.EnableDnsHostnames.Value
+
+	return res, nil
+}
+
 func newModifyDNSSupportAttributeInputPayload(
 	r *resource,
 ) *svcsdk.ModifyVpcAttributeInput {
@@ -117,26 +147,6 @@ func (rm *resourceManager) createAttributes(
 	return nil
 }
 
-func (rm *resourceManager) addAttributesToSpec(
-	ctx context.Context,
-	r *resource,
-	ko *svcapitypes.VPC,
-) (err error) {
-	dnsSupport, err := rm.sdkapi.DescribeVpcAttributeWithContext(ctx, newDescribeVpcAttributePayload(r, svcsdk.VpcAttributeNameEnableDnsSupport))
-	if err != nil {
-		return err
-	}
-	ko.Spec.EnableDNSSupport = dnsSupport.EnableDnsSupport.Value
-
-	dnsHostnames, err := rm.sdkapi.DescribeVpcAttributeWithContext(ctx, newDescribeVpcAttributePayload(r, svcsdk.VpcAttributeNameEnableDnsHostnames))
-	if err != nil {
-		return err
-	}
-	ko.Spec.EnableDNSHostnames = dnsHostnames.EnableDnsHostnames.Value
-
-	return nil
-}
-
 func (rm *resourceManager) customUpdate(
 	ctx context.Context,
 	desired *resource,

pkg/resource/vpc/sdk.go

@@ -1,4 +1,4 @@
     err = rm.createAttributes(ctx, &resource{ko})
     if err != nil {
         return nil, err
-    }
+    } 

templates/hooks/vpc/sdk_create_post_set_output.go.tpl

@@ -1,3 +1,6 @@
-    if err := rm.addAttributesToSpec(ctx, r, ko); err != nil {
+	if dnsAttrs, err := rm.getDNSAttributes(ctx, *ko.Status.VPCID); err != nil {
 		return nil, err
+	} else {
+		ko.Spec.EnableDNSSupport = dnsAttrs.EnableSupport
+		ko.Spec.EnableDNSHostnames = dnsAttrs.EnableHostnames
 	}