diff --git a/apis/ec2/v1alpha2/zz_generated.deepcopy.go b/apis/ec2/v1alpha2/zz_generated.deepcopy.go index d2be3a7b6..a3ecab77c 100644 --- a/apis/ec2/v1alpha2/zz_generated.deepcopy.go +++ b/apis/ec2/v1alpha2/zz_generated.deepcopy.go @@ -4061,13 +4061,13 @@ func (in *RouteTableParameters) DeepCopyInto(out *RouteTableParameters) { *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } @@ -4418,13 +4418,13 @@ func (in *SecurityGroupParameters) DeepCopyInto(out *SecurityGroupParameters) { *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } @@ -4927,13 +4927,13 @@ func (in *SubnetParameters) DeepCopyInto(out *SubnetParameters) { *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } @@ -6380,13 +6380,13 @@ func (in *TransitGatewayVPCAttachmentParameters) DeepCopyInto(out *TransitGatewa *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } @@ -6727,13 +6727,13 @@ func (in *VPCEndpointParameters) DeepCopyInto(out *VPCEndpointParameters) { *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } @@ -6880,13 +6880,13 @@ func (in *VPCIPv4CidrBlockAssociationParameters) DeepCopyInto(out *VPCIPv4CidrBl *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } @@ -7289,13 +7289,13 @@ func (in *VPCPeeringConnectionParameters) DeepCopyInto(out *VPCPeeringConnection *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } diff --git a/apis/ec2/v1alpha2/zz_generated.resolvers.go b/apis/ec2/v1alpha2/zz_generated.resolvers.go index 244fddb6d..cbfc3f53a 100644 --- a/apis/ec2/v1alpha2/zz_generated.resolvers.go +++ b/apis/ec2/v1alpha2/zz_generated.resolvers.go @@ -610,8 +610,8 @@ func (mg *RouteTable) ResolveReferences(ctx context.Context, c client.Reader) er rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &VPCList{}, Managed: &VPC{}, @@ -621,7 +621,7 @@ func (mg *RouteTable) ResolveReferences(ctx context.Context, c client.Reader) er return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } @@ -715,8 +715,8 @@ func (mg *SecurityGroup) ResolveReferences(ctx context.Context, c client.Reader) rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &VPCList{}, Managed: &VPC{}, @@ -726,7 +726,7 @@ func (mg *SecurityGroup) ResolveReferences(ctx context.Context, c client.Reader) return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } @@ -767,8 +767,8 @@ func (mg *Subnet) ResolveReferences(ctx context.Context, c client.Reader) error rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &VPCList{}, Managed: &VPC{}, @@ -778,7 +778,7 @@ func (mg *Subnet) ResolveReferences(ctx context.Context, c client.Reader) error return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } @@ -978,8 +978,8 @@ func (mg *TransitGatewayVPCAttachment) ResolveReferences(ctx context.Context, c rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &VPCList{}, Managed: &VPC{}, @@ -989,7 +989,7 @@ func (mg *TransitGatewayVPCAttachment) ResolveReferences(ctx context.Context, c return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } @@ -1079,8 +1079,8 @@ func (mg *VPCEndpoint) ResolveReferences(ctx context.Context, c client.Reader) e rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &VPCList{}, Managed: &VPC{}, @@ -1090,7 +1090,7 @@ func (mg *VPCEndpoint) ResolveReferences(ctx context.Context, c client.Reader) e return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } @@ -1105,8 +1105,8 @@ func (mg *VPCIPv4CidrBlockAssociation) ResolveReferences(ctx context.Context, c rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &VPCList{}, Managed: &VPC{}, @@ -1116,7 +1116,7 @@ func (mg *VPCIPv4CidrBlockAssociation) ResolveReferences(ctx context.Context, c return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } @@ -1147,8 +1147,8 @@ func (mg *VPCPeeringConnection) ResolveReferences(ctx context.Context, c client. rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &VPCList{}, Managed: &VPC{}, @@ -1158,7 +1158,7 @@ func (mg *VPCPeeringConnection) ResolveReferences(ctx context.Context, c client. return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } diff --git a/apis/ec2/v1alpha2/zz_routetable_types.go b/apis/ec2/v1alpha2/zz_routetable_types.go index 74b1cae01..a7b7f22a0 100755 --- a/apis/ec2/v1alpha2/zz_routetable_types.go +++ b/apis/ec2/v1alpha2/zz_routetable_types.go @@ -52,14 +52,16 @@ type RouteTableParameters struct { Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` // +crossplane:generate:reference:type=VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } type RouteTableRouteObservation struct { diff --git a/apis/ec2/v1alpha2/zz_securitygroup_types.go b/apis/ec2/v1alpha2/zz_securitygroup_types.go index dbaf3f35b..ff0ae7a38 100755 --- a/apis/ec2/v1alpha2/zz_securitygroup_types.go +++ b/apis/ec2/v1alpha2/zz_securitygroup_types.go @@ -148,14 +148,16 @@ type SecurityGroupParameters struct { Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` // +crossplane:generate:reference:type=VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // SecurityGroupSpec defines the desired state of SecurityGroup diff --git a/apis/ec2/v1alpha2/zz_subnet_types.go b/apis/ec2/v1alpha2/zz_subnet_types.go index c833be0b1..3b58acaa2 100755 --- a/apis/ec2/v1alpha2/zz_subnet_types.go +++ b/apis/ec2/v1alpha2/zz_subnet_types.go @@ -75,14 +75,16 @@ type SubnetParameters struct { Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` // +crossplane:generate:reference:type=VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // SubnetSpec defines the desired state of Subnet diff --git a/apis/ec2/v1alpha2/zz_transitgatewayvpcattachment_types.go b/apis/ec2/v1alpha2/zz_transitgatewayvpcattachment_types.go index 182090d63..2147c3a9e 100755 --- a/apis/ec2/v1alpha2/zz_transitgatewayvpcattachment_types.go +++ b/apis/ec2/v1alpha2/zz_transitgatewayvpcattachment_types.go @@ -81,14 +81,16 @@ type TransitGatewayVPCAttachmentParameters struct { TransitGatewayIDSelector *v1.Selector `json:"transitGatewayIdSelector,omitempty" tf:"-"` // +crossplane:generate:reference:type=VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // TransitGatewayVPCAttachmentSpec defines the desired state of TransitGatewayVPCAttachment diff --git a/apis/ec2/v1alpha2/zz_vpcendpoint_types.go b/apis/ec2/v1alpha2/zz_vpcendpoint_types.go index 96c290317..585177ded 100755 --- a/apis/ec2/v1alpha2/zz_vpcendpoint_types.go +++ b/apis/ec2/v1alpha2/zz_vpcendpoint_types.go @@ -118,14 +118,16 @@ type VPCEndpointParameters struct { VPCEndpointType *string `json:"vpcEndpointType,omitempty" tf:"vpc_endpoint_type,omitempty"` // +crossplane:generate:reference:type=VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // VPCEndpointSpec defines the desired state of VPCEndpoint diff --git a/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go b/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go index f0f775ab9..c62b5e088 100755 --- a/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go +++ b/apis/ec2/v1alpha2/zz_vpcipv4cidrblockassociation_types.go @@ -40,14 +40,16 @@ type VPCIPv4CidrBlockAssociationParameters struct { Region *string `json:"region" tf:"-"` // +crossplane:generate:reference:type=VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // VPCIPv4CidrBlockAssociationSpec defines the desired state of VPCIPv4CidrBlockAssociation diff --git a/apis/ec2/v1alpha2/zz_vpcpeeringconnection_types.go b/apis/ec2/v1alpha2/zz_vpcpeeringconnection_types.go index 9270a12c5..0af7c5443 100755 --- a/apis/ec2/v1alpha2/zz_vpcpeeringconnection_types.go +++ b/apis/ec2/v1alpha2/zz_vpcpeeringconnection_types.go @@ -99,14 +99,16 @@ type VPCPeeringConnectionParameters struct { Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` // +crossplane:generate:reference:type=VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // VPCPeeringConnectionSpec defines the desired state of VPCPeeringConnection diff --git a/apis/elbv2/v1alpha2/zz_generated.deepcopy.go b/apis/elbv2/v1alpha2/zz_generated.deepcopy.go index fbc9f5598..5a4ff9622 100644 --- a/apis/elbv2/v1alpha2/zz_generated.deepcopy.go +++ b/apis/elbv2/v1alpha2/zz_generated.deepcopy.go @@ -1378,13 +1378,13 @@ func (in *LBTargetGroupParameters) DeepCopyInto(out *LBTargetGroupParameters) { *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } diff --git a/apis/elbv2/v1alpha2/zz_generated.resolvers.go b/apis/elbv2/v1alpha2/zz_generated.resolvers.go index e01b74228..e00cabd38 100644 --- a/apis/elbv2/v1alpha2/zz_generated.resolvers.go +++ b/apis/elbv2/v1alpha2/zz_generated.resolvers.go @@ -181,8 +181,8 @@ func (mg *LBTargetGroup) ResolveReferences(ctx context.Context, c client.Reader) rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &v1alpha21.VPCList{}, Managed: &v1alpha21.VPC{}, @@ -192,7 +192,7 @@ func (mg *LBTargetGroup) ResolveReferences(ctx context.Context, c client.Reader) return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } diff --git a/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go b/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go index e43513cd4..e6e673d8b 100755 --- a/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go +++ b/apis/elbv2/v1alpha2/zz_lbtargetgroup_types.go @@ -118,14 +118,16 @@ type LBTargetGroupParameters struct { TargetType *string `json:"targetType,omitempty" tf:"target_type,omitempty"` // +crossplane:generate:reference:type=github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } type LBTargetGroupStickinessObservation struct { diff --git a/apis/route53/v1alpha2/zz_generated.deepcopy.go b/apis/route53/v1alpha2/zz_generated.deepcopy.go index ff70f1641..888a99c27 100644 --- a/apis/route53/v1alpha2/zz_generated.deepcopy.go +++ b/apis/route53/v1alpha2/zz_generated.deepcopy.go @@ -1459,21 +1459,21 @@ func (in *VPCAssociationAuthorizationParameters) DeepCopyInto(out *VPCAssociatio *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VPCRegion != nil { + in, out := &in.VPCRegion, &out.VPCRegion + *out = new(string) + **out = **in + } + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } - if in.VPCRegion != nil { - in, out := &in.VPCRegion, &out.VPCRegion - *out = new(string) - **out = **in - } if in.ZoneID != nil { in, out := &in.ZoneID, &out.ZoneID *out = new(string) @@ -1558,21 +1558,21 @@ func (in *VPCParameters) DeepCopyInto(out *VPCParameters) { *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VPCRegion != nil { + in, out := &in.VPCRegion, &out.VPCRegion + *out = new(string) + **out = **in + } + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } - if in.VPCRegion != nil { - in, out := &in.VPCRegion, &out.VPCRegion - *out = new(string) - **out = **in - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCParameters. @@ -1744,21 +1744,21 @@ func (in *ZoneAssociationParameters) DeepCopyInto(out *ZoneAssociationParameters *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VPCRegion != nil { + in, out := &in.VPCRegion, &out.VPCRegion + *out = new(string) + **out = **in + } + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } - if in.VPCRegion != nil { - in, out := &in.VPCRegion, &out.VPCRegion - *out = new(string) - **out = **in - } if in.ZoneID != nil { in, out := &in.ZoneID, &out.ZoneID *out = new(string) diff --git a/apis/route53/v1alpha2/zz_generated.resolvers.go b/apis/route53/v1alpha2/zz_generated.resolvers.go index 2264eed10..cf02e7772 100644 --- a/apis/route53/v1alpha2/zz_generated.resolvers.go +++ b/apis/route53/v1alpha2/zz_generated.resolvers.go @@ -146,8 +146,8 @@ func (mg *VPCAssociationAuthorization) ResolveReferences(ctx context.Context, c rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &v1alpha21.VPCList{}, Managed: &v1alpha21.VPC{}, @@ -157,7 +157,7 @@ func (mg *VPCAssociationAuthorization) ResolveReferences(ctx context.Context, c return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.ZoneID), @@ -205,8 +205,8 @@ func (mg *Zone) ResolveReferences(ctx context.Context, c client.Reader) error { rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPC[i3].VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPC[i3].VPCIDRef, - Selector: mg.Spec.ForProvider.VPC[i3].VPCIDSelector, + Reference: mg.Spec.ForProvider.VPC[i3].VpcIdRef, + Selector: mg.Spec.ForProvider.VPC[i3].VpcIdSelector, To: reference.To{ List: &v1alpha21.VPCList{}, Managed: &v1alpha21.VPC{}, @@ -216,7 +216,7 @@ func (mg *Zone) ResolveReferences(ctx context.Context, c client.Reader) error { return errors.Wrap(err, "mg.Spec.ForProvider.VPC[i3].VPCID") } mg.Spec.ForProvider.VPC[i3].VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPC[i3].VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VPC[i3].VpcIdRef = rsp.ResolvedReference } @@ -233,8 +233,8 @@ func (mg *ZoneAssociation) ResolveReferences(ctx context.Context, c client.Reade rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &v1alpha21.VPCList{}, Managed: &v1alpha21.VPC{}, @@ -244,7 +244,7 @@ func (mg *ZoneAssociation) ResolveReferences(ctx context.Context, c client.Reade return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.ZoneID), diff --git a/apis/route53/v1alpha2/zz_vpcassociationauthorization_types.go b/apis/route53/v1alpha2/zz_vpcassociationauthorization_types.go index 771d86c11..3122bdd97 100755 --- a/apis/route53/v1alpha2/zz_vpcassociationauthorization_types.go +++ b/apis/route53/v1alpha2/zz_vpcassociationauthorization_types.go @@ -37,17 +37,19 @@ type VPCAssociationAuthorizationParameters struct { Region *string `json:"region" tf:"-"` // +crossplane:generate:reference:type=github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VPCRegion *string `json:"vpcRegion,omitempty" tf:"vpc_region,omitempty"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCRegion *string `json:"vpcRegion,omitempty" tf:"vpc_region,omitempty"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` // +crossplane:generate:reference:type=Zone // +kubebuilder:validation:Optional diff --git a/apis/route53/v1alpha2/zz_zone_types.go b/apis/route53/v1alpha2/zz_zone_types.go index 2de4e632b..543361ce5 100755 --- a/apis/route53/v1alpha2/zz_zone_types.go +++ b/apis/route53/v1alpha2/zz_zone_types.go @@ -31,17 +31,19 @@ type VPCObservation struct { type VPCParameters struct { // +crossplane:generate:reference:type=github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VPCRegion *string `json:"vpcRegion,omitempty" tf:"vpc_region,omitempty"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCRegion *string `json:"vpcRegion,omitempty" tf:"vpc_region,omitempty"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } type ZoneObservation struct { diff --git a/apis/route53/v1alpha2/zz_zoneassociation_types.go b/apis/route53/v1alpha2/zz_zoneassociation_types.go index 42b7fb502..e0f358798 100755 --- a/apis/route53/v1alpha2/zz_zoneassociation_types.go +++ b/apis/route53/v1alpha2/zz_zoneassociation_types.go @@ -39,17 +39,19 @@ type ZoneAssociationParameters struct { Region *string `json:"region" tf:"-"` // +crossplane:generate:reference:type=github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VPCRegion *string `json:"vpcRegion,omitempty" tf:"vpc_region,omitempty"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCRegion *string `json:"vpcRegion,omitempty" tf:"vpc_region,omitempty"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` // +crossplane:generate:reference:type=Zone // +kubebuilder:validation:Optional diff --git a/apis/route53resolver/v1alpha1/zz_firewallrulegroupassociation_types.go b/apis/route53resolver/v1alpha1/zz_firewallrulegroupassociation_types.go index 2b5028b66..99f0f0126 100755 --- a/apis/route53resolver/v1alpha1/zz_firewallrulegroupassociation_types.go +++ b/apis/route53resolver/v1alpha1/zz_firewallrulegroupassociation_types.go @@ -56,14 +56,16 @@ type FirewallRuleGroupAssociationParameters struct { Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` // +crossplane:generate:reference:type=github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // FirewallRuleGroupAssociationSpec defines the desired state of FirewallRuleGroupAssociation diff --git a/apis/route53resolver/v1alpha1/zz_generated.deepcopy.go b/apis/route53resolver/v1alpha1/zz_generated.deepcopy.go index b96ee9112..c61db7a54 100644 --- a/apis/route53resolver/v1alpha1/zz_generated.deepcopy.go +++ b/apis/route53resolver/v1alpha1/zz_generated.deepcopy.go @@ -922,13 +922,13 @@ func (in *FirewallRuleGroupAssociationParameters) DeepCopyInto(out *FirewallRule *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } @@ -1790,13 +1790,13 @@ func (in *RuleAssociationParameters) DeepCopyInto(out *RuleAssociationParameters *out = new(string) **out = **in } - if in.VPCIDRef != nil { - in, out := &in.VPCIDRef, &out.VPCIDRef + if in.VpcIdRef != nil { + in, out := &in.VpcIdRef, &out.VpcIdRef *out = new(v1.Reference) **out = **in } - if in.VPCIDSelector != nil { - in, out := &in.VPCIDSelector, &out.VPCIDSelector + if in.VpcIdSelector != nil { + in, out := &in.VpcIdSelector, &out.VpcIdSelector *out = new(v1.Selector) (*in).DeepCopyInto(*out) } diff --git a/apis/route53resolver/v1alpha1/zz_generated.resolvers.go b/apis/route53resolver/v1alpha1/zz_generated.resolvers.go index 7545edda1..528e79a41 100644 --- a/apis/route53resolver/v1alpha1/zz_generated.resolvers.go +++ b/apis/route53resolver/v1alpha1/zz_generated.resolvers.go @@ -61,8 +61,8 @@ func (mg *FirewallRuleGroupAssociation) ResolveReferences(ctx context.Context, c rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &v1alpha2.VPCList{}, Managed: &v1alpha2.VPC{}, @@ -72,7 +72,7 @@ func (mg *FirewallRuleGroupAssociation) ResolveReferences(ctx context.Context, c return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } @@ -87,8 +87,8 @@ func (mg *RuleAssociation) ResolveReferences(ctx context.Context, c client.Reade rsp, err = r.Resolve(ctx, reference.ResolutionRequest{ CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.VPCID), Extract: reference.ExternalName(), - Reference: mg.Spec.ForProvider.VPCIDRef, - Selector: mg.Spec.ForProvider.VPCIDSelector, + Reference: mg.Spec.ForProvider.VpcIdRef, + Selector: mg.Spec.ForProvider.VpcIdSelector, To: reference.To{ List: &v1alpha2.VPCList{}, Managed: &v1alpha2.VPC{}, @@ -98,7 +98,7 @@ func (mg *RuleAssociation) ResolveReferences(ctx context.Context, c client.Reade return errors.Wrap(err, "mg.Spec.ForProvider.VPCID") } mg.Spec.ForProvider.VPCID = reference.ToPtrValue(rsp.ResolvedValue) - mg.Spec.ForProvider.VPCIDRef = rsp.ResolvedReference + mg.Spec.ForProvider.VpcIdRef = rsp.ResolvedReference return nil } diff --git a/apis/route53resolver/v1alpha1/zz_ruleassociation_types.go b/apis/route53resolver/v1alpha1/zz_ruleassociation_types.go index e4d2a981c..44a6e33a8 100755 --- a/apis/route53resolver/v1alpha1/zz_ruleassociation_types.go +++ b/apis/route53resolver/v1alpha1/zz_ruleassociation_types.go @@ -43,14 +43,16 @@ type RuleAssociationParameters struct { ResolverRuleID *string `json:"resolverRuleId" tf:"resolver_rule_id,omitempty"` // +crossplane:generate:reference:type=github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC + // +crossplane:generate:reference:refFieldName=VpcIdRef + // +crossplane:generate:reference:selectorFieldName=VpcIdSelector // +kubebuilder:validation:Optional VPCID *string `json:"vpcId,omitempty" tf:"vpc_id,omitempty"` // +kubebuilder:validation:Optional - VPCIDRef *v1.Reference `json:"vpcidRef,omitempty" tf:"-"` + VpcIdRef *v1.Reference `json:"vpcIdRef,omitempty" tf:"-"` // +kubebuilder:validation:Optional - VPCIDSelector *v1.Selector `json:"vpcidSelector,omitempty" tf:"-"` + VpcIdSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"` } // RuleAssociationSpec defines the desired state of RuleAssociation diff --git a/config/ec2/config.go b/config/ec2/config.go index 909b4fcd8..d5f4cfb8b 100644 --- a/config/ec2/config.go +++ b/config/ec2/config.go @@ -64,13 +64,11 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_eip", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References = config.References{ - "instance": config.Reference{ - Type: "Instance", - }, - "network_interface": config.Reference{ - Type: "NetworkInterface", - }, + r.References["instance"] = config.Reference{ + Type: "Instance", + } + r.References["network_interface"] = config.Reference{ + Type: "NetworkInterface", } r.UseAsync = true }) @@ -121,9 +119,6 @@ func Configure(p *config.Provider) { r.References["transit_gateway_id"] = config.Reference{ Type: "TransitGateway", } - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } }) p.AddResourceConfigurator("aws_ec2_transit_gateway_vpc_attachment_accepter", func(r *config.Resource) { @@ -179,9 +174,6 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_vpc_endpoint", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } r.References["subnet_ids"] = config.Reference{ Type: "Subnet", RefFieldName: "SubnetIdRefs", @@ -202,9 +194,6 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_subnet", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } r.LateInitializer = config.LateInitializer{ // NOTE(muvaf): Conflicts with AvailabilityZone. See the following // for more details: https://github.com/crossplane/terrajet/issues/107 @@ -217,9 +206,6 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_network_interface", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } r.References["subnet_id"] = config.Reference{ Type: "Subnet", } @@ -241,9 +227,6 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_security_group", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } r.References["egress.security_groups"] = config.Reference{ Type: "SecurityGroup", RefFieldName: "SecurityGroupRefs", @@ -267,17 +250,11 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_vpc_ipv4_cidr_block_association", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } }) p.AddResourceConfigurator("aws_vpc_peering_connection", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } r.References["peer_vpc_id"] = config.Reference{ Type: "VPC", } @@ -310,10 +287,6 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_route_table", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } - r.References["route.vpc_peering_connection_id"] = config.Reference{ Type: "VPCPeeringConnection", } @@ -342,9 +315,6 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_main_route_table_association", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References["vpc_id"] = config.Reference{ - Type: "VPC", - } r.References["route_table_id"] = config.Reference{ Type: "RouteTable", } diff --git a/config/elasticloadbalancing/config.go b/config/elasticloadbalancing/config.go index 80c4c83af..877bbcabb 100644 --- a/config/elasticloadbalancing/config.go +++ b/config/elasticloadbalancing/config.go @@ -69,11 +69,6 @@ func Configure(p *config.Provider) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider r.ExternalName.OmittedFields = append(r.ExternalName.OmittedFields, "name_prefix") - r.References = config.References{ - "vpc_id": { - Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC", - }, - } if s, ok := r.TerraformResource.Schema["name"]; ok { s.Optional = false s.ForceNew = true diff --git a/config/overrides.go b/config/overrides.go index e43e6ac62..bbe1d1232 100644 --- a/config/overrides.go +++ b/config/overrides.go @@ -390,21 +390,25 @@ func KnownReferencers() tjconfig.ResourceOption { //nolint:gocyclo switch k { case "vpc_id": r.References["vpc_id"] = tjconfig.Reference{ - Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC", + Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC", + RefFieldName: "VpcIdRef", + SelectorFieldName: "VpcIdSelector", } if r.ShortGroup == "ec2" { // TODO(muvaf): Angryjet should work with the full type path // even when it's its own type, but it doesn't for some // reason and this is a workaround. r.References["vpc_id"] = tjconfig.Reference{ - Type: "VPC", + Type: "VPC", + RefFieldName: "VpcIdRef", + SelectorFieldName: "VpcIdSelector", } } case "subnet_ids": r.References["subnet_ids"] = tjconfig.Reference{ Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.Subnet", - RefFieldName: "SubnetIDRefs", - SelectorFieldName: "SubnetIDSelector", + RefFieldName: "SubnetIdRefs", + SelectorFieldName: "SubnetIdSelector", } if r.ShortGroup == "ec2" { // TODO(muvaf): Angryjet should work with the full type path @@ -412,8 +416,8 @@ func KnownReferencers() tjconfig.ResourceOption { //nolint:gocyclo // reason and this is a workaround. r.References["subnet_ids"] = tjconfig.Reference{ Type: "Subnet", - RefFieldName: "SubnetIDRefs", - SelectorFieldName: "SubnetIDSelector", + RefFieldName: "SubnetIdRefs", + SelectorFieldName: "SubnetIdSelector", } } case "subnet_id": diff --git a/config/route53/config.go b/config/route53/config.go index 80c52c570..5f776f798 100644 --- a/config/route53/config.go +++ b/config/route53/config.go @@ -37,44 +37,36 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("aws_route53_hosted_zone_dnssec", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References = config.References{ - "hosted_zone_id": config.Reference{ - Type: "Zone", - }, + r.References["hosted_zone_id"] = config.Reference{ + Type: "Zone", } }) p.AddResourceConfigurator("aws_route53_key_signing_key", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References = config.References{ - "hosted_zone_id": config.Reference{ - Type: "Zone", - }, - "key_management_service_arn": config.Reference{ - Type: "github.com/crossplane-contrib/provider-jet-aws/apis/kms/v1alpha2.Key", - Extractor: "github.com/crossplane-contrib/provider-jet-aws/apis/kms/v1alpha2.KMSKeyARN()", - }, + r.References["hosted_zone_id"] = config.Reference{ + Type: "Zone", + } + r.References["key_management_service_arn"] = config.Reference{ + Type: "github.com/crossplane-contrib/provider-jet-aws/apis/kms/v1alpha2.Key", + Extractor: "github.com/crossplane-contrib/provider-jet-aws/apis/kms/v1alpha2.KMSKeyARN()", } }) p.AddResourceConfigurator("aws_route53_query_log", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References = config.References{ - "hosted_zone_id": config.Reference{ - Type: "Zone", - }, + r.References["hosted_zone_id"] = config.Reference{ + Type: "Zone", } }) p.AddResourceConfigurator("aws_route53_record", func(r *config.Resource) { r.Version = common.VersionV1Alpha2 r.ExternalName = config.IdentifierFromProvider - r.References = config.References{ - "zone_id": config.Reference{ - Type: "Zone", - }, - "health_check_id": config.Reference{ - Type: "HealthCheck", - }, + r.References["zone_id"] = config.Reference{ + Type: "Zone", + } + r.References["health_check_id"] = config.Reference{ + Type: "HealthCheck", } }) p.AddResourceConfigurator("aws_route53_vpc_association_authorization", func(r *config.Resource) { @@ -88,13 +80,8 @@ func Configure(p *config.Provider) { base["zone_id"] = words[0] base["vpc_id"] = words[1] } - r.References = config.References{ - "zone_id": config.Reference{ - Type: "Zone", - }, - "vpc_id": config.Reference{ - Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC", - }, + r.References["zone_id"] = config.Reference{ + Type: "Zone", } }) p.AddResourceConfigurator("aws_route53_zone", func(r *config.Resource) { @@ -105,7 +92,9 @@ func Configure(p *config.Provider) { Type: "DelegationSet", }, "vpc.vpc_id": config.Reference{ - Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC", + Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC", + RefFieldName: "VpcIdRef", + SelectorFieldName: "VpcIdSelector", }, } }) @@ -124,13 +113,8 @@ func Configure(p *config.Provider) { base["vpc_region"] = words[2] } } - r.References = config.References{ - "zone_id": config.Reference{ - Type: "Zone", - }, - "vpc_id": config.Reference{ - Type: "github.com/crossplane-contrib/provider-jet-aws/apis/ec2/v1alpha2.VPC", - }, + r.References["zone_id"] = config.Reference{ + Type: "Zone", } }) } diff --git a/package/crds/ec2.aws.jet.crossplane.io_routetables.yaml b/package/crds/ec2.aws.jet.crossplane.io_routetables.yaml index a462803a9..7f892599c 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_routetables.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_routetables.yaml @@ -203,7 +203,7 @@ spec: type: object vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -212,7 +212,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_securitygroups.yaml b/package/crds/ec2.aws.jet.crossplane.io_securitygroups.yaml index b5230a634..81cb6b26b 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_securitygroups.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_securitygroups.yaml @@ -206,7 +206,7 @@ spec: type: object vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -215,7 +215,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml b/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml index b5d670d28..070fc7466 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_subnets.yaml @@ -90,7 +90,7 @@ spec: type: object vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -99,7 +99,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_transitgatewayvpcattachments.yaml b/package/crds/ec2.aws.jet.crossplane.io_transitgatewayvpcattachments.yaml index f86d9c019..af87534d9 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_transitgatewayvpcattachments.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_transitgatewayvpcattachments.yaml @@ -138,7 +138,7 @@ spec: type: object vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -147,7 +147,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_vpcendpoints.yaml b/package/crds/ec2.aws.jet.crossplane.io_vpcendpoints.yaml index 399a9808a..01009c4a5 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_vpcendpoints.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_vpcendpoints.yaml @@ -169,7 +169,7 @@ spec: type: string vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -178,7 +178,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml b/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml index 52c9c70d6..6c6537058 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_vpcipv4cidrblockassociations.yaml @@ -72,7 +72,7 @@ spec: type: string vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -81,7 +81,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/ec2.aws.jet.crossplane.io_vpcpeeringconnections.yaml b/package/crds/ec2.aws.jet.crossplane.io_vpcpeeringconnections.yaml index d034e5d74..5a922ce66 100644 --- a/package/crds/ec2.aws.jet.crossplane.io_vpcpeeringconnections.yaml +++ b/package/crds/ec2.aws.jet.crossplane.io_vpcpeeringconnections.yaml @@ -126,7 +126,7 @@ spec: type: object vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -135,7 +135,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml b/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml index 705a9253e..7d57e7e61 100644 --- a/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml +++ b/package/crds/elbv2.aws.jet.crossplane.io_lbtargetgroups.yaml @@ -140,7 +140,7 @@ spec: type: string vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -149,7 +149,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/route53.aws.jet.crossplane.io_vpcassociationauthorizations.yaml b/package/crds/route53.aws.jet.crossplane.io_vpcassociationauthorizations.yaml index 2c50d46e7..cbcf83cad 100644 --- a/package/crds/route53.aws.jet.crossplane.io_vpcassociationauthorizations.yaml +++ b/package/crds/route53.aws.jet.crossplane.io_vpcassociationauthorizations.yaml @@ -70,9 +70,7 @@ spec: type: string vpcId: type: string - vpcRegion: - type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -81,7 +79,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: @@ -95,6 +93,8 @@ spec: is selected. type: object type: object + vpcRegion: + type: string zoneId: type: string zoneIdRef: diff --git a/package/crds/route53.aws.jet.crossplane.io_zoneassociations.yaml b/package/crds/route53.aws.jet.crossplane.io_zoneassociations.yaml index 28b679a38..ac0cdf67e 100644 --- a/package/crds/route53.aws.jet.crossplane.io_zoneassociations.yaml +++ b/package/crds/route53.aws.jet.crossplane.io_zoneassociations.yaml @@ -68,9 +68,7 @@ spec: type: string vpcId: type: string - vpcRegion: - type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -79,7 +77,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: @@ -93,6 +91,8 @@ spec: is selected. type: object type: object + vpcRegion: + type: string zoneId: type: string zoneIdRef: diff --git a/package/crds/route53.aws.jet.crossplane.io_zones.yaml b/package/crds/route53.aws.jet.crossplane.io_zones.yaml index d46c0f480..c5dd5ff12 100644 --- a/package/crds/route53.aws.jet.crossplane.io_zones.yaml +++ b/package/crds/route53.aws.jet.crossplane.io_zones.yaml @@ -106,9 +106,7 @@ spec: properties: vpcId: type: string - vpcRegion: - type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -117,7 +115,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: @@ -132,6 +130,8 @@ spec: labels is selected. type: object type: object + vpcRegion: + type: string type: object type: array required: diff --git a/package/crds/route53resolver.aws.jet.crossplane.io_firewallrulegroupassociations.yaml b/package/crds/route53resolver.aws.jet.crossplane.io_firewallrulegroupassociations.yaml index 4dabd69d9..cc770475d 100644 --- a/package/crds/route53resolver.aws.jet.crossplane.io_firewallrulegroupassociations.yaml +++ b/package/crds/route53resolver.aws.jet.crossplane.io_firewallrulegroupassociations.yaml @@ -83,7 +83,7 @@ spec: type: object vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -92,7 +92,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: diff --git a/package/crds/route53resolver.aws.jet.crossplane.io_ruleassociations.yaml b/package/crds/route53resolver.aws.jet.crossplane.io_ruleassociations.yaml index ec1146d23..2ba86ff70 100644 --- a/package/crds/route53resolver.aws.jet.crossplane.io_ruleassociations.yaml +++ b/package/crds/route53resolver.aws.jet.crossplane.io_ruleassociations.yaml @@ -72,7 +72,7 @@ spec: type: string vpcId: type: string - vpcidRef: + vpcIdRef: description: A Reference to a named object. properties: name: @@ -81,7 +81,7 @@ spec: required: - name type: object - vpcidSelector: + vpcIdSelector: description: A Selector selects an object. properties: matchControllerRef: