Fix some unit test issues

kubernetes-sigs · Aug 21, 2023 · 6b286b9 · 6b286b9
1 parent 1f964db
commit 6b286b9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/azure/services/managedclusters/spec.go b/azure/services/managedclusters/spec.go
@@ -469,7 +469,7 @@ func (s *ManagedClusterSpec) Parameters(ctx context.Context, existing interface{
 		managedCluster.Properties.AgentPoolProfiles = existingMC.Properties.AgentPoolProfiles
 
 		// if the AuthorizedIPRanges is nil in the user-updated spec, but not nil in the existing spec, then
-		// we need to set the AuthorizedIPRanges to empty array (&[]string{}) once so that the Azure API will
+		// we need to set the AuthorizedIPRanges to empty array ([]*string{}) once so that the Azure API will
 		// update the existing authorized IP ranges to nil.
 		if !isAuthIPRangesNilOrEmpty(existingMC) && isAuthIPRangesNilOrEmpty(managedCluster) {
 			log.V(4).Info("managed cluster spec has nil AuthorizedIPRanges, updating existing authorized IP ranges to an empty list")
@@ -718,5 +718,5 @@ func getIdentity(identity *infrav1.Identity) (managedClusterIdentity *armcontain
 func isAuthIPRangesNilOrEmpty(managedCluster armcontainerservice.ManagedCluster) bool {
 	return managedCluster.Properties.APIServerAccessProfile == nil ||
 		managedCluster.Properties.APIServerAccessProfile.AuthorizedIPRanges == nil ||
-		reflect.DeepEqual(managedCluster.Properties.APIServerAccessProfile.AuthorizedIPRanges, &[]string{})
+		reflect.DeepEqual(managedCluster.Properties.APIServerAccessProfile.AuthorizedIPRanges, []*string{})
 }
diff --git a/azure/services/managedclusters/spec_test.go b/azure/services/managedclusters/spec_test.go
@@ -69,7 +69,7 @@ func TestParameters(t *testing.T) {
 					"test-tag": "test-value",
 				},
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				SSHPublicKey:    base64.StdEncoding.EncodeToString([]byte("test-ssh-key")),
 				GetAllAgentPools: func() ([]azure.ResourceSpecGetter, error) {
 					return []azure.ResourceSpecGetter{
@@ -116,7 +116,7 @@ func TestParameters(t *testing.T) {
 					"test-tag": "test-value",
 				},
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 			},
 			expect: func(g *WithT, result interface{}) {
 				g.Expect(result).To(BeNil())
@@ -133,7 +133,7 @@ func TestParameters(t *testing.T) {
 					"test-tag": "test-value",
 				},
 				Version:         "v1.22.99",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				Identity: &infrav1.Identity{
 					Type:                           infrav1.ManagedControlPlaneIdentityTypeUserAssigned,
 					UserAssignedIdentityResourceID: "/resource/ID",
@@ -157,7 +157,7 @@ func TestParameters(t *testing.T) {
 				Location:        "test-location",
 				Tags:            nil,
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 			},
 			expect: func(g *WithT, result interface{}) {
 				// Additional tags are handled by azure/services/tags, so a diff
@@ -174,7 +174,7 @@ func TestParameters(t *testing.T) {
 				Location:        "test-location",
 				Tags:            nil,
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				SSHPublicKey:    base64.StdEncoding.EncodeToString([]byte("test-ssh-key")),
 				GetAllAgentPools: func() ([]azure.ResourceSpecGetter, error) {
 					return []azure.ResourceSpecGetter{
@@ -205,7 +205,7 @@ func TestParameters(t *testing.T) {
 				Location:        "test-location",
 				Tags:            nil,
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				HTTPProxyConfig: &HTTPProxyConfig{
 					HTTPProxy:  ptr.To("http://proxy.com"),
 					HTTPSProxy: ptr.To("https://proxy.com"),
@@ -229,7 +229,7 @@ func TestParameters(t *testing.T) {
 				Location:        "test-location",
 				Tags:            nil,
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				HTTPProxyConfig: &HTTPProxyConfig{
 					NoProxy: []string{"noproxy1", "noproxy2"},
 				},
@@ -240,7 +240,7 @@ func TestParameters(t *testing.T) {
 			expect: func(g *WithT, result interface{}) {
 				g.Expect(result).To(BeAssignableToTypeOf(armcontainerservice.ManagedCluster{}))
 				g.Expect(result.(armcontainerservice.ManagedCluster).Properties.HTTPProxyConfig).To(Not(BeNil()))
-				g.Expect((result.(armcontainerservice.ManagedCluster).Properties.HTTPProxyConfig.NoProxy)).To(Equal([]string{"noproxy1", "noproxy2"}))
+				g.Expect((result.(armcontainerservice.ManagedCluster).Properties.HTTPProxyConfig.NoProxy)).To(Equal([]*string{ptr.To("noproxy1"), ptr.To("noproxy2")}))
 			},
 		},
 		{
@@ -252,7 +252,7 @@ func TestParameters(t *testing.T) {
 				Location:        "test-location",
 				Tags:            nil,
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				SSHPublicKey:    "",
 				GetAllAgentPools: func() ([]azure.ResourceSpecGetter, error) {
 					return []azure.ResourceSpecGetter{
@@ -284,7 +284,7 @@ func TestParameters(t *testing.T) {
 					"test-tag": "test-value",
 				},
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				APIServerAccessProfile: &APIServerAccessProfile{
 					AuthorizedIPRanges: func() []string {
 						var arr []string
@@ -307,7 +307,7 @@ func TestParameters(t *testing.T) {
 					"test-tag": "test-value",
 				},
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 			},
 			expect: func(g *WithT, result interface{}) {
 				g.Expect(result).To(BeAssignableToTypeOf(armcontainerservice.ManagedCluster{}))
@@ -326,15 +326,15 @@ func TestParameters(t *testing.T) {
 					"test-tag": "test-value",
 				},
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				APIServerAccessProfile: &APIServerAccessProfile{
 					AuthorizedIPRanges: []string{"192.168.0.1/32, 192.168.0.2/32, 192.168.0.3/32"},
 				},
 			},
 			expect: func(g *WithT, result interface{}) {
 				g.Expect(result).To(BeAssignableToTypeOf(armcontainerservice.ManagedCluster{}))
 				g.Expect(result.(armcontainerservice.ManagedCluster).Properties.APIServerAccessProfile).To(Not(BeNil()))
-				g.Expect(result.(armcontainerservice.ManagedCluster).Properties.APIServerAccessProfile.AuthorizedIPRanges).To(Equal([]*string{ptr.To("192.168.0.1/32"), ptr.To("192.168.0.2/32"), ptr.To("192.168.0.3/32")}))
+				g.Expect(result.(armcontainerservice.ManagedCluster).Properties.APIServerAccessProfile.AuthorizedIPRanges).To(Equal([]*string{ptr.To("192.168.0.1/32, 192.168.0.2/32, 192.168.0.3/32")}))
 			},
 		},
 		{
@@ -348,7 +348,7 @@ func TestParameters(t *testing.T) {
 					"test-tag": "test-value",
 				},
 				Version:         "v1.22.0",
-				LoadBalancerSKU: "Standard",
+				LoadBalancerSKU: "standard",
 				APIServerAccessProfile: &APIServerAccessProfile{
 					AuthorizedIPRanges: []string{"192.168.0.1/32, 192.168.0.2/32, 192.168.0.3/32"},
 				},