Clean up repetition in transformer tests

Signed-off-by: Nolan Brubaker <[email protected]>

Author: nrb

pkg/cloud/azure/azure_test.go

@@ -125,6 +125,25 @@ func makeInfrastructureResource(platform configv1.PlatformType, cloudName config
 	return &cfg
 }
 
+// makeExpectedConfig sets some repetitive default fields for tests, assuming that they are not already set.
+func makeExpectedConfig(config *azure.Config, cloud configv1.AzureCloudEnvironment) azure.Config {
+	if config.ClusterServiceLoadBalancerHealthProbeMode == "" {
+		config.ClusterServiceLoadBalancerHealthProbeMode = azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared
+	}
+
+	if config.VMType == "" {
+		config.VMType = "standard"
+	}
+
+	config.AzureAuthConfig = ratelimitconfig.AzureAuthConfig{
+		ARMClientConfig: azclient.ARMClientConfig{
+			Cloud: string(cloud),
+		},
+	}
+
+	return *config
+}
+
 // This test is a little complicated with all the JSON marshalling and
 // unmarshalling, but it is necessary due to the nature of how this data
 // is stored in Kuberenetes. The ConfigMaps containing the cloud config
@@ -148,45 +167,45 @@ func TestCloudConfigTransformer(t *testing.T) {
 		{
 			name:     "Azure sets the vmType to standard and cloud to AzurePublicCloud when neither is set",
 			source:   azure.Config{},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzurePublicCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzurePublicCloud),
 		},
 		{
 			name:     "Azure doesn't modify vmType if user set",
 			source:   azure.Config{VMType: "vmss"},
-			expected: azure.Config{VMType: "vmss", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{VMType: "vmss"}, configv1.AzurePublicCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzurePublicCloud),
 		},
 		{
 			name: "Azure sets the cloud to AzurePublicCloud and keeps existing fields",
 			source: azure.Config{
 				ResourceGroup: "test-rg",
 			},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, ResourceGroup: "test-rg", AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{ResourceGroup: "test-rg"}, configv1.AzurePublicCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzurePublicCloud),
 		},
 		{
 			name:     "Azure keeps the cloud set to AzurePublicCloud",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzurePublicCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzurePublicCloud),
 		},
 		{
 			name:     "Azure keeps the cloud set to US Gov cloud",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzureUSGovernmentCloud)}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzureUSGovernmentCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzureUSGovernmentCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzureUSGovernmentCloud),
 		},
 		{
 			name:     "Azure keeps the cloud set to China cloud",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzureChinaCloud)}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzureChinaCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzureChinaCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzureChinaCloud),
 		},
 		{
 			name:     "Azure keeps the cloud set to German cloud",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzureGermanCloud)}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzureGermanCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzureGermanCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzureGermanCloud),
 		},
 		{
@@ -198,19 +217,19 @@ func TestCloudConfigTransformer(t *testing.T) {
 		{
 			name:     "Azure keeps the cloud set in the source when there is not one set in infrastructure",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzurePublicCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, ""),
 		},
 		{
 			name:     "Azure sets the cloud to match the infrastructure if an empty string is provided in source",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: ""}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzurePublicCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzurePublicCloud),
 		},
 		{
 			name:     "Azure sets the cloud to match the infrastructure if an empty string is provided in source and the infrastructure is non standard",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: ""}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzureUSGovernmentCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzureUSGovernmentCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzureUSGovernmentCloud),
 		},
 		{
@@ -222,7 +241,7 @@ func TestCloudConfigTransformer(t *testing.T) {
 		{
 			name:     "Azure keeps the cloud set to AzurePublicCloud if the source is upper case",
 			source:   azure.Config{AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: "AZUREPUBLICCLOUD"}}},
-			expected: azure.Config{VMType: "standard", ClusterServiceLoadBalancerHealthProbeMode: azureconsts.ClusterServiceLoadBalancerHealthProbeModeShared, AzureAuthConfig: ratelimitconfig.AzureAuthConfig{ARMClientConfig: azclient.ARMClientConfig{Cloud: string(configv1.AzurePublicCloud)}}},
+			expected: makeExpectedConfig(&azure.Config{}, configv1.AzurePublicCloud),
 			infra:    makeInfrastructureResource(configv1.AzurePlatformType, configv1.AzurePublicCloud),
 		},
 	}

