equalfold and nilchecks

Author: hawkowl

pkg/util/computeskus/computeskus.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"slices"
+	"strings"
 
 	sdkcompute "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v7"
 
@@ -55,9 +56,11 @@ func HasCapability(sku *sdkcompute.ResourceSKU, capabilityName string) bool {
 // IsRestricted checks whether given resource SKU is restricted in a given location
 func IsRestricted(sku *sdkcompute.ResourceSKU, location string) bool {
 	for _, restriction := range sku.Restrictions {
-		for _, restrictedLocation := range restriction.RestrictionInfo.Locations {
-			if *restrictedLocation == location {
-				return true
+		if restriction.RestrictionInfo != nil {
+			for _, restrictedLocation := range restriction.RestrictionInfo.Locations {
+				if restrictedLocation != nil && strings.EqualFold(*restrictedLocation, location) {
+					return true
+				}
 			}
 		}
 	}
@@ -92,12 +95,12 @@ func SelectVMSkusInCurrentRegion(ctx context.Context, resourceSkusClient armcomp
 			continue
 		}
 
-		if slices.Contains(skuNames, *sku.Name) {
-			// Make sure it's actually in our location
-			if !slices.ContainsFunc(sku.Locations, func(s *string) bool { return *s == location }) {
-				continue
-			}
+		// Make sure it's actually in our location
+		if !slices.ContainsFunc(sku.Locations, func(s *string) bool { return s != nil && strings.EqualFold(*s, location) }) {
+			continue
+		}
 
+		if slices.Contains(skuNames, *sku.Name) {
 			vmskus[*sku.Name] = sku
 		}
 
@@ -126,7 +129,7 @@ func ListUnrestrictedVMSkusInCurrentRegion(ctx context.Context, resourceSkusClie
 		}
 
 		// Make sure it's actually in our location
-		if !slices.ContainsFunc(sku.Locations, func(s *string) bool { return *s == location }) {
+		if !slices.ContainsFunc(sku.Locations, func(s *string) bool { return s != nil && strings.EqualFold(*s, location) }) {
 			continue
 		}
 

pkg/util/computeskus/computeskus_test.go

@@ -254,6 +254,17 @@ func TestSelectVMSkusInCurrentRegion(t *testing.T) {
 								},
 							},
 						}: nil,
+						// Nil region
+						{
+							Name:         pointerutils.ToPtr("smallmachine_v6"),
+							ResourceType: pointerutils.ToPtr("virtualMachines"),
+							Locations:    []*string{nil},
+							LocationInfo: []*armcompute.ResourceSKULocationInfo{
+								{
+									Location: pointerutils.ToPtr("northus2"),
+								},
+							},
+						}: nil,
 						// Machine that has no locations/locationinfo
 						{
 							Name:         pointerutils.ToPtr("smallmachine_v3"),
@@ -333,7 +344,6 @@ func TestSelectVMSkusInCurrentRegion(t *testing.T) {
 									Location: pointerutils.ToPtr("northus2"),
 								},
 							},
-							Restrictions: []*armcompute.ResourceSKURestrictions{},
 						}: nil,
 						// Machine that has no locations/locationinfo
 						{
@@ -460,6 +470,17 @@ func TestListUnrestrictedSKUNames(t *testing.T) {
 								},
 							},
 						}: nil,
+						// Capitalisation of region
+						{
+							Name:         pointerutils.ToPtr("smallmachine_v10"),
+							ResourceType: pointerutils.ToPtr("virtualMachines"),
+							Locations:    pointerutils.ToSlicePtr([]string{"Northus2"}),
+							LocationInfo: []*armcompute.ResourceSKULocationInfo{
+								{
+									Location: pointerutils.ToPtr("Northus2"),
+								},
+							},
+						}: nil,
 						// Duplicated struct, in case we get two
 						{
 							Name:         pointerutils.ToPtr("smallmachine_v4"),
@@ -483,6 +504,17 @@ func TestListUnrestrictedSKUNames(t *testing.T) {
 								},
 							},
 						}: nil,
+						// Nil region
+						{
+							Name:         pointerutils.ToPtr("smallmachine_v11"),
+							ResourceType: pointerutils.ToPtr("virtualMachines"),
+							Locations:    []*string{nil},
+							LocationInfo: []*armcompute.ResourceSKULocationInfo{
+								{
+									Location: pointerutils.ToPtr("northus2"),
+								},
+							},
+						}: nil,
 						// Restricted in this region
 						{
 							Name:         pointerutils.ToPtr("smallmachine_v2"),
@@ -494,13 +526,50 @@ func TestListUnrestrictedSKUNames(t *testing.T) {
 								},
 							},
 							Restrictions: []*armcompute.ResourceSKURestrictions{
+								{
+									RestrictionInfo: &armcompute.ResourceSKURestrictionInfo{
+										Locations: pointerutils.ToSlicePtr([]string{"somewhereelse"}),
+									},
+								},
 								{
 									RestrictionInfo: &armcompute.ResourceSKURestrictionInfo{
 										Locations: pointerutils.ToSlicePtr([]string{"northus2"}),
 									},
 								},
 							},
 						}: nil,
+						// Restricted in this region, equal fold
+						{
+							Name:         pointerutils.ToPtr("smallmachine_v20"),
+							ResourceType: pointerutils.ToPtr("virtualMachines"),
+							Locations:    pointerutils.ToSlicePtr([]string{"northus2"}),
+							LocationInfo: []*armcompute.ResourceSKULocationInfo{
+								{
+									Location: pointerutils.ToPtr("northus2"),
+								},
+							},
+							Restrictions: []*armcompute.ResourceSKURestrictions{
+								{
+									RestrictionInfo: &armcompute.ResourceSKURestrictionInfo{
+										Locations: pointerutils.ToSlicePtr([]string{"Northus2"}),
+									},
+								},
+							},
+						}: nil,
+						// Nil restriction info
+						{
+							Name:         pointerutils.ToPtr("smallmachine_v1"),
+							ResourceType: pointerutils.ToPtr("virtualMachines"),
+							Locations:    pointerutils.ToSlicePtr([]string{"northus2"}),
+							LocationInfo: []*armcompute.ResourceSKULocationInfo{
+								{
+									Location: pointerutils.ToPtr("northus2"),
+								},
+							},
+							Restrictions: []*armcompute.ResourceSKURestrictions{
+								{},
+							},
+						}: nil,
 						// Machine that has no locations/locationinfo
 						{
 							Name:         pointerutils.ToPtr("smallmachine_v3"),
@@ -522,7 +591,7 @@ func TestListUnrestrictedSKUNames(t *testing.T) {
 					}),
 				)
 			},
-			desired: []string{"bigmachine_v1", "smallmachine_v4"},
+			desired: []string{"bigmachine_v1", "smallmachine_v1", "smallmachine_v10", "smallmachine_v4"},
 		},
 		{
 			name: "duplicate VM structs don't lead to duplicated names",