🌱 clusterctl: Refactor proxy configuration tests

Author: dlipovetsky

cmd/clusterctl/client/cluster/proxy_test.go

@@ -68,7 +68,7 @@ func TestProxyGetConfig(t *testing.T) {
 				g.Expect(err).ToNot(HaveOccurred())
 				defer os.RemoveAll(dir)
 				configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
-				g.Expect(os.WriteFile(configFile, []byte(tt.kubeconfigContents), 0600)).To(Succeed())
+				g.Expect(os.WriteFile(configFile, []byte(tt.kubeconfigContents), 0o600)).To(Succeed())
 
 				proxy := NewProxy(Kubeconfig{Path: configFile, Context: tt.context})
 				conf, err := proxy.GetConfig()
@@ -89,32 +89,45 @@ func TestProxyGetConfig(t *testing.T) {
 		}
 	})
 
-	t.Run("configure timeout", func(t *testing.T) {
-		g := NewWithT(t)
-		dir, err := os.MkdirTemp("", "clusterctl")
-		g.Expect(err).ToNot(HaveOccurred())
-		defer os.RemoveAll(dir)
-		configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
-		g.Expect(os.WriteFile(configFile, []byte(kubeconfig("management", "default")), 0600)).To(Succeed())
-
-		proxy := NewProxy(Kubeconfig{Path: configFile, Context: "management"}, InjectProxyTimeout(23*time.Second))
-		conf, err := proxy.GetConfig()
-		g.Expect(err).ToNot(HaveOccurred())
-		g.Expect(conf.Timeout.String()).To(Equal("23s"))
-	})
-
-	t.Run("configure warning handler", func(t *testing.T) {
-		g := NewWithT(t)
-		dir, err := os.MkdirTemp("", "clusterctl")
-		g.Expect(err).ToNot(HaveOccurred())
-		defer os.RemoveAll(dir)
-		configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
-		g.Expect(os.WriteFile(configFile, []byte(kubeconfig("management", "default")), 0o600)).To(Succeed())
+	t.Run("configure option", func(t *testing.T) {
+		tests := []struct {
+			name         string
+			option       ProxyOption
+			optionTester func(t *testing.T, r *rest.Config, e error)
+		}{
+			{
+				name:   "timeout",
+				option: InjectProxyTimeout(23 * time.Second),
+				optionTester: func(t *testing.T, r *rest.Config, e error) {
+					g := NewWithT(t)
+					g.Expect(e).ToNot(HaveOccurred())
+					g.Expect(r.Timeout.String()).To(Equal("23s"))
+				},
+			},
+			{
+				name:   "warning handler",
+				option: InjectWarningHandler(rest.NoWarnings{}),
+				optionTester: func(t *testing.T, r *rest.Config, e error) {
+					g := NewWithT(t)
+					g.Expect(e).ToNot(HaveOccurred())
+					g.Expect(r.WarningHandler).To(Equal(rest.NoWarnings{}))
+				},
+			},
+		}
+		for _, tt := range tests {
+			t.Run(tt.name, func(t *testing.T) {
+				g := NewWithT(t)
+				dir, err := os.MkdirTemp("", "clusterctl")
+				g.Expect(err).ToNot(HaveOccurred())
+				defer os.RemoveAll(dir)
+				configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
+				g.Expect(os.WriteFile(configFile, []byte(kubeconfig("management", "default")), 0o600)).To(Succeed())
 
-		proxy := NewProxy(Kubeconfig{Path: configFile, Context: "management"}, InjectWarningHandler(rest.NoWarnings{}))
-		conf, err := proxy.GetConfig()
-		g.Expect(err).ToNot(HaveOccurred())
-		g.Expect(conf.WarningHandler).To(Equal(rest.NoWarnings{}))
+				proxy := NewProxy(Kubeconfig{Path: configFile, Context: "management"}, tt.option)
+				conf, err := proxy.GetConfig()
+				tt.optionTester(t, conf, err)
+			})
+		}
 	})
 }
 
@@ -136,7 +149,7 @@ func TestKUBECONFIGEnvVar(t *testing.T) {
 		g.Expect(err).ToNot(HaveOccurred())
 		defer os.RemoveAll(dir)
 		configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
-		g.Expect(os.WriteFile(configFile, []byte(kubeconfigContents), 0600)).To(Succeed())
+		g.Expect(os.WriteFile(configFile, []byte(kubeconfigContents), 0o600)).To(Succeed())
 
 		proxy := NewProxy(
 			// dont't give an explicit path but rather define the file in the
@@ -164,7 +177,7 @@ func TestKUBECONFIGEnvVar(t *testing.T) {
 		g.Expect(err).ToNot(HaveOccurred())
 		defer os.RemoveAll(dir)
 		configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
-		g.Expect(os.WriteFile(configFile, []byte(kubeconfigContents), 0600)).To(Succeed())
+		g.Expect(os.WriteFile(configFile, []byte(kubeconfigContents), 0o600)).To(Succeed())
 
 		proxy := NewProxy(
 			// dont't give an explicit path but rather define the file in the
@@ -241,7 +254,7 @@ func TestProxyCurrentNamespace(t *testing.T) {
 				g.Expect(err).ToNot(HaveOccurred())
 				defer os.RemoveAll(dir)
 				configFile = filepath.Join(dir, ".test-kubeconfig.yaml")
-				g.Expect(os.WriteFile(configFile, []byte(tt.kubeconfigContents), 0600)).To(Succeed())
+				g.Expect(os.WriteFile(configFile, []byte(tt.kubeconfigContents), 0o600)).To(Succeed())
 			}
 
 			proxy := NewProxy(Kubeconfig{Path: configFile, Context: tt.kubeconfigContext})