Merge pull request #4659 from kersten/fix/tests-avoid-shadowing-err-output-status

🌱 (chore): avoid shadowing of 'err' and related variables in E2E and external plugin tests

Author: k8s-ci-robot

pkg/model/resource/resource_test.go

@@ -199,7 +199,7 @@ var _ = Describe("Resource", func() {
 			webhookVersion = "v1"
 		)
 
-		res := Resource{
+		res = Resource{
 			GVK:    gvk,
 			Plural: plural,
 			Path:   path,

pkg/plugins/external/external_test.go

@@ -142,7 +142,8 @@ var _ = Describe("Run external plugin using Scaffold", func() {
 
 		AfterEach(func() {
 			filename := filepath.Join("tmp", "externalPlugin", "LICENSE")
-			fileInfo, err := fs.FS.Stat(filename)
+			var fileInfo os.FileInfo
+			fileInfo, err = fs.FS.Stat(filename)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(fileInfo).NotTo(BeNil())
 		})

test/e2e/deployimage/plugin_cluster_test.go

@@ -100,7 +100,8 @@ func Run(kbc *utils.TestContext) {
 	By("validating that the controller-manager pod is running as expected")
 	verifyControllerUp := func(g Gomega) {
 		// Get pod name
-		podOutput, err := kbc.Kubectl.Get(
+		var podOutput string
+		podOutput, err = kbc.Kubectl.Get(
 			true,
 			"pods", "-l", "control-plane=controller-manager",
 			"-o", "go-template={{ range .items }}{{ if not .metadata.deletionTimestamp }}{{ .metadata.name }}"+
@@ -116,8 +117,8 @@ func Run(kbc *utils.TestContext) {
 			To(Equal("Running"), "incorrect controller pod status")
 	}
 	defer func() {
-		out, err := kbc.Kubectl.CommandInNamespace("describe", "all")
-		Expect(err).NotTo(HaveOccurred())
+		out, errDescribe := kbc.Kubectl.CommandInNamespace("describe", "all")
+		Expect(errDescribe).NotTo(HaveOccurred())
 		_, _ = fmt.Fprintln(GinkgoWriter, out)
 	}()
 	Eventually(verifyControllerUp).Should(Succeed())

test/e2e/v4/plugin_cluster_test.go

@@ -194,7 +194,7 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 
 	By("validating that the Prometheus manager has provisioned the Service")
 	Eventually(func(g Gomega) {
-		_, err := kbc.Kubectl.Get(
+		_, err = kbc.Kubectl.Get(
 			false,
 			"Service", "prometheus-operator")
 		g.Expect(err).NotTo(HaveOccurred())
@@ -208,7 +208,8 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 
 	if hasNetworkPolicies {
 		By("Checking for Calico pods")
-		outputGet, err := kbc.Kubectl.Get(
+		var outputGet string
+		outputGet, err = kbc.Kubectl.Get(
 			false,
 			"pods",
 			"-n", "kube-system",
@@ -224,7 +225,8 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 				"metrics=enabled")).Error().NotTo(HaveOccurred())
 
 			By("Ensuring the Allow Metrics Traffic NetworkPolicy exists", func() {
-				output, err := kbc.Kubectl.Get(
+				var output string
+				output, err = kbc.Kubectl.Get(
 					true,
 					"networkpolicy", fmt.Sprintf("e2e-%s-allow-metrics-traffic", kbc.TestSuffix),
 				)
@@ -241,7 +243,8 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Ensuring the allow-webhook-traffic NetworkPolicy exists", func() {
-				output, err := kbc.Kubectl.Get(
+				var output string
+				output, err = kbc.Kubectl.Get(
 					true,
 					"networkpolicy", fmt.Sprintf("e2e-%s-allow-webhook-traffic", kbc.TestSuffix),
 				)
@@ -256,7 +259,8 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 		By("validating that cert-manager has provisioned the certificate Secret")
 
 		verifyWebhookCert := func(g Gomega) {
-			output, err := kbc.Kubectl.Get(
+			var output string
+			output, err = kbc.Kubectl.Get(
 				true,
 				"secrets", "webhook-server-cert")
 			g.Expect(err).ToNot(HaveOccurred(), "webhook-server-cert should exist in the namespace")
@@ -267,7 +271,8 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 
 		By("validating that the mutating|validating webhooks have the CA injected")
 		verifyCAInjection := func(g Gomega) {
-			mwhOutput, err := kbc.Kubectl.Get(
+			var mwhOutput, vwhOutput string
+			mwhOutput, err = kbc.Kubectl.Get(
 				false,
 				"mutatingwebhookconfigurations.admissionregistration.k8s.io",
 				fmt.Sprintf("e2e-%s-mutating-webhook-configuration", kbc.TestSuffix),
@@ -276,7 +281,7 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 			// check that ca should be long enough, because there may be a place holder "\n"
 			g.Expect(len(mwhOutput)).To(BeNumerically(">", 10))
 
-			vwhOutput, err := kbc.Kubectl.Get(
+			vwhOutput, err = kbc.Kubectl.Get(
 				false,
 				"validatingwebhookconfigurations.admissionregistration.k8s.io",
 				fmt.Sprintf("e2e-%s-validating-webhook-configuration", kbc.TestSuffix),
@@ -291,7 +296,8 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 		By("validating that the CA injection is applied for CRD conversion")
 		crdKind := "ConversionTest"
 		verifyCAInjection = func(g Gomega) {
-			crdOutput, err := kbc.Kubectl.Get(
+			var crdOutput string
+			crdOutput, err = kbc.Kubectl.Get(
 				false,
 				"customresourcedefinition.apiextensions.k8s.io",
 				"-o", fmt.Sprintf(
@@ -367,7 +373,7 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
 		By("applying the CR in the created namespace")
 
 		applySampleNamespaced := func(g Gomega) {
-			_, err := kbc.Kubectl.Apply(false, "-n", namespace, "-f", sampleFile)
+			_, err = kbc.Kubectl.Apply(false, "-n", namespace, "-f", sampleFile)
 			g.Expect(err).To(Not(HaveOccurred()))
 		}
 		Eventually(applySampleNamespaced, 2*time.Minute, time.Second).Should(Succeed())
@@ -494,7 +500,8 @@ func getMetricsOutput(kbc *utils.TestContext) string {
 
 	By("ensuring the service endpoint is ready")
 	checkServiceEndpoint := func(g Gomega) {
-		output, err := kbc.Kubectl.Get(
+		var output string
+		output, err = kbc.Kubectl.Get(
 			true,
 			"endpoints", fmt.Sprintf("e2e-%s-controller-manager-metrics-service", kbc.TestSuffix),
 			"-o", "jsonpath={.subsets[*].addresses[*].ip}",
@@ -512,7 +519,8 @@ func getMetricsOutput(kbc *utils.TestContext) string {
 
 	By("validating that the curl pod is running as expected")
 	verifyCurlUp := func(g Gomega) {
-		status, err := kbc.Kubectl.Get(
+		var status string
+		status, err = kbc.Kubectl.Get(
 			true,
 			"pods", "curl", "-o", "jsonpath={.status.phase}")
 		g.Expect(err).NotTo(HaveOccurred())