diff --git a/pkg/reconciler/managed/reconciler_test.go b/pkg/reconciler/managed/reconciler_test.go index 81deaf6..6cb9309 100644 --- a/pkg/reconciler/managed/reconciler_test.go +++ b/pkg/reconciler/managed/reconciler_test.go @@ -769,16 +769,16 @@ func TestShouldDelete(t *testing.T) { "DeletionPolicyDelete": { reason: "The delete deletion policy should take precedence over the reclaim policy.", mg: &fake.Managed{ - Deletable: fake.Deletable{Policy: v1alpha1.DeletionDelete}, - Reclaimer: fake.Reclaimer{Policy: v1alpha1.ReclaimRetain}, + Orphanable: fake.Orphanable{Policy: v1alpha1.DeletionDelete}, + Reclaimer: fake.Reclaimer{Policy: v1alpha1.ReclaimRetain}, }, want: true, }, "DeletionPolicyOrphan": { reason: "The orphan deletion policy should take precedence over the reclaim policy.", mg: &fake.Managed{ - Deletable: fake.Deletable{Policy: v1alpha1.DeletionOrphan}, - Reclaimer: fake.Reclaimer{Policy: v1alpha1.ReclaimDelete}, + Orphanable: fake.Orphanable{Policy: v1alpha1.DeletionOrphan}, + Reclaimer: fake.Reclaimer{Policy: v1alpha1.ReclaimDelete}, }, want: false, }, diff --git a/pkg/resource/fake/mocks.go b/pkg/resource/fake/mocks.go index dcd75b8..9014fa8 100644 --- a/pkg/resource/fake/mocks.go +++ b/pkg/resource/fake/mocks.go @@ -135,14 +135,14 @@ func (m *Reclaimer) SetReclaimPolicy(p v1alpha1.ReclaimPolicy) { m.Policy = p } // GetReclaimPolicy gets the ReclaimPolicy. func (m *Reclaimer) GetReclaimPolicy() v1alpha1.ReclaimPolicy { return m.Policy } -// Deletable implements the Deletable interface. -type Deletable struct{ Policy v1alpha1.DeletionPolicy } +// Orphanable implements the Orphanable interface. +type Orphanable struct{ Policy v1alpha1.DeletionPolicy } // SetDeletionPolicy sets the DeletionPolicy. -func (m *Deletable) SetDeletionPolicy(p v1alpha1.DeletionPolicy) { m.Policy = p } +func (m *Orphanable) SetDeletionPolicy(p v1alpha1.DeletionPolicy) { m.Policy = p } // GetDeletionPolicy gets the DeletionPolicy. -func (m *Deletable) GetDeletionPolicy() v1alpha1.DeletionPolicy { return m.Policy } +func (m *Orphanable) GetDeletionPolicy() v1alpha1.DeletionPolicy { return m.Policy } // CredentialsSecretReferencer is a mock that satisfies CredentialsSecretReferencer // interface. @@ -281,7 +281,7 @@ type Managed struct { ClaimReferencer ProviderReferencer ConnectionSecretWriterTo - Deletable + Orphanable Reclaimer v1alpha1.ConditionedStatus v1alpha1.BindingStatus diff --git a/pkg/resource/interfaces.go b/pkg/resource/interfaces.go index caa4a36..28ecfa1 100644 --- a/pkg/resource/interfaces.go +++ b/pkg/resource/interfaces.go @@ -84,8 +84,8 @@ type Reclaimer interface { GetReclaimPolicy() v1alpha1.ReclaimPolicy } -// A Deletable may specify a DeletionPolicy. -type Deletable interface { +// An Orphanable resource may specify a DeletionPolicy. +type Orphanable interface { SetDeletionPolicy(p v1alpha1.DeletionPolicy) GetDeletionPolicy() v1alpha1.DeletionPolicy } @@ -193,7 +193,7 @@ type Managed interface { ClaimReferencer ProviderReferencer ConnectionSecretWriterTo - Deletable + Orphanable Reclaimer Conditioned