sfc: Suppress capacity in preparation for v2 (#122)

* sfc: Suppress capacity in preparation for v2

* disable validation test

* disable validation test

* better skip check

Author: drewmalin

.github/workflows/validation-sfcompute.yml

@@ -45,7 +45,6 @@ jobs:
           SFCOMPUTE_API_KEY: ${{ secrets.SFCOMPUTE_API_KEY }}
           TEST_PRIVATE_KEY_BASE64: ${{ secrets.TEST_PRIVATE_KEY_BASE64 }}
           TEST_PUBLIC_KEY_BASE64: ${{ secrets.TEST_PUBLIC_KEY_BASE64 }}
-          VALIDATION_TEST: true
         run: |
           cd v1/providers/sfcompute
           go test -v -short=false -timeout=30m ./...

v1/providers/sfcompute/instancetype.go

@@ -36,54 +36,9 @@ func makeDefaultInstanceTypePrice(amount string, currencyCode string) currency.A
 	return instanceTypePrice
 }
 
-func (c *SFCClient) GetInstanceTypes(ctx context.Context, args v1.GetInstanceTypeArgs) ([]v1.InstanceType, error) {
-	c.logger.Debug(ctx, "sfc: GetInstanceTypes start",
-		v1.LogField("location", c.location),
-		v1.LogField("args", fmt.Sprintf("%+v", args)),
-	)
-
-	// Fetch all available zones
-	includeUnavailable := false
-	zones, err := c.getZones(ctx, includeUnavailable)
-	if err != nil {
-		return nil, err
-	}
-
-	c.logger.Debug(ctx, "sfc: GetInstanceTypes zones list",
-		v1.LogField("zone count", len(zones)),
-	)
-
-	instanceTypes := make([]v1.InstanceType, 0, len(zones))
-	for _, zone := range zones {
-		gpuType := strings.ToLower(string(zone.HardwareType))
-
-		if !gpuTypeIsAllowed(gpuType) {
-			c.logger.Debug(ctx, "sfc: GetInstanceTypes gpu type not allowed",
-				v1.LogField("gpuType", gpuType),
-			)
-			continue
-		}
-
-		instanceType, err := getInstanceTypeForZone(zone)
-		if err != nil {
-			return nil, err
-		}
-
-		if !v1.IsSelectedByArgs(*instanceType, args) {
-			c.logger.Debug(ctx, "sfc: GetInstanceTypes instance type not selected by args",
-				v1.LogField("instanceType", instanceType.Type),
-			)
-			continue
-		}
-
-		instanceTypes = append(instanceTypes, *instanceType)
-	}
-
-	c.logger.Debug(ctx, "sfc: GetInstanceTypes end",
-		v1.LogField("instanceType count", len(instanceTypes)),
-	)
-
-	return instanceTypes, nil
+func (c *SFCClient) GetInstanceTypes(_ context.Context, _ v1.GetInstanceTypeArgs) ([]v1.InstanceType, error) {
+	// Artificially set capacity to 0 for all instance types
+	return []v1.InstanceType{}, nil
 }
 
 func getInstanceTypeForZone(zone sfcnodes.ZoneListResponseData) (*v1.InstanceType, error) {
@@ -148,10 +103,6 @@ func getInstanceTypeForZone(zone sfcnodes.ZoneListResponseData) (*v1.InstanceTyp
 	return &instanceType, nil
 }
 
-func gpuTypeIsAllowed(gpuType string) bool {
-	return gpuType == gpuTypeH100 || gpuType == gpuTypeH200
-}
-
 func makeInstanceTypeName(zone sfcnodes.ZoneListResponseData) string {
 	interconnect := ""
 	if strings.ToLower(zone.InterconnectType) == interconnectInfiniband {

v1/providers/sfcompute/validation_test.go

@@ -37,12 +37,14 @@ func TestInstanceLifecycleValidation(t *testing.T) {
 }
 
 func checkSkip(t *testing.T) {
-	apiKey := getAPIKey()
 	isValidationTest := os.Getenv("VALIDATION_TEST")
-	if apiKey == "" && isValidationTest != "" {
+	if isValidationTest != "true" {
+		t.Skip("VALIDATION_TEST is not set to true, skipping sfcompute validation tests")
+	}
+
+	apiKey := getAPIKey()
+	if apiKey == "" {
 		t.Fatal("SFCOMPUTE_API_KEY not set, but VALIDATION_TEST is set")
-	} else if apiKey == "" && isValidationTest == "" {
-		t.Skip("SFCOMPUTE_API_KEY not set, skipping sfcompute validation tests")
 	}
 }