fix(azure/aks): Tighten VM Price Store API Filter to Prevent Timeout (#885)

Co-authored-by: belén <38337779+rooneyshuman@users.noreply.github.com>

Author: stephan-rayner

pkg/azure/aks/vm_price_store.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	AzurePriceSearchFilter = `serviceName eq 'Virtual Machines' and priceType eq 'Consumption'`
+	AzurePriceSearchFilter = `serviceName eq 'Virtual Machines' and priceType eq 'Consumption' and contains(productName, 'Virtual Machines') and contains(skuName, 'Low Priority') ne true`
 	AzureMeterRegion       = `'primary'`
 	DefaultInstanceFamily  = "General purpose"
 
@@ -166,22 +166,6 @@ func (p *VMPriceStore) getPriceInfoFromVmInfo(ctx context.Context, vmInfo *Virtu
 	return machineSku, nil
 }
 
-func (p *VMPriceStore) validateMachinePriceIsRelevantFromSku(ctx context.Context, sku *retailPriceSdk.ResourceSKU) bool {
-	productName := sku.ProductName
-	if len(productName) == 0 || !strings.Contains(productName, "Virtual Machines") {
-		p.logger.LogAttrs(ctx, slog.LevelDebug, "product is not a virtual machine", slog.String("sku", sku.SkuName))
-		return false
-	}
-
-	skuName := sku.SkuName
-	if len(skuName) == 0 || strings.Contains(skuName, "Low Priority") {
-		p.logger.LogAttrs(ctx, slog.LevelDebug, "disregarding low priority aka Spot machines", slog.String("sku", sku.SkuName))
-		return false
-	}
-
-	return true
-}
-
 // PopulateVMPriceStore loads VM retail prices for the given ARM regions into RegionMap.
 func (p *VMPriceStore) PopulateVMPriceStore(ctx context.Context, regions []string) bool {
 	if len(regions) == 0 {
@@ -240,10 +224,6 @@ func (p *VMPriceStore) PopulateVMPriceStore(ctx context.Context, regions []strin
 		// Track all regions we see in the data
 		regionsFound[regionName] = true
 
-		if !p.validateMachinePriceIsRelevantFromSku(ctx, price) {
-			continue
-		}
-
 		if _, ok := p.RegionMap[regionName]; !ok {
 			p.logger.LogAttrs(ctx, slog.LevelInfo, "populating machine prices for region", slog.String("region", regionName))
 			p.RegionMap[regionName] = make(PriceByPriority)

pkg/azure/aks/vm_price_store_test.go

@@ -74,7 +74,6 @@ func TestPopulateVMPriceStore(t *testing.T) {
 				{ArmSkuName: "Standard_D4s_v3", SkuName: "D4s v3", ArmRegionName: "westus", ProductName: "Virtual Machines D Series", RetailPrice: 0.1},
 				{ArmSkuName: "Standard_D8s_v3", SkuName: "D8s v3", ArmRegionName: "centraleurope", ProductName: "Virtual Machines D Series", RetailPrice: 0.1},
 				{ArmSkuName: "Standard_D16s_v3", SkuName: "D16s v3 Spot", ArmRegionName: "centraleurope", ProductName: "Virtual Machines D Series", RetailPrice: 0.01},
-				{ArmSkuName: "Standard_D4s_v3", SkuName: "D4s v3 Low Priority", ArmRegionName: "centraleurope", ProductName: "Virtual Machines D Series", RetailPrice: 0.01}, // low priority machines are disregarded
 			},
 
 			timesToCallListPrices: 1,
@@ -242,7 +241,7 @@ func TestDetermineMachinePriority(t *testing.T) {
 	}{
 		"OnDemand": {
 			sku: &retailPriceSdk.ResourceSKU{
-				SkuName: "Standard_E16pds_v5 Low Priority",
+				SkuName: "Standard_D16s_v5",
 			},
 			expectedPriority: OnDemand,
 		},