pkg/controllers/cloud_config_sync_controller_test.go

@@ -264,11 +264,11 @@ var _ = Describe("Cloud config sync controller", func() {
 	})
 
 	It("config should be synced up after first reconcile", func() {
-		Eventually(func(g Gomega) (string, error) {
+		Eventually(func(g Gomega) string {
 			syncedCloudConfigMap := &corev1.ConfigMap{}
 			err := cl.Get(ctx, syncedConfigMapKey, syncedCloudConfigMap)
 			g.Expect(err).NotTo(HaveOccurred())
-			return syncedCloudConfigMap.Data[defaultConfigKey], nil
+			return syncedCloudConfigMap.Data[defaultConfigKey]
 		}).Should(Equal(defaultAzureConfig))
 	})
 
@@ -278,11 +278,11 @@ var _ = Describe("Cloud config sync controller", func() {
 		changedManagedConfig.Data = map[string]string{"cloud.conf": changedConfigString}
 		Expect(cl.Update(ctx, changedManagedConfig)).To(Succeed())
 
-		Eventually(func(g Gomega) (string, error) {
+		Eventually(func(g Gomega) string {
 			syncedCloudConfigMap := &corev1.ConfigMap{}
 			err := cl.Get(ctx, syncedConfigMapKey, syncedCloudConfigMap)
 			g.Expect(err).NotTo(HaveOccurred())
-			return syncedCloudConfigMap.Data[defaultConfigKey], nil
+			return syncedCloudConfigMap.Data[defaultConfigKey]
 		}).Should(Equal(changedConfigString))
 	})
 
@@ -295,10 +295,10 @@ var _ = Describe("Cloud config sync controller", func() {
 		changedConfigString := `{"cloud":"AzurePublicCloud","tenantId":"0000000-1234-1234-0000-000000000000","subscriptionId":"0000000-0000-0000-0000-000000000000","vmType":"standard","putVMSSVMBatchSize":0,"enableMigrateToIPBasedBackendPoolAPI":false,"clusterServiceLoadBalancerHealthProbeMode":"shared"}`
 		syncedCloudConfigMap.Data = map[string]string{"foo": changedConfigString}
 		Expect(cl.Update(ctx, syncedCloudConfigMap)).To(Succeed())
-		Eventually(func(g Gomega) (string, error) {
+		Eventually(func(g Gomega) string {
 			err := cl.Get(ctx, syncedConfigMapKey, syncedCloudConfigMap)
 			g.Expect(err).NotTo(HaveOccurred())
-			return syncedCloudConfigMap.Data[defaultConfigKey], nil
+			return syncedCloudConfigMap.Data[defaultConfigKey]
 		}).Should(Equal(defaultAzureConfig))
 
 		Expect(cl.Delete(ctx, syncedCloudConfigMap)).To(Succeed())
@@ -335,11 +335,11 @@ var _ = Describe("Cloud config sync controller", func() {
 		changedInfraConfig.Data = map[string]string{infraCloudConfKey: changedInfraConfigString}
 		Expect(cl.Update(ctx, changedInfraConfig)).Should(Succeed())
 
-		Eventually(func(g Gomega) (string, error) {
+		Eventually(func(g Gomega) string {
 			syncedCloudConfigMap := &corev1.ConfigMap{}
 			err := cl.Get(ctx, syncedConfigMapKey, syncedCloudConfigMap)
 			g.Expect(err).NotTo(HaveOccurred())
-			return syncedCloudConfigMap.Data[defaultConfigKey], nil
+			return syncedCloudConfigMap.Data[defaultConfigKey]
 		}).Should(Equal(changedInfraConfigString))
 	})
 
@@ -353,11 +353,11 @@ var _ = Describe("Cloud config sync controller", func() {
 		}
 		Expect(cl.Update(ctx, changedManagedConfig)).Should(Succeed())
 
-		Eventually(func(g Gomega) (int, error) {
+		Eventually(func(g Gomega) int {
 			syncedCloudConfigMap := &corev1.ConfigMap{}
 			err := cl.Get(ctx, syncedConfigMapKey, syncedCloudConfigMap)
 			g.Expect(err).NotTo(HaveOccurred())
-			return len(syncedCloudConfigMap.Data), nil
+			return len(syncedCloudConfigMap.Data)
 		}).Should(Equal(3))
 	})
 })