update tests to use env var

Author: drewmalin

v1/providers/sfcomputev2/brev_constants.go

@@ -1,5 +1,7 @@
 package v2
 
+import "fmt"
+
 // Package-internal constants — SSH defaults and internal tag keys.
 const (
 	defaultPort        = 22
@@ -12,12 +14,14 @@ const (
 )
 
 // Brev environment config for SFCompute V2.
-// TODO: source these from environment variables rather than hardcoding them here.
 const (
-	// BrevDefaultCapacityID is the SFCompute V2 capacity ID for Brev production instances.
-	BrevDefaultCapacityID = "brev-default-capacity"
-
-	// BrevDefaultImageID is the default SFCompute image for Brev instances
-	// (ubuntu-24.04.4-cuda-12.8, vm_images.vm_image_id).
-	BrevDefaultImageID = "vmi_4GwEvmclFURy7ztFQjOdr"
+	brevDefaultImageID = "sfc:image:sfcompute:public:ubuntu-24.04.4-cuda-12.8"
 )
+
+func GetDefaultCapacityID(workspace string) string {
+	return fmt.Sprintf("sfc:capacity:%s:default:brev-default-capacity", workspace)
+}
+
+func GetDefaultImageID() string {
+	return brevDefaultImageID
+}

v1/providers/sfcomputev2/client.go

@@ -11,16 +11,18 @@ const CloudProviderID = "sfcompute"
 
 // SFCCredentialV2 holds authentication details for a Brev-managed SFCompute V2 account.
 type SFCCredentialV2 struct {
-	RefID  string
-	APIKey string `json:"api_key"`
+	RefID     string
+	APIKey    string `json:"api_key"`
+	Workspace string `json:"workspace"`
 }
 
 var _ v1.CloudCredential = &SFCCredentialV2{}
 
-func NewSFCCredentialV2(refID, apiKey string) *SFCCredentialV2 {
+func NewSFCCredentialV2(refID string, apiKey string, workspace string) *SFCCredentialV2 {
 	return &SFCCredentialV2{
-		RefID:  refID,
-		APIKey: apiKey,
+		RefID:     refID,
+		APIKey:    apiKey,
+		Workspace: workspace,
 	}
 }
 
@@ -42,10 +44,11 @@ func (c *SFCCredentialV2) GetTenantID() (string, error) {
 
 type SFCClientV2 struct {
 	v1.NotImplCloudClient
-	refID    string
-	location string
-	client   *sfc.SDK
-	logger   v1.Logger
+	refID     string
+	workspace string
+	location  string
+	client    *sfc.SDK
+	logger    v1.Logger
 }
 
 var _ v1.CloudClient = &SFCClientV2{}
@@ -60,10 +63,11 @@ func WithLogger(logger v1.Logger) SFCClientV2Option {
 
 func (c *SFCCredentialV2) MakeClientWithOptions(_ context.Context, location string, opts ...SFCClientV2Option) (v1.CloudClient, error) {
 	sfcClient := &SFCClientV2{
-		refID:    c.RefID,
-		location: location,
-		client:   sfc.New(sfc.WithSecurity(c.APIKey)),
-		logger:   &v1.NoopLogger{},
+		refID:     c.RefID,
+		workspace: c.Workspace,
+		location:  location,
+		client:    sfc.New(sfc.WithSecurity(c.APIKey)),
+		logger:    &v1.NoopLogger{},
 	}
 
 	for _, opt := range opts {
@@ -85,6 +89,10 @@ func (c *SFCClientV2) GetCloudProviderID() v1.CloudProviderID {
 	return CloudProviderID
 }
 
+func (c *SFCClientV2) GetWorkspace() string {
+	return c.workspace
+}
+
 func (c *SFCClientV2) GetReferenceID() string {
 	return c.refID
 }

v1/providers/sfcomputev2/instance.go

@@ -29,8 +29,8 @@ func (c *SFCClientV2) CreateInstance(ctx context.Context, attrs v1.CreateInstanc
 
 	cloudInit := sshKeyCloudInit(attrs.PublicKey)
 	resp, err := c.client.Instances.Create(ctx, components.CreateInstanceRequest{
-		Capacity:          BrevDefaultCapacityID,
-		Image:             BrevDefaultImageID,
+		Capacity:          GetDefaultCapacityID(c.workspace),
+		Image:             GetDefaultImageID(),
 		CloudInitUserData: &cloudInit,
 		Tags:              optionalnullable.From(&tags),
 		Name:              optionalnullable.From(&attrs.Name),
@@ -95,7 +95,7 @@ func (c *SFCClientV2) ListInstances(ctx context.Context, args v1.ListInstancesAr
 		v1.LogField("location", c.location),
 	)
 
-	capacityID := BrevDefaultCapacityID
+	capacityID := GetDefaultCapacityID(c.workspace)
 	resp, err := c.client.Instances.List(ctx, operations.ListInstancesRequest{
 		Capacity: &capacityID,
 	})

v1/providers/sfcomputev2/instancetype.go

@@ -150,7 +150,7 @@ func (c *SFCClientV2) availableSlots(ctx context.Context) (int, error) {
 // currentCapacityAllocation returns the NodeAllocation from the most recent schedule entry
 // in BrevProductionCapacityID that is currently in effect (EffectiveAt <= now).
 func (c *SFCClientV2) currentCapacityAllocation(ctx context.Context) (int, error) {
-	resp, err := c.client.Capacities.Fetch(ctx, BrevDefaultCapacityID, nil, nil)
+	resp, err := c.client.Capacities.Fetch(ctx, GetDefaultCapacityID(c.workspace), nil, nil)
 	if err != nil {
 		return 0, errors.WrapAndTrace(err)
 	}
@@ -173,7 +173,7 @@ func (c *SFCClientV2) currentCapacityAllocation(ctx context.Context) (int, error
 // activeInstanceCount returns the number of non-terminated instances in BrevProductionCapacityID.
 // All non-terminated instances occupy a slot in the capacity, including failed ones.
 func (c *SFCClientV2) activeInstanceCount(ctx context.Context) (int, error) {
-	capacityID := BrevDefaultCapacityID
+	capacityID := GetDefaultCapacityID(c.workspace)
 	resp, err := c.client.Instances.List(ctx, operations.ListInstancesRequest{
 		Capacity: &capacityID,
 	})

v1/providers/sfcomputev2/validation_test.go

@@ -13,7 +13,7 @@ func TestValidationFunctions(t *testing.T) {
 	checkSkip(t)
 
 	config := validation.ProviderConfig{
-		Credential: NewSFCCredentialV2("validation-test", getAPIKey()),
+		Credential: NewSFCCredentialV2("validation-test", getAPIKey(), getWorkspace()),
 		StableIDs: []v1.InstanceTypeID{
 			h100InstanceTypeMetadata.instanceTypeID,
 		},
@@ -27,7 +27,7 @@ func TestInstanceLifecycleValidation(t *testing.T) {
 	checkSkip(t)
 
 	config := validation.ProviderConfig{
-		Credential: NewSFCCredentialV2("validation-test", getAPIKey()),
+		Credential: NewSFCCredentialV2("validation-test", getAPIKey(), getWorkspace()),
 		Location:   sfcLocation,
 	}
 
@@ -48,3 +48,7 @@ func checkSkip(t *testing.T) {
 func getAPIKey() string {
 	return os.Getenv("SFCOMPUTE_API_KEY")
 }
+
+func getWorkspace() string {
+	return os.Getenv("SFCOMPUTE_WORKSPACE")
+}