Browse Source

Adding FakeManager and test-secret const for testing

Eduardo Vieira 4 years ago
parent
commit
7502e2c557

+ 7 - 6
pkg/controllers/externalsecret/externalsecret_controller_test.go

@@ -134,6 +134,7 @@ var _ = Describe("ExternalSecret controller", func() {
 		ExternalSecretName             = "test-es"
 		ExternalSecretName             = "test-es"
 		ExternalSecretStore            = "test-store"
 		ExternalSecretStore            = "test-store"
 		ExternalSecretTargetSecretName = "test-secret"
 		ExternalSecretTargetSecretName = "test-secret"
+		FakeManager = "fake.manager"
 	)
 	)
 
 
 	var ExternalSecretNamespace string
 	var ExternalSecretNamespace string
@@ -283,13 +284,13 @@ var _ = Describe("ExternalSecret controller", func() {
 		// create secret beforehand
 		// create secret beforehand
 		Expect(k8sClient.Create(context.Background(), &v1.Secret{
 		Expect(k8sClient.Create(context.Background(), &v1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "test-secret",
+				Name:     ExternalSecretTargetSecretName,
 				Namespace: ExternalSecretNamespace,
 				Namespace: ExternalSecretNamespace,
 			},
 			},
 			Data: map[string][]byte{
 			Data: map[string][]byte{
 				existingKey: []byte(existingVal),
 				existingKey: []byte(existingVal),
 			},
 			},
-		}, client.FieldOwner("fake.manager"))).To(Succeed())
+		}, client.FieldOwner(FakeManager))).To(Succeed())
 
 
 		fakeProvider.WithGetSecret([]byte(secretVal), nil)
 		fakeProvider.WithGetSecret([]byte(secretVal), nil)
 		tc.checkSecret = func(es *esv1alpha1.ExternalSecret, secret *v1.Secret) {
 		tc.checkSecret = func(es *esv1alpha1.ExternalSecret, secret *v1.Secret) {
@@ -309,7 +310,7 @@ var _ = Describe("ExternalSecret controller", func() {
 				"external-secrets",
 				"external-secrets",
 				fmt.Sprintf("{\"f:data\":{\"f:targetProperty\":{}},\"f:metadata\":{\"f:annotations\":{\"f:%s\":{}}}}", esv1alpha1.AnnotationDataHash)),
 				fmt.Sprintf("{\"f:data\":{\"f:targetProperty\":{}},\"f:metadata\":{\"f:annotations\":{\"f:%s\":{}}}}", esv1alpha1.AnnotationDataHash)),
 			).To(BeTrue())
 			).To(BeTrue())
-			Expect(hasFieldOwnership(secret.ObjectMeta, "fake.manager", "{\"f:data\":{\".\":{},\"f:pre-existing-key\":{}},\"f:type\":{}}")).To(BeTrue())
+			Expect(hasFieldOwnership(secret.ObjectMeta, FakeManager, "{\"f:data\":{\".\":{},\"f:pre-existing-key\":{}},\"f:type\":{}}")).To(BeTrue())
 		}
 		}
 	}
 	}
 
 
@@ -348,13 +349,13 @@ var _ = Describe("ExternalSecret controller", func() {
 		// create secret beforehand
 		// create secret beforehand
 		Expect(k8sClient.Create(context.Background(), &v1.Secret{
 		Expect(k8sClient.Create(context.Background(), &v1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "test-secret",
+				Name:      ExternalSecretTargetSecretName,
 				Namespace: ExternalSecretNamespace,
 				Namespace: ExternalSecretNamespace,
 			},
 			},
 			Data: map[string][]byte{
 			Data: map[string][]byte{
 				existingKey: []byte(existingVal),
 				existingKey: []byte(existingVal),
 			},
 			},
-		}, client.FieldOwner("fake.manager"))).To(Succeed())
+		}, client.FieldOwner(FakeManager))).To(Succeed())
 		fakeProvider.WithGetSecret([]byte(secretVal), nil)
 		fakeProvider.WithGetSecret([]byte(secretVal), nil)
 
 
 		tc.checkCondition = func(es *esv1alpha1.ExternalSecret) bool {
 		tc.checkCondition = func(es *esv1alpha1.ExternalSecret) bool {
@@ -373,7 +374,7 @@ var _ = Describe("ExternalSecret controller", func() {
 			// check owner/managedFields
 			// check owner/managedFields
 			Expect(hasOwnerRef(secret.ObjectMeta, "ExternalSecret", ExternalSecretName)).To(BeFalse())
 			Expect(hasOwnerRef(secret.ObjectMeta, "ExternalSecret", ExternalSecretName)).To(BeFalse())
 			Expect(secret.ObjectMeta.ManagedFields).To(HaveLen(1))
 			Expect(secret.ObjectMeta.ManagedFields).To(HaveLen(1))
-			Expect(hasFieldOwnership(secret.ObjectMeta, "fake.manager", "{\"f:data\":{\".\":{},\"f:targetProperty\":{}},\"f:type\":{}}")).To(BeTrue())
+			Expect(hasFieldOwnership(secret.ObjectMeta, FakeManager, "{\"f:data\":{\".\":{},\"f:targetProperty\":{}},\"f:type\":{}}")).To(BeTrue())
 		}
 		}
 	}
 	}