fix harness to not look for secret finalizers

in af80f46 we removed the
client finalizer being added to the secret; it's added only
to MariaDBAccount, where the MariaDBAccount maintains its
own finalizer on the secret.  However, we forgot to update the
test harnesses in harnesses.go which check for client finalizers
in both MariaDBAccount as well as the Secret; this change updates
all those suites to not check inside the Secret since it no longer
receives the finalizer.

Author: zzzeek

api/test/helpers/harnesses.go

@@ -127,12 +127,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
 				return mariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: mariadbAccount.Spec.Secret, Namespace: mariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 			// mariaDBDatabaseName is set
 			Expect(mariadbAccount.Labels["mariaDBDatabaseName"]).Should(Equal(harness.databaseName))
 
@@ -169,12 +163,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
 				return mariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: mariadbAccount.Spec.Secret, Namespace: mariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 			// mariaDBDatabaseName is set
 			Expect(mariadbAccount.Labels["mariaDBDatabaseName"]).Should(Equal(harness.databaseName))
 
@@ -209,13 +197,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
 				return oldMariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 		})
 		It("should ensure a new MariaDBAccount exists when accountname is changed", func() {
 			mariaDBHelper, timeout, interval := harness.mariaDBHelper, harness.timeout, harness.interval
@@ -250,27 +231,13 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
 				return newMariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 			// old account retains the finalizer because we did not yet
 			// complete the new MariaDBAccount
 			Consistently(func() []string {
 				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
 				return oldMariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 		})
 
 		It("should move the finalizer to a new MariaDBAccount when create is complete", func() {
@@ -303,26 +270,12 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
 				return newMariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 			// finalizer removed from old account
 			Eventually(func() []string {
 				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
 				return oldMariadbAccount.Finalizers
 			}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
-
 			// CreateOrPatchDBByName will add a label referring to the database
 			Eventually(func() string {
 				mariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
@@ -365,25 +318,11 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
 				return newMariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 			Eventually(func() []string {
 				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
 				return oldMariadbAccount.Finalizers
 			}, timeout, interval).Should(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).Should(ContainElement(harness.finalizerName))
-
 			// now delete the CR
 			harness.DeleteCR()
 
@@ -399,13 +338,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
 				return oldMariadbAccount.Finalizers
 			}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
 
-			// as well as in the secret
-			Eventually(func() []string {
-				oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
-				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
-				return dbSecret.Finalizers
-			}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
-
 			Eventually(func() []string {
 				newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
 				dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})