From 716d7bd5e0f329382c5888c3bd6c89b3f07e90d6 Mon Sep 17 00:00:00 2001 From: Mickael Stanislas Date: Fri, 20 Jan 2023 16:00:46 +0100 Subject: [PATCH] fix!: confusion argument Selector/Refs in netacl/acl and vpc/routetable (#146) --- apis/netacl/v1beta1/zz_acl_types.go | 8 ++++---- apis/netacl/v1beta1/zz_generated.deepcopy.go | 8 ++++---- apis/netacl/v1beta1/zz_generated.resolvers.go | 6 +++--- apis/vpc/v1beta1/zz_generated.deepcopy.go | 8 ++++---- apis/vpc/v1beta1/zz_generated.resolvers.go | 6 +++--- apis/vpc/v1beta1/zz_routetable_types.go | 8 ++++---- config/overrides.go | 5 ++++- examples-generated/netacl/acl.yaml | 2 +- examples/netacl/acl.yaml | 2 +- package/crds/netacl.flexibleengine.upbound.io_acls.yaml | 4 ++-- .../crds/vpc.flexibleengine.upbound.io_routetables.yaml | 4 ++-- 11 files changed, 32 insertions(+), 29 deletions(-) diff --git a/apis/netacl/v1beta1/zz_acl_types.go b/apis/netacl/v1beta1/zz_acl_types.go index 713cfd23..f134d815 100755 --- a/apis/netacl/v1beta1/zz_acl_types.go +++ b/apis/netacl/v1beta1/zz_acl_types.go @@ -75,17 +75,17 @@ type ACLParameters struct { // References to VPCSubnet in vpc to populate subnets. // +kubebuilder:validation:Optional - SubnetIDRefs []v1.Reference `json:"subnetIdRefs,omitempty" tf:"-"` + SubnetRefs []v1.Reference `json:"subnetRefs,omitempty" tf:"-"` // Selector for a list of VPCSubnet in vpc to populate subnets. // +kubebuilder:validation:Optional - SubnetIDSelector *v1.Selector `json:"subnetIdSelector,omitempty" tf:"-"` + SubnetSelector *v1.Selector `json:"subnetSelector,omitempty" tf:"-"` // A list of the IDs of networks associated with the network ACL. // +crossplane:generate:reference:type=github.com/FrangipaneTeam/provider-flexibleengine/apis/vpc/v1beta1.VPCSubnet // +crossplane:generate:reference:extractor=github.com/FrangipaneTeam/provider-flexibleengine/pkg/tools.ExtractorParamPathfunc(true, "id") - // +crossplane:generate:reference:refFieldName=SubnetIDRefs - // +crossplane:generate:reference:selectorFieldName=SubnetIDSelector + // +crossplane:generate:reference:refFieldName=SubnetRefs + // +crossplane:generate:reference:selectorFieldName=SubnetSelector // +kubebuilder:validation:Optional Subnets []*string `json:"subnets,omitempty" tf:"subnets,omitempty"` } diff --git a/apis/netacl/v1beta1/zz_generated.deepcopy.go b/apis/netacl/v1beta1/zz_generated.deepcopy.go index f4f3684e..58272d12 100644 --- a/apis/netacl/v1beta1/zz_generated.deepcopy.go +++ b/apis/netacl/v1beta1/zz_generated.deepcopy.go @@ -178,15 +178,15 @@ func (in *ACLParameters) DeepCopyInto(out *ACLParameters) { } } } - if in.SubnetIDRefs != nil { - in, out := &in.SubnetIDRefs, &out.SubnetIDRefs + if in.SubnetRefs != nil { + in, out := &in.SubnetRefs, &out.SubnetRefs *out = make([]v1.Reference, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.SubnetIDSelector != nil { - in, out := &in.SubnetIDSelector, &out.SubnetIDSelector + if in.SubnetSelector != nil { + in, out := &in.SubnetSelector, &out.SubnetSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } diff --git a/apis/netacl/v1beta1/zz_generated.resolvers.go b/apis/netacl/v1beta1/zz_generated.resolvers.go index f82a706c..59f3aab5 100644 --- a/apis/netacl/v1beta1/zz_generated.resolvers.go +++ b/apis/netacl/v1beta1/zz_generated.resolvers.go @@ -56,8 +56,8 @@ func (mg *ACL) ResolveReferences(ctx context.Context, c client.Reader) error { mrsp, err = r.ResolveMultiple(ctx, reference.MultiResolutionRequest{ CurrentValues: reference.FromPtrValues(mg.Spec.ForProvider.Subnets), Extract: tools.ExtractorParamPathfunc(true, "id"), - References: mg.Spec.ForProvider.SubnetIDRefs, - Selector: mg.Spec.ForProvider.SubnetIDSelector, + References: mg.Spec.ForProvider.SubnetRefs, + Selector: mg.Spec.ForProvider.SubnetSelector, To: reference.To{ List: &v1beta1.VPCSubnetList{}, Managed: &v1beta1.VPCSubnet{}, @@ -67,7 +67,7 @@ func (mg *ACL) ResolveReferences(ctx context.Context, c client.Reader) error { return errors.Wrap(err, "mg.Spec.ForProvider.Subnets") } mg.Spec.ForProvider.Subnets = reference.ToPtrValues(mrsp.ResolvedValues) - mg.Spec.ForProvider.SubnetIDRefs = mrsp.ResolvedReferences + mg.Spec.ForProvider.SubnetRefs = mrsp.ResolvedReferences return nil } diff --git a/apis/vpc/v1beta1/zz_generated.deepcopy.go b/apis/vpc/v1beta1/zz_generated.deepcopy.go index 7f75a6db..1309a3a9 100644 --- a/apis/vpc/v1beta1/zz_generated.deepcopy.go +++ b/apis/vpc/v1beta1/zz_generated.deepcopy.go @@ -1003,15 +1003,15 @@ func (in *RouteTableParameters) DeepCopyInto(out *RouteTableParameters) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.SubnetIDRefs != nil { - in, out := &in.SubnetIDRefs, &out.SubnetIDRefs + if in.SubnetRefs != nil { + in, out := &in.SubnetRefs, &out.SubnetRefs *out = make([]v1.Reference, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.SubnetIDSelector != nil { - in, out := &in.SubnetIDSelector, &out.SubnetIDSelector + if in.SubnetSelector != nil { + in, out := &in.SubnetSelector, &out.SubnetSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } diff --git a/apis/vpc/v1beta1/zz_generated.resolvers.go b/apis/vpc/v1beta1/zz_generated.resolvers.go index 922e50a8..2312c0ae 100644 --- a/apis/vpc/v1beta1/zz_generated.resolvers.go +++ b/apis/vpc/v1beta1/zz_generated.resolvers.go @@ -212,8 +212,8 @@ func (mg *RouteTable) ResolveReferences(ctx context.Context, c client.Reader) er mrsp, err = r.ResolveMultiple(ctx, reference.MultiResolutionRequest{ CurrentValues: reference.FromPtrValues(mg.Spec.ForProvider.Subnets), Extract: tools.ExtractorParamPathfunc(true, "id"), - References: mg.Spec.ForProvider.SubnetIDRefs, - Selector: mg.Spec.ForProvider.SubnetIDSelector, + References: mg.Spec.ForProvider.SubnetRefs, + Selector: mg.Spec.ForProvider.SubnetSelector, To: reference.To{ List: &VPCSubnetList{}, Managed: &VPCSubnet{}, @@ -223,7 +223,7 @@ func (mg *RouteTable) ResolveReferences(ctx context.Context, c client.Reader) er return errors.Wrap(err, "mg.Spec.ForProvider.Subnets") } mg.Spec.ForProvider.Subnets = reference.ToPtrValues(mrsp.ResolvedValues) - mg.Spec.ForProvider.SubnetIDRefs = mrsp.ResolvedReferences + mg.Spec.ForProvider.SubnetRefs = mrsp.ResolvedReferences rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), diff --git a/apis/vpc/v1beta1/zz_routetable_types.go b/apis/vpc/v1beta1/zz_routetable_types.go index 1a90f989..d10e5838 100755 --- a/apis/vpc/v1beta1/zz_routetable_types.go +++ b/apis/vpc/v1beta1/zz_routetable_types.go @@ -43,17 +43,17 @@ type RouteTableParameters struct { // References to VPCSubnet in vpc to populate subnets. // +kubebuilder:validation:Optional - SubnetIDRefs []v1.Reference `json:"subnetIdRefs,omitempty" tf:"-"` + SubnetRefs []v1.Reference `json:"subnetRefs,omitempty" tf:"-"` // Selector for a list of VPCSubnet in vpc to populate subnets. // +kubebuilder:validation:Optional - SubnetIDSelector *v1.Selector `json:"subnetIdSelector,omitempty" tf:"-"` + SubnetSelector *v1.Selector `json:"subnetSelector,omitempty" tf:"-"` // Specifies an array of one or more subnets associating with the route table. // +crossplane:generate:reference:type=github.com/FrangipaneTeam/provider-flexibleengine/apis/vpc/v1beta1.VPCSubnet // +crossplane:generate:reference:extractor=github.com/FrangipaneTeam/provider-flexibleengine/pkg/tools.ExtractorParamPathfunc(true, "id") - // +crossplane:generate:reference:refFieldName=SubnetIDRefs - // +crossplane:generate:reference:selectorFieldName=SubnetIDSelector + // +crossplane:generate:reference:refFieldName=SubnetRefs + // +crossplane:generate:reference:selectorFieldName=SubnetSelector // +kubebuilder:validation:Optional Subnets []*string `json:"subnets,omitempty" tf:"subnets,omitempty"` diff --git a/config/overrides.go b/config/overrides.go index 65856f95..d8d5e425 100644 --- 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 index b8db768a..378e83e6 100644 --- 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 index 512c4325..af02b4fe 100644 --- 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 index 83d5385b..4b25b550 100644 --- 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 index 10aa66cf..742d64e1 100644 --- 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: