workshop modification

Author: drewmalin

v1/instancetype.go

@@ -54,10 +54,6 @@ func GetArchitecture(architecture string) Architecture {
 
 type InstanceTypeID string
 
-type Reservation struct {
-	ID string
-}
-
 type InstanceType struct {
 	ID                              InstanceTypeID // this id should be unique across all regions and stable
 	Location                        string
@@ -91,7 +87,7 @@ type InstanceType struct {
 	Provider                        string
 	Cloud                           string
 	CanModifyFirewallRules          bool
-	Reservation                     *Reservation
+	ReservedInstancePoolID          string
 }
 
 func MakeGenericInstanceTypeID(instanceType InstanceType) InstanceTypeID {

v1/providers/launchpad/instancetype.go

@@ -15,6 +15,10 @@ import (
 	openapi "github.com/brevdev/cloud/v1/providers/launchpad/gen/launchpad"
 )
 
+const (
+	brevDGXCWorkshopID = "brev-dgxc"
+)
+
 func (c *LaunchpadClient) GetInstanceTypes(ctx context.Context, args v1.GetInstanceTypeArgs) ([]v1.InstanceType, error) {
 	launchpadInstanceTypes, err := c.paginateInstanceTypes(ctx, 100)
 	if err != nil {
@@ -208,20 +212,29 @@ func launchpadInstanceTypeToInstanceType(launchpadInstanceType openapi.InstanceT
 		BasePrice:              hourlyPrice,
 		Provider:               CloudProviderID,
 		Cloud:                  launchpadInstanceType.Cloud,
-	}
-
-	// Set the reservation this instance type is for, if relevant
-	if info.workshopID != "" {
-		it.Reservation = &v1.Reservation{
-			ID: info.workshopID,
-		}
+		ReservedInstancePoolID: launchpadWorkshopIDToReservedInstancePoolID(info.workshopID),
 	}
 
 	// Make the instance type ID
 	it.ID = v1.MakeGenericInstanceTypeID(*it)
 	return it, nil
 }
 
+func launchpadWorkshopIDToReservedInstancePoolID(workshopID string) string {
+	// If the workshop is empty, consider this to be a public instance type
+	if workshopID == "" {
+		return ""
+	}
+
+	// If the workshop is the Brev DGXC workshop, consider this to be a public instance type
+	if workshopID == brevDGXCWorkshopID {
+		return ""
+	}
+
+	// Otherwise, use the workshop ID as the reserved instance pool ID
+	return workshopID
+}
+
 func launchpadStorageToStorages(launchpadStorage []openapi.InstanceTypeStorage) []v1.Storage {
 	if len(launchpadStorage) == 0 {
 		return nil