Skip to content

Commit 9c29de6

Browse files
britaniarbritaniar
committed
fix imports & address comments
Signed-off-by: Britania Rodriguez Reyes <[email protected]>
1 parent 8181160 commit 9c29de6

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

‎pkg/clients/azure/compute/vmsizerecommenderclient_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"google.golang.org/protobuf/proto"
1616

1717
computev1 "go.goms.io/fleet/apis/protos/azure/compute/v1"
18-
computeUtils "go.goms.io/fleet/test/utils/compute"
18+
"go.goms.io/fleet/test/utils/azure/compute"
1919
)
2020

2121
func TestNewAttributeBasedVMSizeRecommenderClient(t *testing.T) {
@@ -202,7 +202,7 @@ func TestClient_GenerateAttributeBasedRecommendations(t *testing.T) {
202202
for _, tt := range tests {
203203
t.Run(tt.name, func(t *testing.T) {
204204
// Create mock server
205-
server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, tt.request, tt.mockResponse, tt.mockStatusCode)
205+
server := compute.CreateMockAttributeBasedVMSizeRecommenderServer(t, tt.request, tt.mockResponse, tt.mockStatusCode)
206206
defer server.Close()
207207

208208
// Create client

‎pkg/propertychecker/azure/checker_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"go.goms.io/fleet/pkg/clients/azure/compute"
1818
"go.goms.io/fleet/pkg/propertyprovider/azure"
1919
"go.goms.io/fleet/pkg/utils/labels"
20-
computeUtils "go.goms.io/fleet/test/utils/compute"
20+
testcompute "go.goms.io/fleet/test/utils/azure/compute"
2121
)
2222

2323
func TestValidateCapacity(t *testing.T) {
@@ -433,8 +433,8 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
433433
for _, tt := range tests {
434434
t.Run(tt.name, func(t *testing.T) {
435435
// Create mock server.
436-
mockRequest := computeUtils.GenerateMockAttributeBasedVMSizeRecommenderRequest(tt.cluster.Labels[labels.AzureSubscriptionIDLabel], tt.cluster.Labels[labels.AzureLocationLabel], tt.sku, tt.targetCapacity)
437-
server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, computeUtils.MockAttributeBasedVMSizeRecommenderResponse, tt.mockStatusCode)
436+
mockRequest := testcompute.GenerateAttributeBasedVMSizeRecommenderRequest(tt.cluster.Labels[labels.AzureSubscriptionIDLabel], tt.cluster.Labels[labels.AzureLocationLabel], tt.sku, tt.targetCapacity)
437+
server := testcompute.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, testcompute.MockAttributeBasedVMSizeRecommenderResponse, tt.mockStatusCode)
438438
defer server.Close()
439439

440440
client, err := compute.NewAttributeBasedVMSizeRecommenderClient(server.URL, http.DefaultClient)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"go.goms.io/fleet/pkg/propertyprovider/azure"
3737
"go.goms.io/fleet/pkg/scheduler/framework"
3838
"go.goms.io/fleet/pkg/utils/labels"
39-
computeUtils "go.goms.io/fleet/test/utils/compute"
39+
computeUtils "go.goms.io/fleet/test/utils/azure/compute"
4040
)
4141

4242
const (
@@ -884,7 +884,7 @@ func TestFilter_PropertyChecker(t *testing.T) {
884884
for _, tc := range testCases {
885885
t.Run(tc.name, func(t *testing.T) {
886886
// Create mock server
887-
mockRequest := computeUtils.GenerateMockAttributeBasedVMSizeRecommenderRequest(tc.cluster.Labels[labels.AzureSubscriptionIDLabel], tc.cluster.Labels[labels.AzureLocationLabel], tc.vmSize, tc.targetCapacity)
887+
mockRequest := computeUtils.GenerateAttributeBasedVMSizeRecommenderRequest(tc.cluster.Labels[labels.AzureSubscriptionIDLabel], tc.cluster.Labels[labels.AzureLocationLabel], tc.vmSize, tc.targetCapacity)
888888
server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, computeUtils.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
889889
defer server.Close()
890890

‎pkg/scheduler/framework/plugins/clusteraffinity/types_azure_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"go.goms.io/fleet/pkg/clients/azure/compute"
1616
"go.goms.io/fleet/pkg/propertychecker/azure"
1717
"go.goms.io/fleet/pkg/utils/labels"
18-
computeUtils "go.goms.io/fleet/test/utils/compute"
18+
testcompute "go.goms.io/fleet/test/utils/azure/compute"
1919
)
2020

2121
func TestIsAzureCapacityProperty(t *testing.T) {
@@ -165,8 +165,8 @@ func TestMatchPropertiesInPropertyChecker(t *testing.T) {
165165
for _, tt := range tests {
166166
t.Run(tt.name, func(t *testing.T) {
167167
// Create mock server.
168-
mockRequest := computeUtils.GenerateMockAttributeBasedVMSizeRecommenderRequest(tt.cluster.Labels[labels.AzureSubscriptionIDLabel], tt.cluster.Labels[labels.AzureLocationLabel], tt.vmSize, tt.targetCapacity)
169-
server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, computeUtils.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
168+
mockRequest := testcompute.GenerateAttributeBasedVMSizeRecommenderRequest(tt.cluster.Labels[labels.AzureSubscriptionIDLabel], tt.cluster.Labels[labels.AzureLocationLabel], tt.vmSize, tt.targetCapacity)
169+
server := testcompute.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, testcompute.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
170170
defer server.Close()
171171

172172
client, err := compute.NewAttributeBasedVMSizeRecommenderClient(server.URL, http.DefaultClient)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"go.goms.io/fleet/pkg/propertyprovider"
3636
azurePropertyProvider "go.goms.io/fleet/pkg/propertyprovider/azure"
3737
"go.goms.io/fleet/pkg/utils/labels"
38-
computeUtils "go.goms.io/fleet/test/utils/compute"
38+
testcompute "go.goms.io/fleet/test/utils/azure/compute"
3939
)
4040

4141
const (
@@ -1410,8 +1410,8 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
14101410
for _, tc := range testCases {
14111411
t.Run(tc.name, func(t *testing.T) {
14121412
// Create mock server.
1413-
mockRequest := computeUtils.GenerateMockAttributeBasedVMSizeRecommenderRequest(tc.cluster.Labels[labels.AzureSubscriptionIDLabel], tc.cluster.Labels[labels.AzureLocationLabel], tc.sku, tc.targetCapacity)
1414-
server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, computeUtils.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
1413+
mockRequest := testcompute.GenerateAttributeBasedVMSizeRecommenderRequest(tc.cluster.Labels[labels.AzureSubscriptionIDLabel], tc.cluster.Labels[labels.AzureLocationLabel], tc.sku, tc.targetCapacity)
1414+
server := testcompute.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, testcompute.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
14151415
defer server.Close()
14161416

14171417
client, err := compute.NewAttributeBasedVMSizeRecommenderClient(server.URL, http.DefaultClient)

test/utils/compute/compute.go renamed to test/utils/azure/compute/compute.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// compute package provides utilities for testing Azure Compute services.
12
package compute
23

34
import (
@@ -11,6 +12,7 @@ import (
1112
"google.golang.org/protobuf/proto"
1213

1314
computev1 "go.goms.io/fleet/apis/protos/azure/compute/v1"
15+
"go.goms.io/fleet/pkg/clients/httputil"
1416
)
1517

1618
const (
@@ -32,8 +34,8 @@ const (
3234
}`
3335
)
3436

35-
// GenerateMockAttributeBasedVMSizeRecommenderRequest is a helper function to create a mock request.
36-
func GenerateMockAttributeBasedVMSizeRecommenderRequest(subscriptionID, location, sku string, targetCapacity uint32) *computev1.GenerateAttributeBasedRecommendationsRequest {
37+
// GenerateAttributeBasedVMSizeRecommenderRequest is a helper function to create a mock request.
38+
func GenerateAttributeBasedVMSizeRecommenderRequest(subscriptionID, location, sku string, targetCapacity uint32) *computev1.GenerateAttributeBasedRecommendationsRequest {
3739
return &computev1.GenerateAttributeBasedRecommendationsRequest{
3840
SubscriptionId: subscriptionID,
3941
Location: location,
@@ -61,11 +63,11 @@ func CreateMockAttributeBasedVMSizeRecommenderServer(t *testing.T, request *comp
6163
}
6264

6365
// Verify headers
64-
if r.Header.Get("Content-Type") != "application/json" {
65-
t.Errorf("got %s, want Content-Type: application/json", r.Header.Get("Content-Type"))
66+
if r.Header.Get(httputil.HeaderContentTypeKey) != httputil.HeaderContentTypeJSON {
67+
t.Errorf("got %s, want Content-Type: %s", r.Header.Get(httputil.HeaderContentTypeKey), httputil.HeaderContentTypeJSON)
6668
}
67-
if r.Header.Get("Accept") != "application/json" {
68-
t.Errorf("got %s, want Accept: application/json", r.Header.Get("Accept"))
69+
if r.Header.Get(httputil.HeaderAcceptKey) != httputil.HeaderContentTypeJSON {
70+
t.Errorf("got %s, want Accept: %s", r.Header.Get(httputil.HeaderAcceptKey), httputil.HeaderContentTypeJSON)
6971
}
7072

7173
// Verify URL path if request is not nil

0 commit comments

Comments
 (0)