some fixes

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

Author: britaniar

pkg/propertychecker/azure/checker_test.go

@@ -416,7 +416,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			errorSubstring: "capacity value cannot be zero for operator",
 		},
 		{
-			name:           "cases-insensitive request - unavailable SKU",
+			name:           "cases-insensitive request - available SKU",
 			cluster:        cluster,
 			sku:            "STANDARD_D2S_V3",
 			targetCapacity: 1,
@@ -448,12 +448,11 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 				if err == nil {
 					t.Fatalf("CheckIfMeetSKUCapacityRequirement error () = nil, want error")
 				} else if tt.errorSubstring != "" && !strings.Contains(err.Error(), tt.errorSubstring) {
-					t.Errorf("CheckIfMeetSKUCapacityRequirement error () = %s, want %v", err, tt.errorSubstring)
+					t.Fatalf("CheckIfMeetSKUCapacityRequirement error () = %s, want %v", err, tt.errorSubstring)
 				}
-				return
 			}
 
-			if err != nil {
+			if !tt.wantError && err != nil {
 				t.Fatalf("CheckIfMeetSKUCapacityRequirement error () = %v, want nil", err)
 			}
 

pkg/scheduler/framework/plugins/clusteraffinity/filtering_test.go

@@ -36,7 +36,7 @@ import (
 	"go.goms.io/fleet/pkg/propertyprovider/azure"
 	"go.goms.io/fleet/pkg/scheduler/framework"
 	"go.goms.io/fleet/pkg/utils/labels"
-	computeUtils "go.goms.io/fleet/test/utils/azure/compute"
+	testcompute "go.goms.io/fleet/test/utils/azure/compute"
 )
 
 const (
@@ -775,6 +775,7 @@ func TestFilter(t *testing.T) {
 	}
 }
 
+// TestFilter_PropertyChecker tests the Filter extension point of the plugin with a property checker.
 func TestFilter_PropertyChecker(t *testing.T) {
 	// This test ensures that the property checker is invoked correctly.
 	testCases := []struct {
@@ -884,8 +885,8 @@ func TestFilter_PropertyChecker(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			// Create mock server
-			mockRequest := computeUtils.GenerateAttributeBasedVMSizeRecommenderRequest(tc.cluster.Labels[labels.AzureSubscriptionIDLabel], tc.cluster.Labels[labels.AzureLocationLabel], tc.vmSize, tc.targetCapacity)
-			server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, computeUtils.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
+			mockRequest := testcompute.GenerateAttributeBasedVMSizeRecommenderRequest(tc.cluster.Labels[labels.AzureSubscriptionIDLabel], tc.cluster.Labels[labels.AzureLocationLabel], tc.vmSize, tc.targetCapacity)
+			server := testcompute.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, testcompute.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
 			defer server.Close()
 
 			client, err := compute.NewAttributeBasedVMSizeRecommenderClient(server.URL, http.DefaultClient)

pkg/scheduler/framework/plugins/clusteraffinity/plugin.go

@@ -25,7 +25,7 @@ import (
 	"go.goms.io/fleet/pkg/scheduler/framework"
 )
 
-// Plugin is the scheduler plugin that enforces the cluster affinity (if any) defined on a CRP.
+// Plugin is the scheduler plugin that enforces the cluster affinity (if any) defined on a RP/CRP.
 type Plugin struct {
 	// The name of the plugin.
 	name string

pkg/scheduler/framework/plugins/clusteraffinity/types_test.go

@@ -1244,7 +1244,7 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 		sku             string
 		targetCapacity  uint32
 		want            bool
-		expectedToFail  bool
+		wantError       bool
 	}{
 		{
 			name: "invalid property name (not handled)",
@@ -1284,8 +1284,8 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 					},
 				},
 			},
-			cluster:        cluster,
-			expectedToFail: true,
+			cluster:   cluster,
+			wantError: true,
 		},
 		{
 			name: "invalid value option",
@@ -1298,8 +1298,8 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 					},
 				},
 			},
