fix

Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>

Author: britaniar

pkg/propertychecker/azure/checker.go

@@ -93,7 +93,7 @@ func (s *PropertyChecker) CheckIfMeetSKUCapacityRequirement(
 		Location:       location,
 		RegularPriorityProfile: &computev1.RegularPriorityProfile{
 			CapacityUnitType: computev1.CapacityUnitType_CAPACITY_UNIT_TYPE_VM_INSTANCE_COUNT,
-			TargetCapacity:   uint32(capacity.Value()),
+			TargetCapacity:   capacity,
 		},
 		ResourceProperties: &computev1.ResourceProperties{
 			VmAttributes: &computev1.VMAttributes{
@@ -127,49 +127,53 @@ func (s *PropertyChecker) CheckIfMeetSKUCapacityRequirement(
 // "kubernetes.azure.com/vm-sizes/{sku}/capacity"
 // Returns the capacity as a resource.Quantity and the SKU name if the requirement is valid,
 // or an error if the requirement is invalid or not a capacity property.
-func extractCapacityRequirements(req placementv1beta1.PropertySelectorRequirement) (*resource.Quantity, string, error) {
+func extractCapacityRequirements(req placementv1beta1.PropertySelectorRequirement) (uint32, string, error) {
 	// Extract SKU from the property name using regex
 	// Expected format: "kubernetes.azure.com/vm-sizes/{sku}/capacity"
 	matches := skuCapacityRegex.FindStringSubmatch(req.Name)
 	if len(matches) != 2 {
-		return nil, "", fmt.Errorf("property name %q does not match expected SKU capacity format %q", req.Name, azure.SKUCapacityPropertyTmpl)
+		return 0, "", fmt.Errorf("property name %q does not match expected SKU capacity format %q", req.Name, azure.SKUCapacityPropertyTmpl)
 	}
 	sku := matches[1]
 
 	// Validate that we have exactly one value
 	if len(req.Values) != 1 {
-		return nil, "", fmt.Errorf("azure SKU capacity property must have exactly one value, got %d", len(req.Values))
+		return 0, "", fmt.Errorf("azure SKU capacity property must have exactly one value, got %d", len(req.Values))
 	}
 
 	// Parse the capacity value
 	capacity, err := resource.ParseQuantity(req.Values[0])
 	if err != nil {
-		return nil, "", fmt.Errorf("failed to parse capacity value %q: %w", req.Values[0], err)
+		return 0, "", fmt.Errorf("failed to parse capacity value %q: %w", req.Values[0], err)
 	}
 
 	// Ensure capacity is a whole number (integer) since VM instance count cannot be fractional
+	milliValue := capacity.MilliValue()
+	if milliValue%1000 != 0 {
+		return 0, "", fmt.Errorf("capacity value %q must be a whole number, decimal values are not allowed for VM instance count", req.Values[0])
+	}
+
+	// Get the integer value for validation
 	capacityValue := capacity.Value()
 
+	// Validate capacity is non-negative
+	if capacityValue < 0 {
+		return 0, "", fmt.Errorf("capacity value %d cannot be negative", capacityValue)
+	}
+
 	// Validate capacity bounds
 	if capacityValue < MinVMInstanceCapacity {
-		return nil, "", fmt.Errorf("capacity value %d is below minimum allowed value of %d", capacityValue, MinVMInstanceCapacity)
+		return 0, "", fmt.Errorf("capacity value %d is below minimum allowed value of %d", capacityValue, MinVMInstanceCapacity)
 	}
 	if capacityValue > MaxVMInstanceCapacity {
-		return nil, "", fmt.Errorf("capacity value %d exceeds maximum allowed value of %d", capacityValue, MaxVMInstanceCapacity)
+		return 0, "", fmt.Errorf("capacity value %d exceeds maximum allowed value of %d", capacityValue, MaxVMInstanceCapacity)
 	}
 
 	// Ensure capacity can be safely converted to uint32
 	if capacityValue > uint32MaxValue {
-		return nil, "", fmt.Errorf("capacity value %d exceeds uint32 maximum value %d", capacityValue, uint32MaxValue)
-	}
-	if capacityValue < 0 {
-		return nil, "", fmt.Errorf("capacity value %d cannot be negative", capacityValue)
-	}
-
-	milliValue := capacity.MilliValue()
-	if milliValue%1000 != 0 {
-		return nil, "", fmt.Errorf("capacity value %q must be a whole number, decimal values are not allowed for VM instance count", req.Values[0])
+		return 0, "", fmt.Errorf("capacity value %d exceeds uint32 maximum value %d", capacityValue, uint32MaxValue)
 	}
 
-	return &capacity, sku, nil
+	// Safe conversion to uint32 - all validations passed
+	return uint32(capacityValue), sku, nil
 }

pkg/propertychecker/azure/checker_test.go

@@ -27,7 +27,7 @@ func TestExtractCapacityRequirements(t *testing.T) {
 		name           string
 		req            placementv1beta1.PropertySelectorRequirement
 		wantSKU        string
-		wantQty        int64
+		wantQty        uint32
 		wantError      bool
 		errorSubstring string
 	}{
@@ -128,13 +128,8 @@ func TestExtractCapacityRequirements(t *testing.T) {
 				t.Errorf("extractCapacityRequirements() sku = %v, got %v", tt.wantSKU, sku)
 			}
 
-			if capacity == nil {
-				t.Errorf("extractCapacityRequirements() capacity is nil")
-				return
-			}
-
-			if capacity.Value() != tt.wantQty {
-				t.Errorf("extractCapacityRequirements() capacity = %v, got %v", tt.wantQty, capacity.String())
+			if capacity != tt.wantQty {
+				t.Errorf("extractCapacityRequirements() capacity = %v, got %v", tt.wantQty, capacity)
 			}
 		})
 	}