Fixes tests to provide valid JSON

This changes the tests to work with valid JSON as it is now a
requirement of the azure transformer.

Author: theobarberbany

pkg/cloud/azure/azure_test.go

@@ -11,8 +11,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	azure "sigs.k8s.io/cloud-provider-azure/pkg/provider"
 
-	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
 	ratelimitconfig "sigs.k8s.io/cloud-provider-azure/pkg/provider/config"
+
+	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
 )
 
 const (

pkg/cloud/cloud.go

@@ -53,7 +53,6 @@ func GetCloudConfigTransformer(platformStatus *configv1.PlatformStatus) (cloudCo
 		if azurestack.IsAzureStackHub(platformStatus) {
 			return azurestack.CloudConfigTransformer, true, nil
 		}
-		// We need to use the azure CloudConfigTransformer to fix OCPBUGS-25483
 		return azure.CloudConfigTransformer, true, nil
 	case configv1.GCPPlatformType:
 		return common.NoOpTransformer, false, nil

pkg/controllers/cloud_config_sync_controller_test.go

@@ -23,6 +23,8 @@ import (
 const (
 	infraCloudConfName = "test-config"
 	infraCloudConfKey  = "foo"
+
+	defaultAzureConfig = `{"cloud":"AzurePublicCloud","tenantId":"0000000-0000-0000-0000-000000000000","subscriptionId":"0000000-0000-0000-0000-000000000000","vmType":"standard","putVMSSVMBatchSize":0,"enableMigrateToIPBasedBackendPoolAPI":false}`
 )
 
 func makeInfrastructureResource(platform configv1.PlatformType) *configv1.Infrastructure {
@@ -82,22 +84,14 @@ func makeInfraCloudConfig() *corev1.ConfigMap {
 	return &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{
 		Name:      infraCloudConfName,
 		Namespace: OpenshiftConfigNamespace,
-	}, Data: map[string]string{infraCloudConfKey: `{
-    "cloud":"AzurePublicCloud",
-    "tenantId": "0000000-0000-0000-0000-000000000000",
-    "subscriptionId": "0000000-0000-0000-0000-000000000000"
-}`}}
+	}, Data: map[string]string{infraCloudConfKey: defaultAzureConfig}}
 }
 
 func makeManagedCloudConfig() *corev1.ConfigMap {
 	return &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{
 		Name:      managedCloudConfigMapName,
 		Namespace: OpenshiftManagedConfigNamespace,
-	}, Data: map[string]string{"cloud.conf": `{
-    "cloud":"AzurePublicCloud",
-    "tenantId": "0000000-0000-0000-0000-000000000000",
-    "subscriptionId": "0000000-0000-0000-0000-000000000000"
-}`}}
+	}, Data: map[string]string{"cloud.conf": defaultAzureConfig}}
 }
 
 var _ = Describe("isCloudConfigEqual reconciler method", func() {
@@ -150,7 +144,7 @@ var _ = Describe("prepareSourceConfigMap reconciler method", func() {
 
 	It("config preparation should not touch extra fields in infra ConfigMap", func() {
 		extendedInfraConfig := infraCloudConfig.DeepCopy()
-		extendedInfraConfig.Data = map[string]string{infraCloudConfKey: "bar", "bar": "baz"}
+		extendedInfraConfig.Data = map[string]string{infraCloudConfKey: "{}", "{}": "{}"}
 		preparedConfig, err := reconciler.prepareSourceConfigMap(extendedInfraConfig, infra)
 		Expect(err).Should(Succeed())
 		_, ok := preparedConfig.Data[defaultConfigKey]
@@ -276,13 +270,14 @@ var _ = Describe("Cloud config sync controller", func() {
 			if err != nil {
 				return false, err
 			}
-			return syncedCloudConfigMap.Data[defaultConfigKey] == "bar", nil
+			return syncedCloudConfigMap.Data[defaultConfigKey] == defaultAzureConfig, nil
 		}).Should(BeTrue())
 	})
 
 	It("config should be synced up if managed cloud config changed", func() {
+		changedConfigString := `{"cloud":"AzurePublicCloud","tenantId":"0000000-1234-1234-0000-000000000000","subscriptionId":"0000000-0000-0000-0000-000000000000","vmType":"standard","putVMSSVMBatchSize":0,"enableMigrateToIPBasedBackendPoolAPI":false}`
 		changedManagedConfig := managedCloudConfig.DeepCopy()
-		changedManagedConfig.Data = map[string]string{"cloud.conf": "managed one changed"}
+		changedManagedConfig.Data = map[string]string{"cloud.conf": changedConfigString}
 		Expect(cl.Update(ctx, changedManagedConfig)).To(Succeed())
 
 		Eventually(func() (bool, error) {
@@ -291,7 +286,7 @@ var _ = Describe("Cloud config sync controller", func() {
 			if err != nil {
 				return false, err
 			}
-			return syncedCloudConfigMap.Data[defaultConfigKey] == "managed one changed", nil
+			return syncedCloudConfigMap.Data[defaultConfigKey] == changedConfigString, nil
 		}).Should(BeTrue())
 	})
 
@@ -301,14 +296,15 @@ var _ = Describe("Cloud config sync controller", func() {
 			return cl.Get(ctx, syncedConfigMapKey, syncedCloudConfigMap)
 		}, timeout).Should(Succeed())
 
-		syncedCloudConfigMap.Data = map[string]string{"foo": "baz"}
+		changedConfigString := `{"cloud":"AzurePublicCloud","tenantId":"0000000-1234-1234-0000-000000000000","subscriptionId":"0000000-0000-0000-0000-000000000000","vmType":"standard","putVMSSVMBatchSize":0,"enableMigrateToIPBasedBackendPoolAPI":false}`
+		syncedCloudConfigMap.Data = map[string]string{"foo": changedConfigString}
 		Expect(cl.Update(ctx, syncedCloudConfigMap)).To(Succeed())
 		Eventually(func() (bool, error) {
 			err := cl.Get(ctx, syncedConfigMapKey, syncedCloudConfigMap)
 			if err != nil {
 				return false, err
 			}
-			return syncedCloudConfigMap.Data[defaultConfigKey] == "bar", nil
+			return syncedCloudConfigMap.Data[defaultConfigKey] == defaultAzureConfig, nil
 		}).Should(BeTrue())
 
 		Expect(cl.Delete(ctx, syncedCloudConfigMap)).To(Succeed())
@@ -317,7 +313,7 @@ var _ = Describe("Cloud config sync controller", func() {
 			if err != nil {
 				return false, err
 			}
-			return syncedCloudConfigMap.Data[defaultConfigKey] == "bar", nil
+			return syncedCloudConfigMap.Data[defaultConfigKey] == defaultAzureConfig, nil
 		}).Should(BeTrue())
 	})
 
@@ -340,8 +336,9 @@ var _ = Describe("Cloud config sync controller", func() {
 		Expect(cl.Delete(ctx, managedCloudConfig)).Should(Succeed())
 		managedCloudConfig = nil
 
+		changedInfraConfigString := `{"cloud":"AzurePublicCloud","tenantId":"0000000-1234-1234-0000-000000000000","subscriptionId":"0000000-0000-0000-0000-000000000000","vmType":"standard","putVMSSVMBatchSize":0,"enableMigrateToIPBasedBackendPoolAPI":false}`
 		changedInfraConfig := infraCloudConfig.DeepCopy()
-		changedInfraConfig.Data = map[string]string{infraCloudConfKey: "infra one changed"}
+		changedInfraConfig.Data = map[string]string{infraCloudConfKey: changedInfraConfigString}
 		Expect(cl.Update(ctx, changedInfraConfig)).Should(Succeed())
 
 		Eventually(func() (bool, error) {
@@ -350,14 +347,16 @@ var _ = Describe("Cloud config sync controller", func() {
 			if err != nil {
 				return false, err
 			}
-			return syncedCloudConfigMap.Data[defaultConfigKey] == "infra one changed", nil
+			return syncedCloudConfigMap.Data[defaultConfigKey] == changedInfraConfigString, nil
 		}).Should(BeTrue())
 	})
 
 	It("all keys from cloud-config should be synced", func() {
+
+		changedInfraConfigString := `{"cloud":"AzurePublicCloud","tenantId":"0000000-1234-1234-0000-000000000000","subscriptionId":"0000000-0000-0000-0000-000000000000","vmType":"standard","putVMSSVMBatchSize":0,"enableMigrateToIPBasedBackendPoolAPI":false}`
 		changedManagedConfig := managedCloudConfig.DeepCopy()
 		changedManagedConfig.Data = map[string]string{
-			infraCloudConfKey: "infra config", cloudProviderConfigCABundleConfigMapKey: "some pem there",
+			infraCloudConfKey: changedInfraConfigString, cloudProviderConfigCABundleConfigMapKey: "some pem there",
 			"baz": "fizz",
 		}
 		Expect(cl.Update(ctx, changedManagedConfig)).Should(Succeed())