-			cluster:        cluster,
-			expectedToFail: true,
+			cluster:   cluster,
+			wantError: true,
 		},
 		{
 			name: "negative value option",
@@ -1312,8 +1312,8 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 					},
 				},
 			},
-			cluster:        cluster,
-			expectedToFail: true,
+			cluster:   cluster,
+			wantError: true,
 		},
 		{
 			name: "non-integer value option",
@@ -1326,8 +1326,8 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 					},
 				},
 			},
-			cluster:        cluster,
-			expectedToFail: true,
+			cluster:   cluster,
+			wantError: true,
 		},
 		{
 			name: "invalid operator",
@@ -1340,8 +1340,8 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 					},
 				},
 			},
-			cluster:        cluster,
-			expectedToFail: true,
+			cluster:   cluster,
+			wantError: true,
 		},
 		{
 			name: "op >, matched (min limit)",
@@ -1428,14 +1428,13 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 				PropertyChecker: azure.NewPropertyChecker(*client),
 			}
 			matches, err := req.Matches(tc.cluster)
-			if tc.expectedToFail {
+			if tc.wantError {
 				if err == nil {
-					t.Errorf("Matches() (With Property Checker), want error, got nil")
+					t.Fatalf("Matches() (With Property Checker), want error, got nil")
 				}
-				return
 			}
 
-			if err != nil || matches != tc.want {
+			if (!tc.wantError && err != nil) || matches != tc.want {
 				t.Errorf("Matches() (With Property Checker) = %v, %v, want %v, nil", matches, err, tc.want)
 			}
 		})

test/utils/azure/compute/compute.go

@@ -1,3 +1,7 @@
+//
+//Copyright (c) Microsoft Corporation.
+//Licensed under the MIT license.
+
 // compute package provides utilities for testing Azure Compute services.
 package compute
 
@@ -57,27 +61,27 @@ func GenerateAttributeBasedVMSizeRecommenderRequest(subscriptionID, location, sk
 // CreateMockAttributeBasedVMSizeRecommenderServer is a helper function to create a mock server with a generated response.
 func CreateMockAttributeBasedVMSizeRecommenderServer(t *testing.T, request *computev1.GenerateAttributeBasedRecommendationsRequest, response string, httpStatusCode int) *httptest.Server {
 	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Verify request method
+		// Verify request method.
 		if r.Method != http.MethodPost {
 			t.Errorf("got %s, want POST request", r.Method)
 		}
 
-		// Verify headers
+		// Verify headers.
 		if r.Header.Get(httputil.HeaderContentTypeKey) != httputil.HeaderContentTypeJSON {
 			t.Errorf("got %s, want Content-Type: %s", r.Header.Get(httputil.HeaderContentTypeKey), httputil.HeaderContentTypeJSON)
 		}
 		if r.Header.Get(httputil.HeaderAcceptKey) != httputil.HeaderContentTypeJSON {
 			t.Errorf("got %s, want Accept: %s", r.Header.Get(httputil.HeaderAcceptKey), httputil.HeaderContentTypeJSON)
 		}
 
-		// Verify URL path if request is not nil
+		// Verify URL path if request is not nil.
 		if request != nil && request.SubscriptionId != "" && request.Location != "" {
 			wantPath := fmt.Sprintf("/subscriptions/%s/providers/Microsoft.Compute/locations/%s/vmSizeRecommendations/vmAttributeBased/generate", request.SubscriptionId, request.Location)
 			if r.URL.Path != wantPath {
 				t.Errorf("got %s, want path %s", r.URL.Path, wantPath)
 			}
 
-			// Verify request body using protojson for proper proto3 oneof support
+			// Verify request body using protojson for proper proto3 oneof support.
 			body, err := io.ReadAll(r.Body)
 			if err != nil {
 				t.Fatalf("failed to read request body: %v", err)
@@ -94,7 +98,7 @@ func CreateMockAttributeBasedVMSizeRecommenderServer(t *testing.T, request *comp
 			}
 		}
 
-		// Write mock response
+		// Write mock response.
 		w.WriteHeader(httpStatusCode)
 		if _, err := w.Write([]byte(response)); err != nil {
 			t.Fatalf("failed to write response: %v", err)