test: A lot more cleanup and formatting for tests

test/e2e/annotations/annotations_suite_test.go

@@ -28,43 +28,41 @@ func TestAnnotations(t *testing.T) {
 	RunSpecs(t, "Annotations Strategy E2E Suite")
 }
 
-var _ = BeforeSuite(
-	func() {
-		var err error
-		ctx, cancel = context.WithCancel(context.Background())
+var _ = BeforeSuite(func() {
+	var err error
+	ctx, cancel = context.WithCancel(context.Background())
 
-		testEnv, err = utils.SetupTestEnvironment(ctx, "reloader-annotations-test")
-		Expect(err).NotTo(HaveOccurred(), "Failed to setup test environment")
+	testEnv, err = utils.SetupTestEnvironment(ctx, "reloader-annotations-test")
+	Expect(err).NotTo(HaveOccurred(), "Failed to setup test environment")
 
-		kubeClient = testEnv.KubeClient
-		csiClient = testEnv.CSIClient
-		restConfig = testEnv.RestConfig
-		testNamespace = testEnv.Namespace
+	kubeClient = testEnv.KubeClient
+	csiClient = testEnv.CSIClient
+	restConfig = testEnv.RestConfig
+	testNamespace = testEnv.Namespace
 
-		deployValues := map[string]string{
-			"reloader.reloadStrategy": "annotations",
-			"reloader.watchGlobally":  "false", // Only watch own namespace to prevent cross-talk between test suites
-		}
+	deployValues := map[string]string{
+		"reloader.reloadStrategy": "annotations",
+		"reloader.watchGlobally":  "false", // Only watch own namespace to prevent cross-talk between test suites
+	}
 
-		if utils.IsCSIDriverInstalled(ctx, csiClient) {
-			deployValues["reloader.enableCSIIntegration"] = "true"
-			GinkgoWriter.Println("Deploying Reloader with CSI integration support")
-		}
+	if utils.IsCSIDriverInstalled(ctx, csiClient) {
+		deployValues["reloader.enableCSIIntegration"] = "true"
+		GinkgoWriter.Println("Deploying Reloader with CSI integration support")
+	}
 
-		err = testEnv.DeployAndWait(deployValues)
-		Expect(err).NotTo(HaveOccurred(), "Failed to deploy Reloader")
-	})
+	err = testEnv.DeployAndWait(deployValues)
+	Expect(err).NotTo(HaveOccurred(), "Failed to deploy Reloader")
+})
 
-var _ = AfterSuite(
-	func() {
-		if testEnv != nil {
-			err := testEnv.Cleanup()
-			Expect(err).NotTo(HaveOccurred(), "Failed to cleanup test environment")
-		}
+var _ = AfterSuite(func() {
+	if testEnv != nil {
+		err := testEnv.Cleanup()
+		Expect(err).NotTo(HaveOccurred(), "Failed to cleanup test environment")
+	}
 
-		if cancel != nil {
-			cancel()
-		}
+	if cancel != nil {
+		cancel()
+	}
 
-		GinkgoWriter.Println("Annotations E2E Suite cleanup complete")
-	})
+	GinkgoWriter.Println("Annotations E2E Suite cleanup complete")
+})

test/e2e/annotations/auto_reload_test.go

