Merge branch 'main' into vpc-attributes

Author: RedbackThomson

apis/v1alpha1/generator.yaml

@@ -118,6 +118,10 @@ resources:
       Routes:
         custom_field:
           list_of: CreateRouteInput
+      VpcId:
+        references:
+          resource: VPC
+          path: Status.VPCID
     hooks:
       sdk_create_post_set_output:
         template_path: hooks/route_table/sdk_create_post_set_output.go.tpl
@@ -134,6 +138,9 @@ resources:
         is_primary_key: true
       VpcId:
         is_required: true
+        references:
+          resource: VPC
+          path: Status.VPCID
     renames:
       operations:
         CreateSecurityGroup:
@@ -155,6 +162,11 @@ resources:
         - InvalidVpcID.NotFound
         - VPCIdNotSpecified
   Subnet:
+    fields:
+      VpcId:
+        references:
+          resource: VPC
+          path: Status.VPCID
     exceptions:
       terminal_codes:
         - InvalidVpcID.Malformed
@@ -180,6 +192,23 @@ resources:
       sdk_read_many_post_set_output:
         template_path: hooks/vpc/sdk_read_many_post_set_output.go.tpl
   VpcEndpoint:
+    fields:
+      VpcId:
+        references:
+          resource: VPC
+          path: Status.VPCID
+      RouteTableIds:
+        references:
+          resource: RouteTable
+          path: Status.RouteTableID
+      SecurityGroupIds:
+        references:
+          resource: SecurityGroup
+          path: Status.ID
+      SubnetIds:
+        references:
+          resource: Subnet
+          path: Status.SubnetID
     exceptions:
       terminal_codes:
         - InvalidVpcId.Malformed

apis/v1alpha1/route_table.go

@@ -91,8 +91,20 @@ spec:
               vpcID:
                 description: The ID of the VPC.
                 type: string
-            required:
-            - vpcID
+              vpcRef:
+                description: 'AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using ''from'' field Ex: APIIDRef:   from:     name:
+                  my-api'
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
             type: object
           status:
             description: RouteTableStatus defines the observed state of RouteTable

apis/v1alpha1/security_group.go

@@ -72,10 +72,23 @@ spec:
               vpcID:
                 description: '[EC2-VPC] The ID of the VPC. Required for EC2-VPC.'
                 type: string
+              vpcRef:
+                description: 'AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using ''from'' field Ex: APIIDRef:   from:     name:
+                  my-api'
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
             required:
             - description
             - name
-            - vpcID
             type: object
           status:
             description: SecurityGroupStatus defines the observed state of SecurityGroup

apis/v1alpha1/subnet.go

@@ -90,9 +90,22 @@ spec:
               vpcID:
                 description: The ID of the VPC.
                 type: string
+              vpcRef:
+                description: 'AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using ''from'' field Ex: APIIDRef:   from:     name:
+                  my-api'
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
             required:
             - cidrBlock
-            - vpcID
             type: object
           status:
             description: SubnetStatus defines the observed state of Subnet

apis/v1alpha1/vpc_endpoint.go

@@ -66,12 +66,44 @@ spec:
                 items:
                   type: string
                 type: array
+              routeTableRefs:
+                items:
+                  description: 'AWSResourceReferenceWrapper provides a wrapper around
+                    *AWSResourceReference type to provide more user friendly syntax
+                    for references using ''from'' field Ex: APIIDRef:   from:     name:
+                    my-api'
+                  properties:
+                    from:
+                      description: AWSResourceReference provides all the values necessary
+                        to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                      properties:
+                        name:
+                          type: string
+                      type: object
+                  type: object
+                type: array
               securityGroupIDs:
                 description: (Interface endpoint) The ID of one or more security groups
                   to associate with the endpoint network interface.
                 items:
                   type: string
                 type: array
+              securityGroupRefs:
+                items:
+                  description: 'AWSResourceReferenceWrapper provides a wrapper around
+                    *AWSResourceReference type to provide more user friendly syntax
+                    for references using ''from'' field Ex: APIIDRef:   from:     name:
+                    my-api'
+                  properties:
+                    from:
+                      description: AWSResourceReference provides all the values necessary
+                        to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                      properties:
+                        name:
+                          type: string
+                      type: object
+                  type: object
+                type: array
               serviceName:
                 description: The service name. To get a list of available services,
                   use the DescribeVpcEndpointServices request, or get the name from
@@ -85,6 +117,22 @@ spec:
                 items:
                   type: string
                 type: array
+              subnetRefs:
+                items:
+                  description: 'AWSResourceReferenceWrapper provides a wrapper around
+                    *AWSResourceReference type to provide more user friendly syntax
+                    for references using ''from'' field Ex: APIIDRef:   from:     name:
+                    my-api'
+                  properties:
+                    from:
+                      description: AWSResourceReference provides all the values necessary
+                        to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                      properties:
+                        name:
+                          type: string
+                      type: object
+                  type: object
+                type: array
               tagSpecifications:
                 description: The tags to associate with the endpoint.
                 items:
@@ -111,9 +159,22 @@ spec:
               vpcID:
                 description: The ID of the VPC in which the endpoint will be used.
                 type: string
+              vpcRef:
+                description: 'AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using ''from'' field Ex: APIIDRef:   from:     name:
+                  my-api'
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
             required:
             - serviceName
-            - vpcID
             type: object
           status:
             description: VPCEndpointStatus defines the observed state of VPCEndpoint