split out interfaces and standardize their naming

internal/fluidstack/v1/instancetype.go

@@ -51,15 +51,13 @@ func (c *FluidStackClient) GetLocations(ctx context.Context, _ v1.GetLocationsAr
 	}
 
 	var locations []v1.Location
-	if resp != nil {
-		for _, capacity := range resp {
-			location := v1.Location{
-				Name:        capacity.Name,
-				Description: capacity.Name,
-				Available:   capacity.Capacity > 0,
-			}
-			locations = append(locations, location)
+	for _, capacity := range resp {
+		location := v1.Location{
+			Name:        capacity.Name,
+			Description: capacity.Name,
+			Available:   capacity.Capacity > 0,
 		}
+		locations = append(locations, location)
 	}
 
 	return locations, nil

pkg/v1/capabilities.go

@@ -1,37 +1,25 @@
 package v1
 
+import "slices"
+
 type Capability string
 
 type Capabilities []Capability
 
 func (c Capabilities) IsCapable(cc Capability) bool {
-	for _, capability := range c {
-		if capability == cc {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(c, cc)
 }
 
 const (
 	CapabilityCreateInstance           Capability = "create-instance"
 	CapabilityCreateIdempotentInstance Capability = "create-instance-idempotent"
+	CapabilityCreateTerminateInstance  Capability = "create-terminate-instance"
+	CapabilityInstanceUserData         Capability = "instance-userdata" // specify user data when creating an instance in CreateInstanceAttrs // should be in instance type
+	CapabilityMachineImage             Capability = "machine-image"
+	CapabilityModifyFirewall           Capability = "modify-firewall"
+	CapabilityRebootInstance           Capability = "reboot-instance"
+	CapabilityResizeInstanceVolume     Capability = "resize-instance-volume"
+	CapabilityStopStartInstance        Capability = "stop-start-instance"
+	CapabilityTags                     Capability = "tags"
 	CapabilityTerminateInstance        Capability = "terminate-instance"
 )
-
-const (
-	CapabilityCreateTerminateInstance Capability = "create-terminate-instance"
-	CapabilityInstanceUserData        Capability = "instance-userdata" // specify user data when creating an instance in CreateInstanceAttrs // should be in instance type
-)
-
-const CapabilityTags Capability = "tags"
-
-const CapabilityRebootInstance Capability = "reboot-instance"
-
-const CapabilityResizeInstanceVolume Capability = "resize-instance-volume"
-
-const CapabilityStopStartInstance Capability = "stop-start-instance"
-
-const CapabilityMachineImage Capability = "machine-image"
-
-const CapabilityModifyFirewall Capability = "modify-firewall"

pkg/v1/client.go

@@ -13,33 +13,51 @@ const (
 
 type CloudProviderID string // aws, gcp, azure, etc.
 
-type CloudAPI interface {
-	GetAPIType() APIType
-	GetCapabilities(ctx context.Context) (Capabilities, error)
-	GetCloudProviderID() CloudProviderID
+type CloudClient interface {
+	CloudCredential
+	ImageManager
+	InstanceManager
+	LocationManager
+	NetworkManager
 }
 
 type CloudCredential interface {
 	MakeClient(ctx context.Context, location string) (CloudClient, error)
 	GetTenantID() (string, error)
 	GetReferenceID() string
-	CloudAPI
+	CloudProvider
 }
 
-type CloudBase interface {
-	CloudCreateTerminateInstance
+type CloudProvider interface {
+	GetAPIType() APIType
+	GetCapabilities(ctx context.Context) (Capabilities, error)
+	GetCloudProviderID() CloudProviderID
 }
 
-type CloudClient interface {
-	CloudCredential
-	CloudBase
-	CloudQuota
-	CloudRebootInstance
-	CloudStopStartInstance
-	CloudResizeInstanceVolume
-	CloudMachineImage
-	CloudChangeInstanceType
-	CloudModifyFirewall
-	CloudInstanceTags
-	UpdateHandler
+type ImageManager interface {
+	ImageGetter
+}
+type InstanceManager interface {
+	InstanceCreator
+	InstanceTerminator
+	InstanceGetter
+	InstanceLister
+	InstanceRebooter
+	InstanceStopStarter
+	InstanceTypeChanger
+	InstanceTagsUpdater
+	InstanceUpdateHandler
+	InstanceTypeGetter
+	InstanceTypePollTimeGetter
+	InstanceTypeQuotaGetter
+	InstanceVolumeResizer
+}
+
+type LocationManager interface {
+	LocationGetter
+}
+
+type NetworkManager interface {
+	NetworkFirewallModifier
+	NetworkSecurityGroupModifier
 }

pkg/v1/image.go

@@ -10,7 +10,15 @@ import (
 	"github.com/brevdev/cloud/pkg/ssh"
 )
 
-type CloudMachineImage interface {
+type Image struct {
+	ID           string
+	Architecture string
+	Description  string
+	Name         string
+	CreatedAt    time.Time
+}
+
+type ImageGetter interface {
 	GetImages(ctx context.Context, args GetImageArgs) ([]Image, error)
 }
 
@@ -21,14 +29,6 @@ type GetImageArgs struct {
 	ImageIDs      []string
 }
 
-type Image struct {
-	ID           string
-	Architecture string
-	Description  string
-	Name         string
-	CreatedAt    time.Time
-}
-
 func ValidateInstanceImage(ctx context.Context, instance Instance, privateKey string) error {
 	sshClient, err := connectToInstance(ctx, instance, privateKey)
 	if err != nil {