fix!: confusion argument Selector/Refs in netacl/acl and vpc/routetab…

…le (#146)
FlexibleEngineCloud · Jan 20, 2023 · 716d7bd · 716d7bd
1 parent 0d6f721
commit 716d7bd
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 29 deletions.
diff --git a/apis/netacl/v1beta1/zz_acl_types.go b/apis/netacl/v1beta1/zz_acl_types.go
diff --git a/apis/netacl/v1beta1/zz_generated.deepcopy.go b/apis/netacl/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/netacl/v1beta1/zz_generated.resolvers.go b/apis/netacl/v1beta1/zz_generated.resolvers.go
diff --git a/apis/vpc/v1beta1/zz_generated.deepcopy.go b/apis/vpc/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/vpc/v1beta1/zz_generated.resolvers.go b/apis/vpc/v1beta1/zz_generated.resolvers.go
diff --git a/apis/vpc/v1beta1/zz_routetable_types.go b/apis/vpc/v1beta1/zz_routetable_types.go
diff --git a/config/overrides.go b/config/overrides.go
@@ -27,9 +27,12 @@ func KnownReferencers() config.ResourceOption { //nolint:gocyclo
 			case "subnet_id":
 				r.References[k] = references.TypeVPCSubnetID().Get()
 
-			case "subnet_ids", "subnets":
+			case "subnet_ids":
 				r.References[k] = references.TypeVPCSubnetID().WithCustomRefsSelectors("SubnetIDRefs", "SubnetIDSelector").Get()
 
+			case "subnets":
+				r.References[k] = references.TypeVPCSubnetID().WithCustomRefsSelectors("SubnetRefs", "SubnetSelector").Get()
+
 			case "network_id":
 				r.References[k] = references.TypeVPCSubnetID().WithCustomRefsSelectors("NetworkIDRef", "NetworkIDSelector").Get()
 

diff --git a/examples-generated/netacl/acl.yaml b/examples-generated/netacl/acl.yaml
@@ -12,7 +12,7 @@ spec:
     - name: rule_1
     - name: rule_2
     name: my-fw-acl
-    subnetIdRefs:
+    subnetRefs:
     - name: flexibleengine_vpc_subnet_v1
 
 ---

diff --git a/examples/netacl/acl.yaml b/examples/netacl/acl.yaml
@@ -15,6 +15,6 @@ spec:
     outboundRuleRefs:
       - name: example-netacl-rule3
       - name: example-netacl-rule4
-    subnetIdRefs:
+    subnetRefs:
       - name: example-subnet
       - name: example-subnet2
diff --git a/package/crds/netacl.flexibleengine.upbound.io_acls.yaml b/package/crds/netacl.flexibleengine.upbound.io_acls.yaml
@@ -239,7 +239,7 @@ spec:
                     items:
                       type: string
                     type: array
-                  subnetIdRefs:
+                  subnetRefs:
                     description: References to VPCSubnet in vpc to populate subnets.
                     items:
                       description: A Reference to a named object.
@@ -276,7 +276,7 @@ spec:
                       - name
                       type: object
                     type: array
-                  subnetIdSelector:
+                  subnetSelector:
                     description: Selector for a list of VPCSubnet in vpc to populate
                       subnets.
                     properties:

diff --git a/package/crds/vpc.flexibleengine.upbound.io_routetables.yaml b/package/crds/vpc.flexibleengine.upbound.io_routetables.yaml
@@ -108,7 +108,7 @@ spec:
                       - type
                       type: object
                     type: array
-                  subnetIdRefs:
+                  subnetRefs:
                     description: References to VPCSubnet in vpc to populate subnets.
                     items:
                       description: A Reference to a named object.
@@ -145,7 +145,7 @@ spec:
                       - name
                       type: object
                     type: array
-                  subnetIdSelector:
+                  subnetSelector:
                     description: Selector for a list of VPCSubnet in vpc to populate
                       subnets.
                     properties: