From 091537f0cf450f60cc72f57be6a9fbbf4f9629dd Mon Sep 17 00:00:00 2001 From: Nic Cope Date: Fri, 11 Dec 2020 22:00:15 +0000 Subject: [PATCH] Bump crossplane-runtime to v0.12.0 Signed-off-by: Nic Cope --- apis/database/v1alpha1/rds_types.go | 10 +-- .../database/v1alpha1/zz_generated.managed.go | 22 ++--- apis/v1alpha1/types.go | 10 +-- apis/v1alpha1/zz_generated.pc.go | 6 +- apis/v1alpha1/zz_generated.pcu.go | 10 +-- go.mod | 2 +- go.sum | 4 +- pkg/controller/database/rdsinstance.go | 26 +++--- pkg/controller/database/rdsinstance_test.go | 86 +++++++++---------- 9 files changed, 88 insertions(+), 88 deletions(-) diff --git a/apis/database/v1alpha1/rds_types.go b/apis/database/v1alpha1/rds_types.go index 60b244c..a309cb9 100644 --- a/apis/database/v1alpha1/rds_types.go +++ b/apis/database/v1alpha1/rds_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" ) // SQL database engines. @@ -58,14 +58,14 @@ type RDSInstance struct { // An RDSInstanceSpec defines the desired state of an RDSInstance. type RDSInstanceSpec struct { - runtimev1alpha1.ResourceSpec `json:",inline"` - ForProvider RDSInstanceParameters `json:"forProvider"` + xpv1.ResourceSpec `json:",inline"` + ForProvider RDSInstanceParameters `json:"forProvider"` } // An RDSInstanceStatus represents the observed state of an RDSInstance. type RDSInstanceStatus struct { - runtimev1alpha1.ResourceStatus `json:",inline"` - AtProvider RDSInstanceObservation `json:"atProvider,omitempty"` + xpv1.ResourceStatus `json:",inline"` + AtProvider RDSInstanceObservation `json:"atProvider,omitempty"` } // RDSInstanceParameters define the desired state of an RDS instance. diff --git a/apis/database/v1alpha1/zz_generated.managed.go b/apis/database/v1alpha1/zz_generated.managed.go index fa5fe19..84aa6e7 100644 --- a/apis/database/v1alpha1/zz_generated.managed.go +++ b/apis/database/v1alpha1/zz_generated.managed.go @@ -18,20 +18,20 @@ limitations under the License. package v1alpha1 -import runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" +import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" // GetCondition of this RDSInstance. -func (mg *RDSInstance) GetCondition(ct runtimev1alpha1.ConditionType) runtimev1alpha1.Condition { +func (mg *RDSInstance) GetCondition(ct xpv1.ConditionType) xpv1.Condition { return mg.Status.GetCondition(ct) } // GetDeletionPolicy of this RDSInstance. -func (mg *RDSInstance) GetDeletionPolicy() runtimev1alpha1.DeletionPolicy { +func (mg *RDSInstance) GetDeletionPolicy() xpv1.DeletionPolicy { return mg.Spec.DeletionPolicy } // GetProviderConfigReference of this RDSInstance. -func (mg *RDSInstance) GetProviderConfigReference() *runtimev1alpha1.Reference { +func (mg *RDSInstance) GetProviderConfigReference() *xpv1.Reference { return mg.Spec.ProviderConfigReference } @@ -39,27 +39,27 @@ func (mg *RDSInstance) GetProviderConfigReference() *runtimev1alpha1.Reference { GetProviderReference of this RDSInstance. Deprecated: Use GetProviderConfigReference. */ -func (mg *RDSInstance) GetProviderReference() *runtimev1alpha1.Reference { +func (mg *RDSInstance) GetProviderReference() *xpv1.Reference { return mg.Spec.ProviderReference } // GetWriteConnectionSecretToReference of this RDSInstance. -func (mg *RDSInstance) GetWriteConnectionSecretToReference() *runtimev1alpha1.SecretReference { +func (mg *RDSInstance) GetWriteConnectionSecretToReference() *xpv1.SecretReference { return mg.Spec.WriteConnectionSecretToReference } // SetConditions of this RDSInstance. -func (mg *RDSInstance) SetConditions(c ...runtimev1alpha1.Condition) { +func (mg *RDSInstance) SetConditions(c ...xpv1.Condition) { mg.Status.SetConditions(c...) } // SetDeletionPolicy of this RDSInstance. -func (mg *RDSInstance) SetDeletionPolicy(r runtimev1alpha1.DeletionPolicy) { +func (mg *RDSInstance) SetDeletionPolicy(r xpv1.DeletionPolicy) { mg.Spec.DeletionPolicy = r } // SetProviderConfigReference of this RDSInstance. -func (mg *RDSInstance) SetProviderConfigReference(r *runtimev1alpha1.Reference) { +func (mg *RDSInstance) SetProviderConfigReference(r *xpv1.Reference) { mg.Spec.ProviderConfigReference = r } @@ -67,11 +67,11 @@ func (mg *RDSInstance) SetProviderConfigReference(r *runtimev1alpha1.Reference) SetProviderReference of this RDSInstance. Deprecated: Use SetProviderConfigReference. */ -func (mg *RDSInstance) SetProviderReference(r *runtimev1alpha1.Reference) { +func (mg *RDSInstance) SetProviderReference(r *xpv1.Reference) { mg.Spec.ProviderReference = r } // SetWriteConnectionSecretToReference of this RDSInstance. -func (mg *RDSInstance) SetWriteConnectionSecretToReference(r *runtimev1alpha1.SecretReference) { +func (mg *RDSInstance) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) { mg.Spec.WriteConnectionSecretToReference = r } diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go index 4a9b673..53c9cfe 100644 --- a/apis/v1alpha1/types.go +++ b/apis/v1alpha1/types.go @@ -19,12 +19,12 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" ) // A ProviderSpec defines the desired state of a Provider. type ProviderSpec struct { - runtimev1alpha1.ProviderSpec `json:",inline"` + xpv1.ProviderSpec `json:",inline"` // Region for managed resources created using this Alibaba Cloud provider, // e.g. "cn-hangzhou". @@ -56,7 +56,7 @@ type ProviderList struct { // A ProviderConfigSpec defines the desired state of a ProviderConfig. type ProviderConfigSpec struct { - runtimev1alpha1.ProviderConfigSpec `json:",inline"` + xpv1.ProviderConfigSpec `json:",inline"` // Region for managed resources created using this Alibaba Cloud provider, // e.g. "cn-hangzhou". @@ -65,7 +65,7 @@ type ProviderConfigSpec struct { // A ProviderConfigStatus represents the status of a ProviderConfig. type ProviderConfigStatus struct { - runtimev1alpha1.ProviderConfigStatus `json:",inline"` + xpv1.ProviderConfigStatus `json:",inline"` } // +kubebuilder:object:root=true @@ -105,7 +105,7 @@ type ProviderConfigUsage struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - runtimev1alpha1.ProviderConfigUsage `json:",inline"` + xpv1.ProviderConfigUsage `json:",inline"` } // +kubebuilder:object:root=true diff --git a/apis/v1alpha1/zz_generated.pc.go b/apis/v1alpha1/zz_generated.pc.go index 78a3a18..93c3439 100644 --- a/apis/v1alpha1/zz_generated.pc.go +++ b/apis/v1alpha1/zz_generated.pc.go @@ -18,10 +18,10 @@ limitations under the License. package v1alpha1 -import runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" +import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" // GetCondition of this ProviderConfig. -func (p *ProviderConfig) GetCondition(ct runtimev1alpha1.ConditionType) runtimev1alpha1.Condition { +func (p *ProviderConfig) GetCondition(ct xpv1.ConditionType) xpv1.Condition { return p.Status.GetCondition(ct) } @@ -31,7 +31,7 @@ func (p *ProviderConfig) GetUsers() int64 { } // SetConditions of this ProviderConfig. -func (p *ProviderConfig) SetConditions(c ...runtimev1alpha1.Condition) { +func (p *ProviderConfig) SetConditions(c ...xpv1.Condition) { p.Status.SetConditions(c...) } diff --git a/apis/v1alpha1/zz_generated.pcu.go b/apis/v1alpha1/zz_generated.pcu.go index 6ddbbff..8dfba82 100644 --- a/apis/v1alpha1/zz_generated.pcu.go +++ b/apis/v1alpha1/zz_generated.pcu.go @@ -18,24 +18,24 @@ limitations under the License. package v1alpha1 -import runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" +import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" // GetProviderConfigReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) GetProviderConfigReference() runtimev1alpha1.Reference { +func (p *ProviderConfigUsage) GetProviderConfigReference() xpv1.Reference { return p.ProviderConfigReference } // GetResourceReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) GetResourceReference() runtimev1alpha1.TypedReference { +func (p *ProviderConfigUsage) GetResourceReference() xpv1.TypedReference { return p.ResourceReference } // SetProviderConfigReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) SetProviderConfigReference(r runtimev1alpha1.Reference) { +func (p *ProviderConfigUsage) SetProviderConfigReference(r xpv1.Reference) { p.ProviderConfigReference = r } // SetResourceReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) SetResourceReference(r runtimev1alpha1.TypedReference) { +func (p *ProviderConfigUsage) SetResourceReference(r xpv1.TypedReference) { p.ResourceReference = r } diff --git a/go.mod b/go.mod index 1416a0e..13ef3b8 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/aliyun/alibaba-cloud-sdk-go v1.61.109 - github.com/crossplane/crossplane-runtime v0.11.0 + github.com/crossplane/crossplane-runtime v0.12.0 github.com/crossplane/crossplane-tools v0.0.0-20201007233256-88b291e145bb github.com/go-logr/zapr v0.1.1 // indirect github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect diff --git a/go.sum b/go.sum index 77c266e..f1a290c 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/crossplane/crossplane-runtime v0.11.0 h1:hLDWsGYhU/CUVQ1sU7NHF5bnP6WT6wA6Nu2SaBSSe6w= -github.com/crossplane/crossplane-runtime v0.11.0/go.mod h1:cJl5ZZONisre4v6wTmbrC8Jh3AI+erq/lNaxZzv9tnU= +github.com/crossplane/crossplane-runtime v0.12.0 h1:GB1Pq5vVBNStPrfiEJNat56gHCQiuliidgr7pNs/FQA= +github.com/crossplane/crossplane-runtime v0.12.0/go.mod h1:cJl5ZZONisre4v6wTmbrC8Jh3AI+erq/lNaxZzv9tnU= github.com/crossplane/crossplane-tools v0.0.0-20201007233256-88b291e145bb h1:j09j/Gk1qH64HUtf/fcTjMAxLxUdOuQXySWu46WTVTU= github.com/crossplane/crossplane-tools v0.0.0-20201007233256-88b291e145bb/go.mod h1:C735A9X0x0lR8iGVOOxb49Mt70Ua4EM2b7PGaRPBLd4= github.com/dave/jennifer v1.3.0 h1:p3tl41zjjCZTNBytMwrUuiAnherNUZktlhPTKoF/sEk= diff --git a/pkg/controller/database/rdsinstance.go b/pkg/controller/database/rdsinstance.go index f33903a..13fc585 100644 --- a/pkg/controller/database/rdsinstance.go +++ b/pkg/controller/database/rdsinstance.go @@ -26,7 +26,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "github.com/crossplane/crossplane-runtime/pkg/event" "github.com/crossplane/crossplane-runtime/pkg/logging" "github.com/crossplane/crossplane-runtime/pkg/meta" @@ -93,7 +93,7 @@ func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.E // TODO(negz): This connection logic should be generalised once this // provider has more than one kind of managed resource. var ( - sel *runtimev1alpha1.SecretKeySelector + sel *xpv1.SecretKeySelector region string ) switch { @@ -106,7 +106,7 @@ func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.E if err := c.client.Get(ctx, types.NamespacedName{Name: cr.Spec.ProviderConfigReference.Name}, pc); err != nil { return nil, errors.Wrap(err, errGetProviderConfig) } - if s := pc.Spec.Credentials.Source; s != runtimev1alpha1.CredentialsSourceSecret { + if s := pc.Spec.Credentials.Source; s != xpv1.CredentialsSourceSecret { return nil, errors.Errorf(errFmtUnsupportedCredSource, s) } sel = pc.Spec.Credentials.SecretRef @@ -160,17 +160,17 @@ func (e *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex var pw string switch cr.Status.AtProvider.DBInstanceStatus { case v1alpha1.RDSInstanceStateRunning: - cr.Status.SetConditions(runtimev1alpha1.Available()) + cr.Status.SetConditions(xpv1.Available()) pw, err = e.createAccountIfNeeded(cr) if err != nil { return managed.ExternalObservation{}, errors.Wrap(err, errCreateAccountFailed) } case v1alpha1.RDSInstanceStateCreating: - cr.Status.SetConditions(runtimev1alpha1.Creating()) + cr.Status.SetConditions(xpv1.Creating()) case v1alpha1.RDSInstanceStateDeleting: - cr.Status.SetConditions(runtimev1alpha1.Deleting()) + cr.Status.SetConditions(xpv1.Deleting()) default: - cr.Status.SetConditions(runtimev1alpha1.Unavailable()) + cr.Status.SetConditions(xpv1.Unavailable()) } return managed.ExternalObservation{ @@ -209,7 +209,7 @@ func (e *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext return managed.ExternalCreation{}, errors.New(errNotRDSInstance) } - cr.SetConditions(runtimev1alpha1.Creating()) + cr.SetConditions(xpv1.Creating()) if cr.Status.AtProvider.DBInstanceStatus == v1alpha1.RDSInstanceStateCreating { return managed.ExternalCreation{}, nil } @@ -236,7 +236,7 @@ func (e *external) Delete(ctx context.Context, mg resource.Managed) error { if !ok { return errors.New(errNotRDSInstance) } - cr.SetConditions(runtimev1alpha1.Deleting()) + cr.SetConditions(xpv1.Deleting()) if cr.Status.AtProvider.DBInstanceStatus == v1alpha1.RDSInstanceStateDeleting { return nil } @@ -247,16 +247,16 @@ func (e *external) Delete(ctx context.Context, mg resource.Managed) error { func getConnectionDetails(password string, cr *v1alpha1.RDSInstance, instance *rds.DBInstance) managed.ConnectionDetails { cd := managed.ConnectionDetails{ - runtimev1alpha1.ResourceCredentialsSecretUserKey: []byte(cr.Spec.ForProvider.MasterUsername), + xpv1.ResourceCredentialsSecretUserKey: []byte(cr.Spec.ForProvider.MasterUsername), } if password != "" { - cd[runtimev1alpha1.ResourceCredentialsSecretPasswordKey] = []byte(password) + cd[xpv1.ResourceCredentialsSecretPasswordKey] = []byte(password) } if instance.Endpoint != nil { - cd[runtimev1alpha1.ResourceCredentialsSecretEndpointKey] = []byte(instance.Endpoint.Address) - cd[runtimev1alpha1.ResourceCredentialsSecretPortKey] = []byte(instance.Endpoint.Port) + cd[xpv1.ResourceCredentialsSecretEndpointKey] = []byte(instance.Endpoint.Address) + cd[xpv1.ResourceCredentialsSecretPortKey] = []byte(instance.Endpoint.Port) } return cd diff --git a/pkg/controller/database/rdsinstance_test.go b/pkg/controller/database/rdsinstance_test.go index b84631e..bcfb166 100644 --- a/pkg/controller/database/rdsinstance_test.go +++ b/pkg/controller/database/rdsinstance_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" crossplanemeta "github.com/crossplane/crossplane-runtime/pkg/meta" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" @@ -59,8 +59,8 @@ func TestConnector(t *testing.T) { args: args{ mg: &v1alpha1.RDSInstance{ Spec: v1alpha1.RDSInstanceSpec{ - ResourceSpec: runtimev1alpha1.ResourceSpec{ - ProviderConfigReference: &runtimev1alpha1.Reference{}, + ResourceSpec: xpv1.ResourceSpec{ + ProviderConfigReference: &xpv1.Reference{}, }, }, }, @@ -78,8 +78,8 @@ func TestConnector(t *testing.T) { args: args{ mg: &v1alpha1.RDSInstance{ Spec: v1alpha1.RDSInstanceSpec{ - ResourceSpec: runtimev1alpha1.ResourceSpec{ - ProviderConfigReference: &runtimev1alpha1.Reference{}, + ResourceSpec: xpv1.ResourceSpec{ + ProviderConfigReference: &xpv1.Reference{}, }, }, }, @@ -94,9 +94,9 @@ func TestConnector(t *testing.T) { t := obj.(*aliv1alpha1.ProviderConfig) *t = aliv1alpha1.ProviderConfig{ Spec: aliv1alpha1.ProviderConfigSpec{ - ProviderConfigSpec: runtimev1alpha1.ProviderConfigSpec{ - Credentials: runtimev1alpha1.ProviderCredentials{ - Source: runtimev1alpha1.CredentialsSource("wat"), + ProviderConfigSpec: xpv1.ProviderConfigSpec{ + Credentials: xpv1.ProviderCredentials{ + Source: xpv1.CredentialsSource("wat"), }, }, }, @@ -109,8 +109,8 @@ func TestConnector(t *testing.T) { args: args{ mg: &v1alpha1.RDSInstance{ Spec: v1alpha1.RDSInstanceSpec{ - ResourceSpec: runtimev1alpha1.ResourceSpec{ - ProviderConfigReference: &runtimev1alpha1.Reference{}, + ResourceSpec: xpv1.ResourceSpec{ + ProviderConfigReference: &xpv1.Reference{}, }, }, }, @@ -128,8 +128,8 @@ func TestConnector(t *testing.T) { args: args{ mg: &v1alpha1.RDSInstance{ Spec: v1alpha1.RDSInstanceSpec{ - ResourceSpec: runtimev1alpha1.ResourceSpec{ - ProviderReference: &runtimev1alpha1.Reference{}, + ResourceSpec: xpv1.ResourceSpec{ + ProviderReference: &xpv1.Reference{}, }, }, }, @@ -144,9 +144,9 @@ func TestConnector(t *testing.T) { t := obj.(*aliv1alpha1.ProviderConfig) *t = aliv1alpha1.ProviderConfig{ Spec: aliv1alpha1.ProviderConfigSpec{ - ProviderConfigSpec: runtimev1alpha1.ProviderConfigSpec{ - Credentials: runtimev1alpha1.ProviderCredentials{ - Source: runtimev1alpha1.CredentialsSourceSecret, + ProviderConfigSpec: xpv1.ProviderConfigSpec{ + Credentials: xpv1.ProviderCredentials{ + Source: xpv1.CredentialsSourceSecret, }, }, }, @@ -159,8 +159,8 @@ func TestConnector(t *testing.T) { args: args{ mg: &v1alpha1.RDSInstance{ Spec: v1alpha1.RDSInstanceSpec{ - ResourceSpec: runtimev1alpha1.ResourceSpec{ - ProviderConfigReference: &runtimev1alpha1.Reference{}, + ResourceSpec: xpv1.ResourceSpec{ + ProviderConfigReference: &xpv1.Reference{}, }, }, }, @@ -178,11 +178,11 @@ func TestConnector(t *testing.T) { case *aliv1alpha1.ProviderConfig: *t = aliv1alpha1.ProviderConfig{ Spec: aliv1alpha1.ProviderConfigSpec{ - ProviderConfigSpec: runtimev1alpha1.ProviderConfigSpec{ - Credentials: runtimev1alpha1.ProviderCredentials{ - Source: runtimev1alpha1.CredentialsSourceSecret, - SecretRef: &runtimev1alpha1.SecretKeySelector{ - SecretReference: runtimev1alpha1.SecretReference{ + ProviderConfigSpec: xpv1.ProviderConfigSpec{ + Credentials: xpv1.ProviderCredentials{ + Source: xpv1.CredentialsSourceSecret, + SecretRef: &xpv1.SecretKeySelector{ + SecretReference: xpv1.SecretReference{ Name: "coolsecret", }, }, @@ -199,8 +199,8 @@ func TestConnector(t *testing.T) { args: args{ mg: &v1alpha1.RDSInstance{ Spec: v1alpha1.RDSInstanceSpec{ - ResourceSpec: runtimev1alpha1.ResourceSpec{ - ProviderConfigReference: &runtimev1alpha1.Reference{}, + ResourceSpec: xpv1.ResourceSpec{ + ProviderConfigReference: &xpv1.Reference{}, }, }, }, @@ -215,11 +215,11 @@ func TestConnector(t *testing.T) { if t, ok := obj.(*aliv1alpha1.ProviderConfig); ok { *t = aliv1alpha1.ProviderConfig{ Spec: aliv1alpha1.ProviderConfigSpec{ - ProviderConfigSpec: runtimev1alpha1.ProviderConfigSpec{ - Credentials: runtimev1alpha1.ProviderCredentials{ - Source: runtimev1alpha1.CredentialsSourceSecret, - SecretRef: &runtimev1alpha1.SecretKeySelector{ - SecretReference: runtimev1alpha1.SecretReference{ + ProviderConfigSpec: xpv1.ProviderConfigSpec{ + Credentials: xpv1.ProviderCredentials{ + Source: xpv1.CredentialsSourceSecret, + SecretRef: &xpv1.SecretKeySelector{ + SecretReference: xpv1.SecretReference{ Name: "coolsecret", }, }, @@ -239,8 +239,8 @@ func TestConnector(t *testing.T) { args: args{ mg: &v1alpha1.RDSInstance{ Spec: v1alpha1.RDSInstanceSpec{ - ResourceSpec: runtimev1alpha1.ResourceSpec{ - ProviderConfigReference: &runtimev1alpha1.Reference{}, + ResourceSpec: xpv1.ResourceSpec{ + ProviderConfigReference: &xpv1.Reference{}, }, }, }, @@ -284,7 +284,7 @@ func TestExternalClientObserve(t *testing.T) { if obj.Status.AtProvider.AccountReady != true { t.Error("AccountReady should be true") } - if string(ob.ConnectionDetails[runtimev1alpha1.ResourceCredentialsSecretUserKey]) != testName { + if string(ob.ConnectionDetails[xpv1.ResourceCredentialsSecretUserKey]) != testName { t.Error("ConnectionDetails should include username=test") } } @@ -315,8 +315,8 @@ func TestExternalClientCreate(t *testing.T) { if obj.Status.AtProvider.DBInstanceID != testName { t.Error("DBInstanceID should be set to 'test'") } - if string(ob.ConnectionDetails[runtimev1alpha1.ResourceCredentialsSecretEndpointKey]) != "172.0.0.1" || - string(ob.ConnectionDetails[runtimev1alpha1.ResourceCredentialsSecretPortKey]) != "8888" { + if string(ob.ConnectionDetails[xpv1.ResourceCredentialsSecretEndpointKey]) != "172.0.0.1" || + string(ob.ConnectionDetails[xpv1.ResourceCredentialsSecretPortKey]) != "8888" { t.Error("ConnectionDetails should include endpoint=172.0.0.1 and port=8888") } } @@ -378,9 +378,9 @@ func TestGetConnectionDetails(t *testing.T) { }, want: want{ conn: managed.ConnectionDetails{ - runtimev1alpha1.ResourceCredentialsSecretUserKey: []byte(testName), - runtimev1alpha1.ResourceCredentialsSecretEndpointKey: []byte(address), - runtimev1alpha1.ResourceCredentialsSecretPortKey: []byte(port), + xpv1.ResourceCredentialsSecretUserKey: []byte(testName), + xpv1.ResourceCredentialsSecretEndpointKey: []byte(address), + xpv1.ResourceCredentialsSecretPortKey: []byte(port), }, }, }, @@ -403,8 +403,8 @@ func TestGetConnectionDetails(t *testing.T) { }, want: want{ conn: managed.ConnectionDetails{ - runtimev1alpha1.ResourceCredentialsSecretUserKey: []byte(testName), - runtimev1alpha1.ResourceCredentialsSecretPasswordKey: []byte(password), + xpv1.ResourceCredentialsSecretUserKey: []byte(testName), + xpv1.ResourceCredentialsSecretPasswordKey: []byte(password), }, }, }, @@ -432,10 +432,10 @@ func TestGetConnectionDetails(t *testing.T) { }, want: want{ conn: managed.ConnectionDetails{ - runtimev1alpha1.ResourceCredentialsSecretUserKey: []byte(testName), - runtimev1alpha1.ResourceCredentialsSecretPasswordKey: []byte(password), - runtimev1alpha1.ResourceCredentialsSecretEndpointKey: []byte(address), - runtimev1alpha1.ResourceCredentialsSecretPortKey: []byte(port), + xpv1.ResourceCredentialsSecretUserKey: []byte(testName), + xpv1.ResourceCredentialsSecretPasswordKey: []byte(password), + xpv1.ResourceCredentialsSecretEndpointKey: []byte(address), + xpv1.ResourceCredentialsSecretPortKey: []byte(port), }, }, },