diff --git a/apis/aws.go b/apis/aws.go index 9e7902ce1c..d14463d8fb 100644 --- a/apis/aws.go +++ b/apis/aws.go @@ -28,7 +28,7 @@ import ( cloudfrontv1alpha1 "github.com/crossplane/provider-aws/apis/cloudfront/v1alpha1" databasev1beta1 "github.com/crossplane/provider-aws/apis/database/v1beta1" dynamodbv1alpha1 "github.com/crossplane/provider-aws/apis/dynamodb/v1alpha1" - ec2v1alpha1 "github.com/crossplane/provider-aws/apis/ec2/v1alpha1" + ec2manualv1alpha1 "github.com/crossplane/provider-aws/apis/ec2/manualv1alpha1" ec2v1beta1 "github.com/crossplane/provider-aws/apis/ec2/v1beta1" ecrv1alpha1 "github.com/crossplane/provider-aws/apis/ecr/v1alpha1" efsv1alpha1 "github.com/crossplane/provider-aws/apis/efs/v1alpha1" @@ -86,7 +86,7 @@ func init() { kmsv1alpha1.SchemeBuilder.AddToScheme, efsv1alpha1.SchemeBuilder.AddToScheme, rdsv1alpha1.SchemeBuilder.AddToScheme, - ec2v1alpha1.SchemeBuilder.AddToScheme, + ec2manualv1alpha1.SchemeBuilder.AddToScheme, lambdav1alpha1.SchemeBuilder.AddToScheme, cloudfrontv1alpha1.SchemeBuilder.AddToScheme, route53resolveralpha1.SchemeBuilder.AddToScheme, diff --git a/apis/ec2/v1alpha1/referencers.go b/apis/ec2/manualv1alpha1/referencers.go similarity index 98% rename from apis/ec2/v1alpha1/referencers.go rename to apis/ec2/manualv1alpha1/referencers.go index 3c6569ee7d..af7d857a62 100644 --- a/apis/ec2/v1alpha1/referencers.go +++ b/apis/ec2/manualv1alpha1/referencers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package manualv1alpha1 import ( "context" diff --git a/apis/ec2/v1alpha1/register.go b/apis/ec2/manualv1alpha1/register.go similarity index 98% rename from apis/ec2/v1alpha1/register.go rename to apis/ec2/manualv1alpha1/register.go index d7a4f160ca..fb82b6b023 100644 --- a/apis/ec2/v1alpha1/register.go +++ b/apis/ec2/manualv1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. // +groupName=ec2.aws.crossplane.io // +versionName=v1alpha1 -package v1alpha1 +package manualv1alpha1 import ( "reflect" diff --git a/apis/ec2/v1alpha1/vpccidrblock_types.go b/apis/ec2/manualv1alpha1/vpccidrblock_types.go similarity index 99% rename from apis/ec2/v1alpha1/vpccidrblock_types.go rename to apis/ec2/manualv1alpha1/vpccidrblock_types.go index f1d848f8e9..7db2db26e7 100644 --- a/apis/ec2/v1alpha1/vpccidrblock_types.go +++ b/apis/ec2/manualv1alpha1/vpccidrblock_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package manualv1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/apis/ec2/v1alpha1/zz_generated.deepcopy.go b/apis/ec2/manualv1alpha1/zz_generated.deepcopy.go similarity index 99% rename from apis/ec2/v1alpha1/zz_generated.deepcopy.go rename to apis/ec2/manualv1alpha1/zz_generated.deepcopy.go index 20b082b5da..17a5d01884 100644 --- a/apis/ec2/v1alpha1/zz_generated.deepcopy.go +++ b/apis/ec2/manualv1alpha1/zz_generated.deepcopy.go @@ -18,7 +18,7 @@ limitations under the License. // Code generated by controller-gen. DO NOT EDIT. -package v1alpha1 +package manualv1alpha1 import ( "github.com/crossplane/crossplane-runtime/apis/common/v1" diff --git a/apis/ec2/v1alpha1/zz_generated.managed.go b/apis/ec2/manualv1alpha1/zz_generated.managed.go similarity index 99% rename from apis/ec2/v1alpha1/zz_generated.managed.go rename to apis/ec2/manualv1alpha1/zz_generated.managed.go index cbc24743ee..b4e2dc2488 100644 --- a/apis/ec2/v1alpha1/zz_generated.managed.go +++ b/apis/ec2/manualv1alpha1/zz_generated.managed.go @@ -16,7 +16,7 @@ limitations under the License. // Code generated by angryjet. DO NOT EDIT. -package v1alpha1 +package manualv1alpha1 import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" diff --git a/apis/ec2/v1alpha1/zz_generated.managedlist.go b/apis/ec2/manualv1alpha1/zz_generated.managedlist.go similarity index 97% rename from apis/ec2/v1alpha1/zz_generated.managedlist.go rename to apis/ec2/manualv1alpha1/zz_generated.managedlist.go index ed6ddba310..d66af7077e 100644 --- a/apis/ec2/v1alpha1/zz_generated.managedlist.go +++ b/apis/ec2/manualv1alpha1/zz_generated.managedlist.go @@ -16,7 +16,7 @@ limitations under the License. // Code generated by angryjet. DO NOT EDIT. -package v1alpha1 +package manualv1alpha1 import resource "github.com/crossplane/crossplane-runtime/pkg/resource" diff --git a/pkg/clients/ec2/vpccidrblock.go b/pkg/clients/ec2/vpccidrblock.go index 3249619339..37431b04a8 100644 --- a/pkg/clients/ec2/vpccidrblock.go +++ b/pkg/clients/ec2/vpccidrblock.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/awserr" "github.com/aws/aws-sdk-go-v2/service/ec2" - "github.com/crossplane/provider-aws/apis/ec2/v1alpha1" + "github.com/crossplane/provider-aws/apis/ec2/manualv1alpha1" awsclient "github.com/crossplane/provider-aws/pkg/clients" ) @@ -49,7 +49,7 @@ func IsCIDRNotFound(err error) bool { // IsVpcCidrBlockUpToDate returns true if there is no update-able difference between desired // and observed state of the resource. -func IsVpcCidrBlockUpToDate(associationID string, spec v1alpha1.VPCCIDRBlockParameters, vpc ec2.Vpc) (bool, error) { +func IsVpcCidrBlockUpToDate(associationID string, spec manualv1alpha1.VPCCIDRBlockParameters, vpc ec2.Vpc) (bool, error) { IPv4, IPv6 := FindCIDRAssociation(associationID, vpc) if IPv4 != nil { @@ -65,7 +65,7 @@ func IsVpcCidrBlockUpToDate(associationID string, spec v1alpha1.VPCCIDRBlockPara } // IsVpcCidrDeleting returns true if the CIDR Block is already disassociated or disassociating -func IsVpcCidrDeleting(observation v1alpha1.VPCCIDRBlockObservation) bool { +func IsVpcCidrDeleting(observation manualv1alpha1.VPCCIDRBlockObservation) bool { switch { case observation.CIDRBlockState == nil && observation.IPv6CIDRBlockState == nil: return true @@ -80,14 +80,14 @@ func IsVpcCidrDeleting(observation v1alpha1.VPCCIDRBlockObservation) bool { // GenerateVpcCIDRBlockObservation is used to produce v1alpha1.VPCObservation from // ec2.Vpc. -func GenerateVpcCIDRBlockObservation(associationID string, vpc ec2.Vpc) v1alpha1.VPCCIDRBlockObservation { - o := v1alpha1.VPCCIDRBlockObservation{} +func GenerateVpcCIDRBlockObservation(associationID string, vpc ec2.Vpc) manualv1alpha1.VPCCIDRBlockObservation { + o := manualv1alpha1.VPCCIDRBlockObservation{} IPv4, IPv6 := FindCIDRAssociation(associationID, vpc) if IPv4 != nil { o.AssociationID = IPv4.AssociationId - o.CIDRBlockState = &v1alpha1.VPCCIDRBlockState{ + o.CIDRBlockState = &manualv1alpha1.VPCCIDRBlockState{ State: awsclient.String(string(IPv4.CidrBlockState.State)), StatusMessage: IPv4.CidrBlockState.StatusMessage, } @@ -97,7 +97,7 @@ func GenerateVpcCIDRBlockObservation(associationID string, vpc ec2.Vpc) v1alpha1 if IPv6 != nil { o.AssociationID = IPv6.AssociationId - o.IPv6CIDRBlockState = &v1alpha1.VPCCIDRBlockState{ + o.IPv6CIDRBlockState = &manualv1alpha1.VPCCIDRBlockState{ State: awsclient.String(string(IPv6.Ipv6CidrBlockState.State)), StatusMessage: IPv6.Ipv6CidrBlockState.StatusMessage, } diff --git a/pkg/clients/ec2/vpccidrblock_test.go b/pkg/clients/ec2/vpccidrblock_test.go index 7029df9ca0..4242ebdee7 100644 --- a/pkg/clients/ec2/vpccidrblock_test.go +++ b/pkg/clients/ec2/vpccidrblock_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/google/go-cmp/cmp" - "github.com/crossplane/provider-aws/apis/ec2/v1alpha1" + "github.com/crossplane/provider-aws/apis/ec2/manualv1alpha1" ) var ( @@ -23,7 +23,7 @@ func TestGenerateVPCCIDRBlockObservation(t *testing.T) { cases := map[string]struct { associationID string in ec2.Vpc - out v1alpha1.VPCCIDRBlockObservation + out manualv1alpha1.VPCCIDRBlockObservation }{ "IPv4": { associationID: matchAssociationID, @@ -43,10 +43,10 @@ func TestGenerateVPCCIDRBlockObservation(t *testing.T) { }, }, }, - out: v1alpha1.VPCCIDRBlockObservation{ + out: manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, CIDRBlock: &testCidrBlock, - CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testStateString, StatusMessage: &testStatus, }, @@ -74,10 +74,10 @@ func TestGenerateVPCCIDRBlockObservation(t *testing.T) { }, }, }, - out: v1alpha1.VPCCIDRBlockObservation{ + out: manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, IPv6CIDRBlock: &testCidrBlock, - IPv6CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + IPv6CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testStateString, StatusMessage: &testStatus, }, @@ -163,13 +163,13 @@ func TestFindVPCCIDRBlockStatus(t *testing.T) { func TestIsVpcCidrDeleting(t *testing.T) { cases := map[string]struct { - in v1alpha1.VPCCIDRBlockObservation + in manualv1alpha1.VPCCIDRBlockObservation out bool }{ "IPv4": { - in: v1alpha1.VPCCIDRBlockObservation{ + in: manualv1alpha1.VPCCIDRBlockObservation{ CIDRBlock: &testCidrBlock, - CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testStateString, StatusMessage: &testStatus, }, @@ -177,10 +177,10 @@ func TestIsVpcCidrDeleting(t *testing.T) { out: false, }, "IPv6": { - in: v1alpha1.VPCCIDRBlockObservation{ + in: manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, IPv6CIDRBlock: &testCidrBlock, - IPv6CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + IPv6CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testStateString, StatusMessage: &testStatus, }, diff --git a/pkg/controller/ec2/vpccidrblock/controller.go b/pkg/controller/ec2/vpccidrblock/controller.go index 1201488289..aa0906faca 100644 --- a/pkg/controller/ec2/vpccidrblock/controller.go +++ b/pkg/controller/ec2/vpccidrblock/controller.go @@ -36,7 +36,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - "github.com/crossplane/provider-aws/apis/ec2/v1alpha1" + "github.com/crossplane/provider-aws/apis/ec2/manualv1alpha1" awsclient "github.com/crossplane/provider-aws/pkg/clients" "github.com/crossplane/provider-aws/pkg/clients/ec2" ) @@ -51,15 +51,15 @@ const ( // SetupVPCCIDRBlock adds a controller that reconciles VPCCIDRBlocks. func SetupVPCCIDRBlock(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, poll time.Duration) error { - name := managed.ControllerName(v1alpha1.VPCCIDRBlockGroupKind) + name := managed.ControllerName(manualv1alpha1.VPCCIDRBlockGroupKind) return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), }). - For(&v1alpha1.VPCCIDRBlock{}). + For(&manualv1alpha1.VPCCIDRBlock{}). Complete(managed.NewReconciler(mgr, - resource.ManagedKind(v1alpha1.VPCCIDRBlockGroupVersionKind), + resource.ManagedKind(manualv1alpha1.VPCCIDRBlockGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewVPCCIDRBlockClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithConnectionPublishers(), @@ -75,7 +75,7 @@ type connector struct { } func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.ExternalClient, error) { - cr, ok := mg.(*v1alpha1.VPCCIDRBlock) + cr, ok := mg.(*manualv1alpha1.VPCCIDRBlock) if !ok { return nil, errors.New(errUnexpectedObject) } @@ -92,7 +92,7 @@ type external struct { } func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.ExternalObservation, error) { // nolint:gocyclo - cr, ok := mgd.(*v1alpha1.VPCCIDRBlock) + cr, ok := mgd.(*manualv1alpha1.VPCCIDRBlock) if !ok { return managed.ExternalObservation{}, errors.New(errUnexpectedObject) } @@ -147,7 +147,7 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E } func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.ExternalCreation, error) { - cr, ok := mgd.(*v1alpha1.VPCCIDRBlock) + cr, ok := mgd.(*manualv1alpha1.VPCCIDRBlock) if !ok { return managed.ExternalCreation{}, errors.New(errUnexpectedObject) } @@ -181,7 +181,7 @@ func (e *external) Update(_ context.Context, _ resource.Managed) (managed.Extern } func (e *external) Delete(ctx context.Context, mgd resource.Managed) error { - cr, ok := mgd.(*v1alpha1.VPCCIDRBlock) + cr, ok := mgd.(*manualv1alpha1.VPCCIDRBlock) if !ok { return errors.New(errUnexpectedObject) } diff --git a/pkg/controller/ec2/vpccidrblock/controller_test.go b/pkg/controller/ec2/vpccidrblock/controller_test.go index b6124b0a11..c9d960911c 100644 --- a/pkg/controller/ec2/vpccidrblock/controller_test.go +++ b/pkg/controller/ec2/vpccidrblock/controller_test.go @@ -33,7 +33,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/meta" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" - "github.com/crossplane/provider-aws/apis/ec2/v1alpha1" + "github.com/crossplane/provider-aws/apis/ec2/manualv1alpha1" awsclient "github.com/crossplane/provider-aws/pkg/clients" "github.com/crossplane/provider-aws/pkg/clients/ec2" "github.com/crossplane/provider-aws/pkg/clients/ec2/fake" @@ -53,29 +53,29 @@ var ( type args struct { vpc ec2.VPCCIDRBlockClient kube client.Client - cr *v1alpha1.VPCCIDRBlock + cr *manualv1alpha1.VPCCIDRBlock } -type vpcCIDRBlockModifier func(*v1alpha1.VPCCIDRBlock) +type vpcCIDRBlockModifier func(*manualv1alpha1.VPCCIDRBlock) func withExternalName(name string) vpcCIDRBlockModifier { - return func(r *v1alpha1.VPCCIDRBlock) { meta.SetExternalName(r, name) } + return func(r *manualv1alpha1.VPCCIDRBlock) { meta.SetExternalName(r, name) } } func withConditions(c ...xpv1.Condition) vpcCIDRBlockModifier { - return func(r *v1alpha1.VPCCIDRBlock) { r.Status.ConditionedStatus.Conditions = c } + return func(r *manualv1alpha1.VPCCIDRBlock) { r.Status.ConditionedStatus.Conditions = c } } -func withSpec(p v1alpha1.VPCCIDRBlockParameters) vpcCIDRBlockModifier { - return func(r *v1alpha1.VPCCIDRBlock) { r.Spec.ForProvider = p } +func withSpec(p manualv1alpha1.VPCCIDRBlockParameters) vpcCIDRBlockModifier { + return func(r *manualv1alpha1.VPCCIDRBlock) { r.Spec.ForProvider = p } } -func withStatus(s v1alpha1.VPCCIDRBlockObservation) vpcCIDRBlockModifier { - return func(r *v1alpha1.VPCCIDRBlock) { r.Status.AtProvider = s } +func withStatus(s manualv1alpha1.VPCCIDRBlockObservation) vpcCIDRBlockModifier { + return func(r *manualv1alpha1.VPCCIDRBlock) { r.Status.AtProvider = s } } -func vpcCIDRBlock(m ...vpcCIDRBlockModifier) *v1alpha1.VPCCIDRBlock { - cr := &v1alpha1.VPCCIDRBlock{} +func vpcCIDRBlock(m ...vpcCIDRBlockModifier) *manualv1alpha1.VPCCIDRBlock { + cr := &manualv1alpha1.VPCCIDRBlock{} for _, f := range m { f(cr) } @@ -87,7 +87,7 @@ var _ managed.ExternalConnecter = &connector{} func TestObserve(t *testing.T) { type want struct { - cr *v1alpha1.VPCCIDRBlock + cr *manualv1alpha1.VPCCIDRBlock result managed.ExternalObservation err error } @@ -120,19 +120,19 @@ func TestObserve(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ CIDRBlock: &cidr, VPCID: &vpcID, }), withExternalName(matchAssociationID)), }, want: want{ - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ VPCID: &vpcID, CIDRBlock: &cidr, - }), withStatus(v1alpha1.VPCCIDRBlockObservation{ + }), withStatus(manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, CIDRBlock: &cidr, - CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testState, StatusMessage: &testStatus, }, @@ -168,19 +168,19 @@ func TestObserve(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ IPv6CIDRBlock: &ipv6CIDR, VPCID: &vpcID, }), withExternalName(matchAssociationID)), }, want: want{ - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ VPCID: &vpcID, IPv6CIDRBlock: &ipv6CIDR, - }), withStatus(v1alpha1.VPCCIDRBlockObservation{ + }), withStatus(manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, IPv6CIDRBlock: &ipv6CIDR, - IPv6CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + IPv6CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testState, StatusMessage: &testStatus, }, @@ -204,16 +204,16 @@ func TestObserve(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ CIDRBlock: &cidr, VPCID: &vpcID, }), withExternalName(matchAssociationID)), }, want: want{ - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ VPCID: &vpcID, CIDRBlock: &cidr, - }), withStatus(v1alpha1.VPCCIDRBlockObservation{}), withExternalName(matchAssociationID)), + }), withStatus(manualv1alpha1.VPCCIDRBlockObservation{}), withExternalName(matchAssociationID)), err: awsclient.Wrap(errBoom, errDescribe), }, }, @@ -239,7 +239,7 @@ func TestObserve(t *testing.T) { func TestCreate(t *testing.T) { type want struct { - cr *v1alpha1.VPCCIDRBlock + cr *manualv1alpha1.VPCCIDRBlock result managed.ExternalCreation err error } @@ -264,13 +264,13 @@ func TestCreate(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ CIDRBlock: &cidr, VPCID: &vpcID, })), }, want: want{ - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ CIDRBlock: &cidr, VPCID: &vpcID, }), withExternalName(matchAssociationID)), @@ -293,13 +293,13 @@ func TestCreate(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ IPv6CIDRBlock: &ipv6CIDR, VPCID: &vpcID, })), }, want: want{ - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ IPv6CIDRBlock: &ipv6CIDR, VPCID: &vpcID, }), withExternalName(matchAssociationID)), @@ -315,13 +315,13 @@ func TestCreate(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ CIDRBlock: &cidr, VPCID: &vpcID, })), }, want: want{ - cr: vpcCIDRBlock(withSpec(v1alpha1.VPCCIDRBlockParameters{ + cr: vpcCIDRBlock(withSpec(manualv1alpha1.VPCCIDRBlockParameters{ CIDRBlock: &cidr, VPCID: &vpcID, })), @@ -350,7 +350,7 @@ func TestCreate(t *testing.T) { func TestDelete(t *testing.T) { type want struct { - cr *v1alpha1.VPCCIDRBlock + cr *manualv1alpha1.VPCCIDRBlock err error } @@ -367,20 +367,20 @@ func TestDelete(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withStatus(v1alpha1.VPCCIDRBlockObservation{ + cr: vpcCIDRBlock(withStatus(manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, CIDRBlock: &cidr, - CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testState, StatusMessage: &testStatus, }, })), }, want: want{ - cr: vpcCIDRBlock(withStatus(v1alpha1.VPCCIDRBlockObservation{ + cr: vpcCIDRBlock(withStatus(manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, CIDRBlock: &cidr, - CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testState, StatusMessage: &testStatus, }, @@ -396,20 +396,20 @@ func TestDelete(t *testing.T) { } }, }, - cr: vpcCIDRBlock(withStatus(v1alpha1.VPCCIDRBlockObservation{ + cr: vpcCIDRBlock(withStatus(manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, CIDRBlock: &cidr, - CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testState, StatusMessage: &testStatus, }, })), }, want: want{ - cr: vpcCIDRBlock(withStatus(v1alpha1.VPCCIDRBlockObservation{ + cr: vpcCIDRBlock(withStatus(manualv1alpha1.VPCCIDRBlockObservation{ AssociationID: &matchAssociationID, CIDRBlock: &cidr, - CIDRBlockState: &v1alpha1.VPCCIDRBlockState{ + CIDRBlockState: &manualv1alpha1.VPCCIDRBlockState{ State: &testState, StatusMessage: &testStatus, },