Merge pull request #475 from haarchri/feature/remove-dep-providerref

feat(remove): remove deprecated providerRef

Author: turkenh

apis/common/v1/resource.go

@@ -197,11 +197,6 @@ type ResourceSpec struct {
 	// +kubebuilder:default={"name": "default"}
 	ProviderConfigReference *Reference `json:"providerConfigRef,omitempty"`
 
-	// ProviderReference specifies the provider that will be used to create,
-	// observe, update, and delete this managed resource.
-	// Deprecated: Please use ProviderConfigReference, i.e. `providerConfigRef`
-	ProviderReference *Reference `json:"providerRef,omitempty"`
-
 	// THIS IS AN ALPHA FIELD. Do not use it in production. It is not honored
 	// unless the relevant Crossplane feature flag is enabled, and may be
 	// changed or removed without notice.

apis/common/v1/zz_generated.deepcopy.go

@@ -63,17 +63,8 @@ func (m *ManagedResourceReferencer) SetResourceReference(r *corev1.ObjectReferen
 // GetResourceReference gets the ResourceReference.
 func (m *ManagedResourceReferencer) GetResourceReference() *corev1.ObjectReference { return m.Ref }
 
-// ProviderReferencer is a mock that implements ProviderReferencer interface.
-type ProviderReferencer struct{ Ref *xpv1.Reference } //nolint:musttag // This is a fake implementation to be used in unit tests only.
-
-// SetProviderReference sets the ProviderReference.
-func (m *ProviderReferencer) SetProviderReference(p *xpv1.Reference) { m.Ref = p }
-
-// GetProviderReference gets the ProviderReference.
-func (m *ProviderReferencer) GetProviderReference() *xpv1.Reference { return m.Ref }
-
 // ProviderConfigReferencer is a mock that implements ProviderConfigReferencer interface.
-type ProviderConfigReferencer struct{ Ref *xpv1.Reference }
+type ProviderConfigReferencer struct{ Ref *xpv1.Reference } //nolint:musttag // This is a fake implementation to be used in unit tests only.
 
 // SetProviderConfigReference sets the ProviderConfigReference.
 func (m *ProviderConfigReferencer) SetProviderConfigReference(p *xpv1.Reference) { m.Ref = p }
@@ -331,7 +322,6 @@ func (o *Object) DeepCopyObject() runtime.Object {
 // Managed is a mock that implements Managed interface.
 type Managed struct {
 	metav1.ObjectMeta
-	ProviderReferencer
 	ProviderConfigReferencer
 	ConnectionSecretWriterTo
 	ConnectionDetailsPublisherTo

pkg/resource/fake/mocks.go

@@ -79,12 +79,6 @@ type Orphanable interface {
 	GetDeletionPolicy() xpv1.DeletionPolicy
 }
 
-// A ProviderReferencer may reference a provider resource.
-type ProviderReferencer interface {
-	GetProviderReference() *xpv1.Reference
-	SetProviderReference(p *xpv1.Reference)
-}
-
 // A ProviderConfigReferencer may reference a provider config resource.
 type ProviderConfigReferencer interface {
 	GetProviderConfigReference() *xpv1.Reference
@@ -192,7 +186,6 @@ type Object interface {
 type Managed interface {
 	Object
 
-	ProviderReferencer
 	ProviderConfigReferencer
 	ConnectionSecretWriterTo
 	ConnectionDetailsPublisherTo

pkg/resource/interfaces.go

@@ -369,13 +369,8 @@ func GetExternalTags(mg Managed) map[string]string {
 		ExternalResourceTagKeyName: mg.GetName(),
 	}
 
-	switch {
-	case mg.GetProviderConfigReference() != nil && mg.GetProviderConfigReference().Name != "":
+	if mg.GetProviderConfigReference() != nil && mg.GetProviderConfigReference().Name != "" {
 		tags[ExternalResourceTagKeyProvider] = mg.GetProviderConfigReference().Name
-	// TODO(muvaf): Remove the branch once Provider type has been removed from
-	// everywhere.
-	case mg.GetProviderReference() != nil && mg.GetProviderReference().Name != "":
-		tags[ExternalResourceTagKeyProvider] = mg.GetProviderReference().Name
 	}
 	return tags
 }

pkg/resource/resource.go

@@ -615,18 +615,6 @@ func TestGetExternalTags(t *testing.T) {
 		o    Managed
 		want map[string]string
 	}{
-		"Successful": {
-			o: &fake.Managed{ObjectMeta: metav1.ObjectMeta{
-				Name: name,
-			},
-				ProviderReferencer: fake.ProviderReferencer{Ref: &xpv1.Reference{Name: provName}},
-			},
-			want: map[string]string{
-				ExternalResourceTagKeyKind:     strings.ToLower((&fake.Managed{}).GetObjectKind().GroupVersionKind().GroupKind().String()),
-				ExternalResourceTagKeyName:     name,
-				ExternalResourceTagKeyProvider: provName,
-			},
-		},
 		"SuccessfulWithProviderConfig": {
 			o: &fake.Managed{ObjectMeta: metav1.ObjectMeta{
 				Name: name,