@@ -56,8 +56,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -85,8 +84,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret data")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
-				map[string]string{"password": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName, map[string]string{"password": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -119,8 +117,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"config": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"config": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -150,8 +147,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment is NOT reloaded (negative test)")
@@ -187,8 +183,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"config": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"config": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -223,8 +218,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
-				map[string]string{"secret": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName, map[string]string{"secret": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -247,8 +241,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 
 		It("should reload Deployment when SecretProviderClassPodStatus changes", func() {
 			By("Creating a secret in Vault")
-			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath,
-				map[string]string{"api_key": "initial-value-v1"})
+			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "initial-value-v1"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Creating a SecretProviderClass pointing to Vault secret")
@@ -278,8 +271,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			GinkgoWriter.Printf("Initial SPCPS version: %s\n", initialVersion)
 
 			By("Updating the Vault secret")
-			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath,
-				map[string]string{"api_key": "updated-value-v2"})
+			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "updated-value-v2"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for CSI driver to sync the new secret version")
@@ -296,8 +288,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 
 		It("should NOT reload Deployment when ConfigMap changes (only SPC auto enabled)", func() {
 			By("Creating a secret in Vault")
-			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath,
-				map[string]string{"api_key": "initial-value-v1"})
+			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "initial-value-v1"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Creating a SecretProviderClass pointing to Vault secret")
@@ -327,8 +318,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap (should NOT trigger reload with SPC auto only)")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded for ConfigMap change")
@@ -343,8 +333,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Vault secret (should trigger reload)")
-			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath,
-				map[string]string{"api_key": "updated-value-v2"})
+			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "updated-value-v2"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for CSI driver to sync the new secret version")
@@ -360,8 +349,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 
 		It("should reload when using combined auto=true annotation for SPC", func() {
 			By("Creating a secret in Vault")
-			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath,
-				map[string]string{"api_key": "initial-value-v1"})
+			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "initial-value-v1"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Creating a SecretProviderClass pointing to Vault secret")
@@ -389,8 +377,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Vault secret")
-			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath,
-				map[string]string{"api_key": "updated-value-v2"})
+			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "updated-value-v2"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for CSI driver to sync the new secret version")
@@ -435,8 +422,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the second ConfigMap (auto-detected)")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2,
-				map[string]string{"key2": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2, map[string]string{"key2": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")

test/e2e/annotations/combination_test.go

@@ -59,8 +59,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the auto-detected ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -94,8 +93,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the explicitly listed ConfigMap (not mounted)")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2,
-				map[string]string{"extra": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2, map[string]string{"extra": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -129,8 +127,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the explicitly listed Secret")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName2,
-				map[string]string{"api-key": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName2, map[string]string{"api-key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -167,8 +164,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2,
-				map[string]string{"excluded": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2, map[string]string{"excluded": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (negative test)")
@@ -204,8 +200,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the non-excluded ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -240,8 +235,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded Secret")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName2,
-				map[string]string{"excluded": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName2, map[string]string{"excluded": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (negative test)")
@@ -274,8 +268,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the second ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2,
-				map[string]string{"key2": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2, map[string]string{"key2": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -305,8 +298,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the first Secret")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
-				map[string]string{"key1": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName, map[string]string{"key1": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -339,8 +331,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
-				map[string]string{"password": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName, map[string]string{"password": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")

test/e2e/annotations/exclude_test.go

@@ -62,8 +62,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (excluded ConfigMap)")
@@ -100,8 +99,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the non-excluded ConfigMap")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2,
-				map[string]string{"key2": "updated2"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName2, map[string]string{"key2": "updated2"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -139,8 +137,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded Secret")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
-				map[string]string{"password": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName, map[string]string{"password": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (excluded Secret)")
@@ -177,8 +174,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the non-excluded Secret")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName2,
-				map[string]string{"password2": "updated2"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName2, map[string]string{"password2": "updated2"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")

test/e2e/annotations/pause_period_test.go

@@ -47,8 +47,7 @@ var _ = Describe("Pause Period Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -82,8 +81,7 @@ var _ = Describe("Pause Period Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")

test/e2e/annotations/resource_ignore_test.go

@@ -48,8 +48,7 @@ var _ = Describe("Resource Ignore Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (negative test)")
@@ -79,8 +78,7 @@ var _ = Describe("Resource Ignore Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret data")
-			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
-				map[string]string{"password": "updated"})
+			err = utils.UpdateSecretFromStrings(ctx, kubeClient, testNamespace, secretName, map[string]string{"password": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (negative test)")

test/e2e/annotations/search_match_test.go

@@ -45,8 +45,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be reloaded")
@@ -74,8 +73,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (negative test)")
@@ -105,8 +103,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Verifying Deployment was NOT reloaded (negative test)")
@@ -150,8 +147,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
-			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName,
-				map[string]string{"key": "updated"})
+			err = utils.UpdateConfigMap(ctx, kubeClient, testNamespace, configMapName, map[string]string{"key": "updated"})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for first Deployment to be reloaded")