E2E tests - Fix Google Auth (#1476)

triggermesh · Jul 21, 2023 · 646e63d · 646e63d
1 parent cdc1c4d
commit 646e63d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/test/e2e/sources/googlecloudauditlogs/main.go b/test/e2e/sources/googlecloudauditlogs/main.go
@@ -231,7 +231,7 @@ var _ = Describe("Google Cloud Audit Logs source", func() {
 				)
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring(
-					`"spec.serviceAccountKey" must validate one and only one schema (oneOf).`))
+					`"spec.auth.serviceAccountKey" must validate one and only one schema (oneOf).`))
 			})
 		})
 	})
@@ -291,8 +291,8 @@ func withServiceAccountKey(key string) sourceOption {
 	}
 
 	return func(src *unstructured.Unstructured) {
-		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "serviceAccountKey"); err != nil {
-			framework.FailfWithOffset(3, "Failed to set spec.serviceAccountKey field: %s", err)
+		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "auth", "serviceAccountKey"); err != nil {
+			framework.FailfWithOffset(3, "Failed to set spec.auth.serviceAccountKey field: %s", err)
 		}
 	}
 }

diff --git a/test/e2e/sources/googlecloudpubsub/main.go b/test/e2e/sources/googlecloudpubsub/main.go
@@ -245,7 +245,7 @@ var _ = Describe("Google Cloud Pub/Sub source", func() {
 				)
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring(
-					`"spec.serviceAccountKey" must validate one and only one schema (oneOf).`))
+					`"spec.auth.serviceAccountKey" must validate one and only one schema (oneOf).`))
 			})
 		})
 	})
@@ -297,8 +297,8 @@ func withServiceAccountKey(key string) sourceOption {
 	}
 
 	return func(src *unstructured.Unstructured) {
-		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "serviceAccountKey"); err != nil {
-			framework.FailfWithOffset(3, "Failed to set spec.serviceAccountKey field: %s", err)
+		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "auth", "serviceAccountKey"); err != nil {
+			framework.FailfWithOffset(3, "Failed to set spec.auth.serviceAccountKey field: %s", err)
 		}
 	}
 }

diff --git a/test/e2e/sources/googlecloudsourcerepositories/main.go b/test/e2e/sources/googlecloudsourcerepositories/main.go
@@ -211,7 +211,7 @@ var _ = Describe("Google Cloud Source Repositories source", func() {
 				)
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring(
-					`"spec.serviceAccountKey" must validate one and only one schema (oneOf).`))
+					`"spec.auth.serviceAccountKey" must validate one and only one schema (oneOf).`))
 			})
 		})
 	})
@@ -263,8 +263,8 @@ func withServiceAccountKey(key string) sourceOption {
 	}
 
 	return func(src *unstructured.Unstructured) {
-		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "serviceAccountKey"); err != nil {
-			framework.FailfWithOffset(3, "Failed to set spec.serviceAccountKey field: %s", err)
+		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "auth", "serviceAccountKey"); err != nil {
+			framework.FailfWithOffset(3, "Failed to set spec.auth.serviceAccountKey field: %s", err)
 		}
 	}
 }

diff --git a/test/e2e/sources/googlecloudstorage/main.go b/test/e2e/sources/googlecloudstorage/main.go
@@ -234,7 +234,7 @@ var _ = Describe("Google Cloud Storage source", func() {
 				)
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring(
-					`"spec.serviceAccountKey" must validate one and only one schema (oneOf).`))
+					`"spec.auth.serviceAccountKey" must validate one and only one schema (oneOf).`))
 			})
 		})
 	})
@@ -301,8 +301,8 @@ func withServiceAccountKey(key string) sourceOption {
 	}
 
 	return func(src *unstructured.Unstructured) {
-		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "serviceAccountKey"); err != nil {
-			framework.FailfWithOffset(3, "Failed to set spec.serviceAccountKey field: %s", err)
+		if err := unstructured.SetNestedMap(src.Object, svcAccKeyMap, "spec", "auth", "serviceAccountKey"); err != nil {
+			framework.FailfWithOffset(3, "Failed to set spec.auth.serviceAccountKey field: %s", err)
 		}
 	}
 }

diff --git a/test/e2e/targets/googlecloudstorage/main.go b/test/e2e/targets/googlecloudstorage/main.go
@@ -61,7 +61,7 @@ const (
 	targetResource = "googlecloudstoragetargets"
 )
 
-const gcpCredentialsJosnSecretKey = "credentialsJson"
+const gcpServiceAccountKey = "serviceAccountKey"
 
 var _ = Describe("Google Cloud Storage target", func() {
 	// NOTE: bucket names aren't allowed to contain "goog"
@@ -293,7 +293,7 @@ var _ = Describe("Google Cloud Storage target", func() {
 				)
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring(
-					"spec.credentialsJson: Required value"))
+					"spec.auth: Required value"))
 			})
 		})
 	})
@@ -335,15 +335,15 @@ func withDiscardCEContext() targetOption {
 
 func withCredentials(secretName string) targetOption {
 	credentials := map[string]interface{}{
-		"secretKeyRef": map[string]interface{}{
+		"valueFromSecret": map[string]interface{}{
 			"name": secretName,
-			"key":  gcpCredentialsJosnSecretKey,
+			"key":  gcpServiceAccountKey,
 		},
 	}
 
 	return func(trgt *unstructured.Unstructured) {
-		if err := unstructured.SetNestedMap(trgt.Object, credentials, "spec", gcpCredentialsJosnSecretKey); err != nil {
-			framework.FailfWithOffset(2, "Failed to set spec.credentialsJson field: %s", err)
+		if err := unstructured.SetNestedMap(trgt.Object, credentials, "spec", "auth", gcpServiceAccountKey); err != nil {
+			framework.FailfWithOffset(2, "Failed to set spec.auth.serviceAccountKey field: %s", err)
 		}
 	}
 }
@@ -356,7 +356,7 @@ func createGCPCredsSecret(c clientset.Interface, namespace string, creds string)
 			GenerateName: "gcp-creds-",
 		},
 		StringData: map[string]string{
-			gcpCredentialsJosnSecretKey: creds,
+			gcpServiceAccountKey: creds,
 		},
 	}