Refactor VPCSpec.CIDRBlock into CIDRBlocks (#84)

Issue #, if available: aws-controllers-k8s/community#1198

Description of changes: VPCs can have multiple IPv4 CIDR blocks associated with it; therefore, refactor VPC's Spec `CIDRBlock` field into `CIDRBlocks` to support a list of CIDR blocks. The **first** entry in `VPCSpec.CIDRBlocks` will be used as the **primary** IPv4 CIDR block upon VPC creation. This is prerequisite work for `Update` logic and supporting multiple CIDR blocks will be enabled in a subsequent PR.

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

Author: brycahta

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-08-22T17:29:13Z"
+  build_date: "2022-08-30T21:16:34Z"
   build_hash: 87477ae8ca8ac6ddb8c565bbd910cc7e30f55ed0
   go_version: go1.18.1
   version: v0.19.3
-api_directory_checksum: ff86d89efc3212fed4eb14bdc83af54601428a83
+api_directory_checksum: 5ce1a3bbdc20416fec04fb2551900c42d8b2034e
 api_version: v1alpha1
 aws_sdk_go_version: v1.42.0
 generator_config_info:
-  file_checksum: 941aba834f0ab63e4555013717c7d9d96747ed9c
+  file_checksum: 1e5e8980ffcaabb7164424dd6eda12d5e693f55b
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -22,6 +22,8 @@ ignore:
     - CreateSubnetInput.TagSpecifications
     - CreateTransitGatewayInput.DryRun
     - CreateTransitGatewayInput.TagSpecifications
+    - CreateVpcInput.CidrBlock
+    - CreateVpcOutput.Vpc.CidrBlock
     - CreateVpcInput.DryRun
     - CreateVpcInput.TagSpecifications
     - CreateVpcEndpointInput.DryRun
@@ -423,6 +425,9 @@ resources:
       terminal_codes:
         - InvalidParameterValue
     fields:
+      CIDRBlocks:
+        custom_field:
+          list_of: String
       EnableDNSSupport:
         from:
           operation: ModifyVpcAttribute

apis/v1alpha1/types.go

@@ -42,12 +42,10 @@ spec:
                   prefix length for the VPC. You cannot specify the range of IP addresses,
                   or the size of the CIDR block.
                 type: boolean
-              cidrBlock:
-                description: The IPv4 network range for the VPC, in CIDR notation.
-                  For example, 10.0.0.0/16. We modify the specified CIDR block to
-                  its canonical form; for example, if you specify 100.68.0.18/18,
-                  we modify it to 100.68.0.0/18.
-                type: string
+              cidrBlocks:
+                items:
+                  type: string
+                type: array
               enableDNSHostnames:
                 description: The attribute value. The valid values are true or false.
                 type: boolean
@@ -92,8 +90,6 @@ spec:
                       type: string
                   type: object
                 type: array
-            required:
-            - cidrBlock
             type: object
           status:
             description: VPCStatus defines the observed state of VPC

apis/v1alpha1/vpc.go

@@ -22,6 +22,8 @@ ignore:
     - CreateSubnetInput.TagSpecifications
     - CreateTransitGatewayInput.DryRun
     - CreateTransitGatewayInput.TagSpecifications
+    - CreateVpcInput.CidrBlock
+    - CreateVpcOutput.Vpc.CidrBlock
     - CreateVpcInput.DryRun
     - CreateVpcInput.TagSpecifications
     - CreateVpcEndpointInput.DryRun
@@ -423,6 +425,9 @@ resources:
       terminal_codes:
         - InvalidParameterValue
     fields:
+      CIDRBlocks:
+        custom_field:
+          list_of: String
       EnableDNSSupport:
         from:
           operation: ModifyVpcAttribute

apis/v1alpha1/zz_generated.deepcopy.go

@@ -42,12 +42,10 @@ spec:
                   prefix length for the VPC. You cannot specify the range of IP addresses,
                   or the size of the CIDR block.
                 type: boolean
-              cidrBlock:
-                description: The IPv4 network range for the VPC, in CIDR notation.
-                  For example, 10.0.0.0/16. We modify the specified CIDR block to
-                  its canonical form; for example, if you specify 100.68.0.18/18,
-                  we modify it to 100.68.0.0/18.
-                type: string
+              cidrBlocks:
+                items:
+                  type: string
+                type: array
               enableDNSHostnames:
                 description: The attribute value. The valid values are true or false.
                 type: boolean
@@ -92,8 +90,6 @@ spec:
                       type: string
                   type: object
                 type: array
-            required:
-            - cidrBlock
             type: object
           status:
             description: VPCStatus defines the observed state of VPC

config/crd/bases/ec2.services.k8s.aws_vpcs.yaml

@@ -177,6 +177,16 @@ func (rm *resourceManager) customUpdate(
 	return &resource{ko}, nil
 }
 
+// applyPrimaryCIDRBlockInCreateRequest populates
+// CreateVpcInput.CidrBlock field with the FIRST
+// CIDR block defined in the resource's Spec
+func applyPrimaryCIDRBlockInCreateRequest(r *resource,
+	input *svcsdk.CreateVpcInput) {
+	if r.ko.Spec.CIDRBlocks != nil && len(r.ko.Spec.CIDRBlocks) > 0 {
+		input.CidrBlock = r.ko.Spec.CIDRBlocks[0]
+	}
+}
+
 // updateTagSpecificationsInCreateRequest adds
 // Tags defined in the Spec to CreateVpcInput.TagSpecification
 // and ensures the ResourceType is always set to 'vpc'