diff --git a/.github/workflows/validation-lambdalabs.yml b/.github/workflows/validation-lambdalabs.yml index ea8246d..de63dc3 100644 --- a/.github/workflows/validation-lambdalabs.yml +++ b/.github/workflows/validation-lambdalabs.yml @@ -8,9 +8,9 @@ on: # Allow manual triggering pull_request: paths: - - 'internal/lambdalabs/**' + - 'v1/providers/lambdalabs/**' - 'internal/validation/**' - - 'pkg/v1/**' + - 'v1/**' branches: [ main ] jobs: @@ -47,7 +47,7 @@ jobs: TEST_PUBLIC_KEY_BASE64: ${{ secrets.TEST_PUBLIC_KEY_BASE64 }} VALIDATION_TEST: true run: | - cd internal/lambdalabs + cd v1/providers/lambdalabs go test -v -short=false -timeout=30m ./... - name: Upload test results @@ -56,4 +56,4 @@ jobs: with: name: lambdalabs-validation-results path: | - internal/lambdalabs/coverage.out + v1/providers/lambdalabs/coverage.out diff --git a/.github/workflows/validation-shadeform.yml b/.github/workflows/validation-shadeform.yml index 3cd067f..1ef17f8 100644 --- a/.github/workflows/validation-shadeform.yml +++ b/.github/workflows/validation-shadeform.yml @@ -8,9 +8,9 @@ on: # Allow manual triggering pull_request: paths: - - 'internal/shadeform/**' + - 'v1/providers/shadeform/**' - 'internal/validation/**' - - 'pkg/v1/**' + - 'v1/**' branches: [ main ] jobs: @@ -47,7 +47,7 @@ jobs: TEST_PUBLIC_KEY_BASE64: ${{ secrets.TEST_PUBLIC_KEY_BASE64 }} VALIDATION_TEST: true run: | - cd internal/shadeform + cd v1/providers/shadeform go test -v -short=false -timeout=30m ./... - name: Upload test results @@ -56,4 +56,4 @@ jobs: with: name: shadeform-validation-results path: | - internal/shadeform/coverage.out + v1/providers/shadeform/coverage.out diff --git a/go.mod b/go.mod index c80bea0..b75d077 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/brevdev/cloud -go 1.25.0 +go 1.24.0 + +toolchain go1.24.6 require ( github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b diff --git a/pkg/ssh/ssh.go b/internal/ssh/ssh.go similarity index 100% rename from pkg/ssh/ssh.go rename to internal/ssh/ssh.go diff --git a/pkg/ssh/ssh_test.go b/internal/ssh/ssh_test.go similarity index 100% rename from pkg/ssh/ssh_test.go rename to internal/ssh/ssh_test.go diff --git a/internal/validation/suite.go b/internal/validation/suite.go index ee9b9da..877919a 100644 --- a/internal/validation/suite.go +++ b/internal/validation/suite.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/brevdev/cloud/pkg/ssh" - v1 "github.com/brevdev/cloud/pkg/v1" + "github.com/brevdev/cloud/internal/ssh" + "github.com/brevdev/cloud/v1" "github.com/stretchr/testify/require" ) diff --git a/pkg/v1/V1_DESIGN_NOTES.md b/v1/V1_DESIGN_NOTES.md similarity index 100% rename from pkg/v1/V1_DESIGN_NOTES.md rename to v1/V1_DESIGN_NOTES.md diff --git a/pkg/v1/capabilities.go b/v1/capabilities.go similarity index 100% rename from pkg/v1/capabilities.go rename to v1/capabilities.go diff --git a/pkg/v1/client.go b/v1/client.go similarity index 100% rename from pkg/v1/client.go rename to v1/client.go diff --git a/pkg/v1/errors.go b/v1/errors.go similarity index 100% rename from pkg/v1/errors.go rename to v1/errors.go diff --git a/pkg/v1/image.go b/v1/image.go similarity index 99% rename from pkg/v1/image.go rename to v1/image.go index 4298ac7..d781e85 100644 --- a/pkg/v1/image.go +++ b/v1/image.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/brevdev/cloud/pkg/ssh" + "github.com/brevdev/cloud/internal/ssh" ) type CloudMachineImage interface { diff --git a/pkg/v1/instance.go b/v1/instance.go similarity index 99% rename from pkg/v1/instance.go rename to v1/instance.go index becf196..bf769cf 100644 --- a/pkg/v1/instance.go +++ b/v1/instance.go @@ -8,7 +8,7 @@ import ( "github.com/alecthomas/units" "github.com/brevdev/cloud/internal/collections" - "github.com/brevdev/cloud/pkg/ssh" + "github.com/brevdev/cloud/internal/ssh" "github.com/google/uuid" ) diff --git a/pkg/v1/instancetype.go b/v1/instancetype.go similarity index 99% rename from pkg/v1/instancetype.go rename to v1/instancetype.go index 5377718..749ee95 100644 --- a/pkg/v1/instancetype.go +++ b/v1/instancetype.go @@ -45,6 +45,7 @@ type InstanceType struct { NotPrivileged bool EstimatedDeployTime *time.Duration Provider string + CloudBroker string CanModifyFirewallRules bool } diff --git a/pkg/v1/location.go b/v1/location.go similarity index 100% rename from pkg/v1/location.go rename to v1/location.go diff --git a/pkg/v1/networking.go b/v1/networking.go similarity index 100% rename from pkg/v1/networking.go rename to v1/networking.go diff --git a/pkg/v1/notimplemented.go b/v1/notimplemented.go similarity index 100% rename from pkg/v1/notimplemented.go rename to v1/notimplemented.go diff --git a/internal/fluidstack/Makefile b/v1/providers/fluidstack/Makefile similarity index 100% rename from internal/fluidstack/Makefile rename to v1/providers/fluidstack/Makefile diff --git a/internal/fluidstack/v1/README.md b/v1/providers/fluidstack/README.md similarity index 100% rename from internal/fluidstack/v1/README.md rename to v1/providers/fluidstack/README.md diff --git a/internal/fluidstack/v1/SECURITY.md b/v1/providers/fluidstack/SECURITY.md similarity index 100% rename from internal/fluidstack/v1/SECURITY.md rename to v1/providers/fluidstack/SECURITY.md diff --git a/internal/fluidstack/v1/capabilities.go b/v1/providers/fluidstack/capabilities.go similarity index 90% rename from internal/fluidstack/v1/capabilities.go rename to v1/providers/fluidstack/capabilities.go index 38c193e..9fd6a5f 100644 --- a/internal/fluidstack/v1/capabilities.go +++ b/v1/providers/fluidstack/capabilities.go @@ -3,7 +3,7 @@ package v1 import ( "context" - "github.com/brevdev/cloud/pkg/v1" + "github.com/brevdev/cloud/v1" ) func (c *FluidStackClient) GetCapabilities(_ context.Context) (v1.Capabilities, error) { diff --git a/internal/fluidstack/v1/client.go b/v1/providers/fluidstack/client.go similarity index 96% rename from internal/fluidstack/v1/client.go rename to v1/providers/fluidstack/client.go index 9b34374..5016d52 100644 --- a/internal/fluidstack/v1/client.go +++ b/v1/providers/fluidstack/client.go @@ -6,8 +6,8 @@ import ( "fmt" "net/http" - openapi "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" - "github.com/brevdev/cloud/pkg/v1" + "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" ) const CloudProviderID = "fluidstack" diff --git a/internal/fluidstack/gen/fluidstack/.gitignore b/v1/providers/fluidstack/gen/fluidstack/.gitignore similarity index 100% rename from internal/fluidstack/gen/fluidstack/.gitignore rename to v1/providers/fluidstack/gen/fluidstack/.gitignore diff --git a/internal/fluidstack/gen/fluidstack/.openapi-generator-ignore b/v1/providers/fluidstack/gen/fluidstack/.openapi-generator-ignore similarity index 100% rename from internal/fluidstack/gen/fluidstack/.openapi-generator-ignore rename to v1/providers/fluidstack/gen/fluidstack/.openapi-generator-ignore diff --git a/internal/fluidstack/gen/fluidstack/.openapi-generator/FILES b/v1/providers/fluidstack/gen/fluidstack/.openapi-generator/FILES similarity index 100% rename from internal/fluidstack/gen/fluidstack/.openapi-generator/FILES rename to v1/providers/fluidstack/gen/fluidstack/.openapi-generator/FILES diff --git a/internal/fluidstack/gen/fluidstack/.openapi-generator/VERSION b/v1/providers/fluidstack/gen/fluidstack/.openapi-generator/VERSION similarity index 100% rename from internal/fluidstack/gen/fluidstack/.openapi-generator/VERSION rename to v1/providers/fluidstack/gen/fluidstack/.openapi-generator/VERSION diff --git a/internal/fluidstack/gen/fluidstack/.travis.yml b/v1/providers/fluidstack/gen/fluidstack/.travis.yml similarity index 100% rename from internal/fluidstack/gen/fluidstack/.travis.yml rename to v1/providers/fluidstack/gen/fluidstack/.travis.yml diff --git a/internal/fluidstack/gen/fluidstack/README.md b/v1/providers/fluidstack/gen/fluidstack/README.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/README.md rename to v1/providers/fluidstack/gen/fluidstack/README.md diff --git a/internal/fluidstack/gen/fluidstack/api/openapi.yaml b/v1/providers/fluidstack/gen/fluidstack/api/openapi.yaml similarity index 100% rename from internal/fluidstack/gen/fluidstack/api/openapi.yaml rename to v1/providers/fluidstack/gen/fluidstack/api/openapi.yaml diff --git a/internal/fluidstack/gen/fluidstack/api_capabilities.go b/v1/providers/fluidstack/gen/fluidstack/api_capabilities.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_capabilities.go rename to v1/providers/fluidstack/gen/fluidstack/api_capabilities.go diff --git a/internal/fluidstack/gen/fluidstack/api_capacity.go b/v1/providers/fluidstack/gen/fluidstack/api_capacity.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_capacity.go rename to v1/providers/fluidstack/gen/fluidstack/api_capacity.go diff --git a/internal/fluidstack/gen/fluidstack/api_filesystems.go b/v1/providers/fluidstack/gen/fluidstack/api_filesystems.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_filesystems.go rename to v1/providers/fluidstack/gen/fluidstack/api_filesystems.go diff --git a/internal/fluidstack/gen/fluidstack/api_instance_types.go b/v1/providers/fluidstack/gen/fluidstack/api_instance_types.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_instance_types.go rename to v1/providers/fluidstack/gen/fluidstack/api_instance_types.go diff --git a/internal/fluidstack/gen/fluidstack/api_instances.go b/v1/providers/fluidstack/gen/fluidstack/api_instances.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_instances.go rename to v1/providers/fluidstack/gen/fluidstack/api_instances.go diff --git a/internal/fluidstack/gen/fluidstack/api_kubernetes.go b/v1/providers/fluidstack/gen/fluidstack/api_kubernetes.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_kubernetes.go rename to v1/providers/fluidstack/gen/fluidstack/api_kubernetes.go diff --git a/internal/fluidstack/gen/fluidstack/api_projects.go b/v1/providers/fluidstack/gen/fluidstack/api_projects.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_projects.go rename to v1/providers/fluidstack/gen/fluidstack/api_projects.go diff --git a/internal/fluidstack/gen/fluidstack/api_slurm.go b/v1/providers/fluidstack/gen/fluidstack/api_slurm.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/api_slurm.go rename to v1/providers/fluidstack/gen/fluidstack/api_slurm.go diff --git a/internal/fluidstack/gen/fluidstack/client.go b/v1/providers/fluidstack/gen/fluidstack/client.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/client.go rename to v1/providers/fluidstack/gen/fluidstack/client.go diff --git a/internal/fluidstack/gen/fluidstack/configuration.go b/v1/providers/fluidstack/gen/fluidstack/configuration.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/configuration.go rename to v1/providers/fluidstack/gen/fluidstack/configuration.go diff --git a/internal/fluidstack/gen/fluidstack/docs/Accelerator.md b/v1/providers/fluidstack/gen/fluidstack/docs/Accelerator.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/Accelerator.md rename to v1/providers/fluidstack/gen/fluidstack/docs/Accelerator.md diff --git a/internal/fluidstack/gen/fluidstack/docs/CapabilitiesAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/CapabilitiesAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/CapabilitiesAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/CapabilitiesAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/Capability.md b/v1/providers/fluidstack/gen/fluidstack/docs/Capability.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/Capability.md rename to v1/providers/fluidstack/gen/fluidstack/docs/Capability.md diff --git a/internal/fluidstack/gen/fluidstack/docs/CapacityAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/CapacityAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/CapacityAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/CapacityAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/Error.md b/v1/providers/fluidstack/gen/fluidstack/docs/Error.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/Error.md rename to v1/providers/fluidstack/gen/fluidstack/docs/Error.md diff --git a/internal/fluidstack/gen/fluidstack/docs/Filesystem.md b/v1/providers/fluidstack/gen/fluidstack/docs/Filesystem.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/Filesystem.md rename to v1/providers/fluidstack/gen/fluidstack/docs/Filesystem.md diff --git a/internal/fluidstack/gen/fluidstack/docs/FilesystemsAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/FilesystemsAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/FilesystemsAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/FilesystemsAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/FilesystemsPostRequest.md b/v1/providers/fluidstack/gen/fluidstack/docs/FilesystemsPostRequest.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/FilesystemsPostRequest.md rename to v1/providers/fluidstack/gen/fluidstack/docs/FilesystemsPostRequest.md diff --git a/internal/fluidstack/gen/fluidstack/docs/Instance.md b/v1/providers/fluidstack/gen/fluidstack/docs/Instance.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/Instance.md rename to v1/providers/fluidstack/gen/fluidstack/docs/Instance.md diff --git a/internal/fluidstack/gen/fluidstack/docs/InstanceState.md b/v1/providers/fluidstack/gen/fluidstack/docs/InstanceState.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/InstanceState.md rename to v1/providers/fluidstack/gen/fluidstack/docs/InstanceState.md diff --git a/internal/fluidstack/gen/fluidstack/docs/InstanceType.md b/v1/providers/fluidstack/gen/fluidstack/docs/InstanceType.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/InstanceType.md rename to v1/providers/fluidstack/gen/fluidstack/docs/InstanceType.md diff --git a/internal/fluidstack/gen/fluidstack/docs/InstanceTypesAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/InstanceTypesAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/InstanceTypesAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/InstanceTypesAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/InstancesAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/InstancesAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/InstancesAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/InstancesAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/InstancesPostRequest.md b/v1/providers/fluidstack/gen/fluidstack/docs/InstancesPostRequest.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/InstancesPostRequest.md rename to v1/providers/fluidstack/gen/fluidstack/docs/InstancesPostRequest.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesCluster.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesCluster.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesCluster.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesCluster.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesClustersPostRequest.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesClustersPostRequest.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesClustersPostRequest.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesClustersPostRequest.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesNode.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNode.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesNode.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNode.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesNodeConditionsInner.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodeConditionsInner.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesNodeConditionsInner.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodeConditionsInner.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesNodePool.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodePool.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesNodePool.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodePool.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesNodePoolPostRequest.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodePoolPostRequest.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesNodePoolPostRequest.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodePoolPostRequest.md diff --git a/internal/fluidstack/gen/fluidstack/docs/KubernetesNodeTaintsInner.md b/v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodeTaintsInner.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/KubernetesNodeTaintsInner.md rename to v1/providers/fluidstack/gen/fluidstack/docs/KubernetesNodeTaintsInner.md diff --git a/internal/fluidstack/gen/fluidstack/docs/ListCapacity200ResponseInner.md b/v1/providers/fluidstack/gen/fluidstack/docs/ListCapacity200ResponseInner.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/ListCapacity200ResponseInner.md rename to v1/providers/fluidstack/gen/fluidstack/docs/ListCapacity200ResponseInner.md diff --git a/internal/fluidstack/gen/fluidstack/docs/Project.md b/v1/providers/fluidstack/gen/fluidstack/docs/Project.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/Project.md rename to v1/providers/fluidstack/gen/fluidstack/docs/Project.md diff --git a/internal/fluidstack/gen/fluidstack/docs/ProjectState.md b/v1/providers/fluidstack/gen/fluidstack/docs/ProjectState.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/ProjectState.md rename to v1/providers/fluidstack/gen/fluidstack/docs/ProjectState.md diff --git a/internal/fluidstack/gen/fluidstack/docs/ProjectsAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/ProjectsAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/ProjectsAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/ProjectsAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/ProjectsPostRequest.md b/v1/providers/fluidstack/gen/fluidstack/docs/ProjectsPostRequest.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/ProjectsPostRequest.md rename to v1/providers/fluidstack/gen/fluidstack/docs/ProjectsPostRequest.md diff --git a/internal/fluidstack/gen/fluidstack/docs/SlurmAPI.md b/v1/providers/fluidstack/gen/fluidstack/docs/SlurmAPI.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/SlurmAPI.md rename to v1/providers/fluidstack/gen/fluidstack/docs/SlurmAPI.md diff --git a/internal/fluidstack/gen/fluidstack/docs/SlurmCluster.md b/v1/providers/fluidstack/gen/fluidstack/docs/SlurmCluster.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/SlurmCluster.md rename to v1/providers/fluidstack/gen/fluidstack/docs/SlurmCluster.md diff --git a/internal/fluidstack/gen/fluidstack/docs/SlurmClustersPostRequest.md b/v1/providers/fluidstack/gen/fluidstack/docs/SlurmClustersPostRequest.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/SlurmClustersPostRequest.md rename to v1/providers/fluidstack/gen/fluidstack/docs/SlurmClustersPostRequest.md diff --git a/internal/fluidstack/gen/fluidstack/docs/SlurmLoginNode.md b/v1/providers/fluidstack/gen/fluidstack/docs/SlurmLoginNode.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/SlurmLoginNode.md rename to v1/providers/fluidstack/gen/fluidstack/docs/SlurmLoginNode.md diff --git a/internal/fluidstack/gen/fluidstack/docs/SlurmNode.md b/v1/providers/fluidstack/gen/fluidstack/docs/SlurmNode.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/SlurmNode.md rename to v1/providers/fluidstack/gen/fluidstack/docs/SlurmNode.md diff --git a/internal/fluidstack/gen/fluidstack/docs/SlurmNodePool.md b/v1/providers/fluidstack/gen/fluidstack/docs/SlurmNodePool.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/SlurmNodePool.md rename to v1/providers/fluidstack/gen/fluidstack/docs/SlurmNodePool.md diff --git a/internal/fluidstack/gen/fluidstack/docs/SlurmNodePoolPostRequest.md b/v1/providers/fluidstack/gen/fluidstack/docs/SlurmNodePoolPostRequest.md similarity index 100% rename from internal/fluidstack/gen/fluidstack/docs/SlurmNodePoolPostRequest.md rename to v1/providers/fluidstack/gen/fluidstack/docs/SlurmNodePoolPostRequest.md diff --git a/internal/fluidstack/gen/fluidstack/git_push.sh b/v1/providers/fluidstack/gen/fluidstack/git_push.sh similarity index 100% rename from internal/fluidstack/gen/fluidstack/git_push.sh rename to v1/providers/fluidstack/gen/fluidstack/git_push.sh diff --git a/internal/fluidstack/gen/fluidstack/model_accelerator.go b/v1/providers/fluidstack/gen/fluidstack/model_accelerator.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_accelerator.go rename to v1/providers/fluidstack/gen/fluidstack/model_accelerator.go diff --git a/internal/fluidstack/gen/fluidstack/model_capability.go b/v1/providers/fluidstack/gen/fluidstack/model_capability.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_capability.go rename to v1/providers/fluidstack/gen/fluidstack/model_capability.go diff --git a/internal/fluidstack/gen/fluidstack/model_error.go b/v1/providers/fluidstack/gen/fluidstack/model_error.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_error.go rename to v1/providers/fluidstack/gen/fluidstack/model_error.go diff --git a/internal/fluidstack/gen/fluidstack/model_filesystem.go b/v1/providers/fluidstack/gen/fluidstack/model_filesystem.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_filesystem.go rename to v1/providers/fluidstack/gen/fluidstack/model_filesystem.go diff --git a/internal/fluidstack/gen/fluidstack/model_filesystems_post_request.go b/v1/providers/fluidstack/gen/fluidstack/model_filesystems_post_request.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_filesystems_post_request.go rename to v1/providers/fluidstack/gen/fluidstack/model_filesystems_post_request.go diff --git a/internal/fluidstack/gen/fluidstack/model_instance.go b/v1/providers/fluidstack/gen/fluidstack/model_instance.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_instance.go rename to v1/providers/fluidstack/gen/fluidstack/model_instance.go diff --git a/internal/fluidstack/gen/fluidstack/model_instance_state.go b/v1/providers/fluidstack/gen/fluidstack/model_instance_state.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_instance_state.go rename to v1/providers/fluidstack/gen/fluidstack/model_instance_state.go diff --git a/internal/fluidstack/gen/fluidstack/model_instance_type.go b/v1/providers/fluidstack/gen/fluidstack/model_instance_type.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_instance_type.go rename to v1/providers/fluidstack/gen/fluidstack/model_instance_type.go diff --git a/internal/fluidstack/gen/fluidstack/model_instances_post_request.go b/v1/providers/fluidstack/gen/fluidstack/model_instances_post_request.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_instances_post_request.go rename to v1/providers/fluidstack/gen/fluidstack/model_instances_post_request.go diff --git a/internal/fluidstack/gen/fluidstack/model_kubernetes_cluster.go b/v1/providers/fluidstack/gen/fluidstack/model_kubernetes_cluster.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_kubernetes_cluster.go rename to v1/providers/fluidstack/gen/fluidstack/model_kubernetes_cluster.go diff --git a/internal/fluidstack/gen/fluidstack/model_kubernetes_clusters_post_request.go b/v1/providers/fluidstack/gen/fluidstack/model_kubernetes_clusters_post_request.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_kubernetes_clusters_post_request.go rename to v1/providers/fluidstack/gen/fluidstack/model_kubernetes_clusters_post_request.go diff --git a/internal/fluidstack/gen/fluidstack/model_kubernetes_node.go b/v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_kubernetes_node.go rename to v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node.go diff --git a/internal/fluidstack/gen/fluidstack/model_kubernetes_node_conditions_inner.go b/v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_conditions_inner.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_kubernetes_node_conditions_inner.go rename to v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_conditions_inner.go diff --git a/internal/fluidstack/gen/fluidstack/model_kubernetes_node_pool.go b/v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_pool.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_kubernetes_node_pool.go rename to v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_pool.go diff --git a/internal/fluidstack/gen/fluidstack/model_kubernetes_node_pool_post_request.go b/v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_pool_post_request.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_kubernetes_node_pool_post_request.go rename to v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_pool_post_request.go diff --git a/internal/fluidstack/gen/fluidstack/model_kubernetes_node_taints_inner.go b/v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_taints_inner.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_kubernetes_node_taints_inner.go rename to v1/providers/fluidstack/gen/fluidstack/model_kubernetes_node_taints_inner.go diff --git a/internal/fluidstack/gen/fluidstack/model_list_capacity_200_response_inner.go b/v1/providers/fluidstack/gen/fluidstack/model_list_capacity_200_response_inner.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_list_capacity_200_response_inner.go rename to v1/providers/fluidstack/gen/fluidstack/model_list_capacity_200_response_inner.go diff --git a/internal/fluidstack/gen/fluidstack/model_project.go b/v1/providers/fluidstack/gen/fluidstack/model_project.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_project.go rename to v1/providers/fluidstack/gen/fluidstack/model_project.go diff --git a/internal/fluidstack/gen/fluidstack/model_project_state.go b/v1/providers/fluidstack/gen/fluidstack/model_project_state.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_project_state.go rename to v1/providers/fluidstack/gen/fluidstack/model_project_state.go diff --git a/internal/fluidstack/gen/fluidstack/model_projects_post_request.go b/v1/providers/fluidstack/gen/fluidstack/model_projects_post_request.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_projects_post_request.go rename to v1/providers/fluidstack/gen/fluidstack/model_projects_post_request.go diff --git a/internal/fluidstack/gen/fluidstack/model_slurm_cluster.go b/v1/providers/fluidstack/gen/fluidstack/model_slurm_cluster.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_slurm_cluster.go rename to v1/providers/fluidstack/gen/fluidstack/model_slurm_cluster.go diff --git a/internal/fluidstack/gen/fluidstack/model_slurm_clusters_post_request.go b/v1/providers/fluidstack/gen/fluidstack/model_slurm_clusters_post_request.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_slurm_clusters_post_request.go rename to v1/providers/fluidstack/gen/fluidstack/model_slurm_clusters_post_request.go diff --git a/internal/fluidstack/gen/fluidstack/model_slurm_login_node.go b/v1/providers/fluidstack/gen/fluidstack/model_slurm_login_node.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_slurm_login_node.go rename to v1/providers/fluidstack/gen/fluidstack/model_slurm_login_node.go diff --git a/internal/fluidstack/gen/fluidstack/model_slurm_node.go b/v1/providers/fluidstack/gen/fluidstack/model_slurm_node.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_slurm_node.go rename to v1/providers/fluidstack/gen/fluidstack/model_slurm_node.go diff --git a/internal/fluidstack/gen/fluidstack/model_slurm_node_pool.go b/v1/providers/fluidstack/gen/fluidstack/model_slurm_node_pool.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_slurm_node_pool.go rename to v1/providers/fluidstack/gen/fluidstack/model_slurm_node_pool.go diff --git a/internal/fluidstack/gen/fluidstack/model_slurm_node_pool_post_request.go b/v1/providers/fluidstack/gen/fluidstack/model_slurm_node_pool_post_request.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/model_slurm_node_pool_post_request.go rename to v1/providers/fluidstack/gen/fluidstack/model_slurm_node_pool_post_request.go diff --git a/internal/fluidstack/gen/fluidstack/response.go b/v1/providers/fluidstack/gen/fluidstack/response.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/response.go rename to v1/providers/fluidstack/gen/fluidstack/response.go diff --git a/internal/fluidstack/gen/fluidstack/test/api_capabilities_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_capabilities_test.go similarity index 90% rename from internal/fluidstack/gen/fluidstack/test/api_capabilities_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_capabilities_test.go index 2cdf48b..b1db026 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_capabilities_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_capabilities_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/test/api_capacity_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_capacity_test.go similarity index 89% rename from internal/fluidstack/gen/fluidstack/test/api_capacity_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_capacity_test.go index 619d438..684a0fe 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_capacity_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_capacity_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/test/api_filesystems_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_filesystems_test.go similarity index 95% rename from internal/fluidstack/gen/fluidstack/test/api_filesystems_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_filesystems_test.go index 16241f4..6ac9d06 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_filesystems_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_filesystems_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/test/api_instance_types_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_instance_types_test.go similarity index 90% rename from internal/fluidstack/gen/fluidstack/test/api_instance_types_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_instance_types_test.go index 2f08599..3ee0082 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_instance_types_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_instance_types_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/test/api_instances_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_instances_test.go similarity index 96% rename from internal/fluidstack/gen/fluidstack/test/api_instances_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_instances_test.go index c906c16..9dd3836 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_instances_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_instances_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/test/api_kubernetes_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_kubernetes_test.go similarity index 97% rename from internal/fluidstack/gen/fluidstack/test/api_kubernetes_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_kubernetes_test.go index 51be8ba..476bc54 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_kubernetes_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_kubernetes_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/test/api_projects_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_projects_test.go similarity index 95% rename from internal/fluidstack/gen/fluidstack/test/api_projects_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_projects_test.go index 020ed0c..a40f4cd 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_projects_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_projects_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/test/api_slurm_test.go b/v1/providers/fluidstack/gen/fluidstack/test/api_slurm_test.go similarity index 97% rename from internal/fluidstack/gen/fluidstack/test/api_slurm_test.go rename to v1/providers/fluidstack/gen/fluidstack/test/api_slurm_test.go index 71b5a02..263fb1e 100644 --- a/internal/fluidstack/gen/fluidstack/test/api_slurm_test.go +++ b/v1/providers/fluidstack/gen/fluidstack/test/api_slurm_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" + openapiclient "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/fluidstack/gen/fluidstack/utils.go b/v1/providers/fluidstack/gen/fluidstack/utils.go similarity index 100% rename from internal/fluidstack/gen/fluidstack/utils.go rename to v1/providers/fluidstack/gen/fluidstack/utils.go diff --git a/internal/fluidstack/v1/instance.go b/v1/providers/fluidstack/instance.go similarity index 97% rename from internal/fluidstack/v1/instance.go rename to v1/providers/fluidstack/instance.go index cc3c69d..6e5e9c2 100644 --- a/internal/fluidstack/v1/instance.go +++ b/v1/providers/fluidstack/instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - openapi "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" - "github.com/brevdev/cloud/pkg/v1" + "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" ) func (c *FluidStackClient) CreateInstance(ctx context.Context, attrs v1.CreateInstanceAttrs) (*v1.Instance, error) { diff --git a/internal/fluidstack/v1/instancetype.go b/v1/providers/fluidstack/instancetype.go similarity index 96% rename from internal/fluidstack/v1/instancetype.go rename to v1/providers/fluidstack/instancetype.go index eb2a90f..3a6540d 100644 --- a/internal/fluidstack/v1/instancetype.go +++ b/v1/providers/fluidstack/instancetype.go @@ -9,8 +9,8 @@ import ( "github.com/alecthomas/units" "github.com/bojanz/currency" - openapi "github.com/brevdev/cloud/internal/fluidstack/gen/fluidstack" - "github.com/brevdev/cloud/pkg/v1" + "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/fluidstack/gen/fluidstack" ) func (c *FluidStackClient) GetInstanceTypes(ctx context.Context, _ v1.GetInstanceTypeArgs) ([]v1.InstanceType, error) { diff --git a/internal/lambdalabs/CONTRIBUTE.md b/v1/providers/lambdalabs/CONTRIBUTE.md similarity index 100% rename from internal/lambdalabs/CONTRIBUTE.md rename to v1/providers/lambdalabs/CONTRIBUTE.md diff --git a/internal/lambdalabs/Makefile b/v1/providers/lambdalabs/Makefile similarity index 100% rename from internal/lambdalabs/Makefile rename to v1/providers/lambdalabs/Makefile diff --git a/internal/lambdalabs/v1/README.md b/v1/providers/lambdalabs/README.md similarity index 100% rename from internal/lambdalabs/v1/README.md rename to v1/providers/lambdalabs/README.md diff --git a/internal/lambdalabs/SECURITY.md b/v1/providers/lambdalabs/SECURITY.md similarity index 100% rename from internal/lambdalabs/SECURITY.md rename to v1/providers/lambdalabs/SECURITY.md diff --git a/internal/lambdalabs/v1/capabilities.go b/v1/providers/lambdalabs/capabilities.go similarity index 97% rename from internal/lambdalabs/v1/capabilities.go rename to v1/providers/lambdalabs/capabilities.go index 99e1105..253fe13 100644 --- a/internal/lambdalabs/v1/capabilities.go +++ b/v1/providers/lambdalabs/capabilities.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) // getLambdaLabsCapabilities returns the unified capabilities for Lambda Labs diff --git a/internal/lambdalabs/v1/capabilities_test.go b/v1/providers/lambdalabs/capabilities_test.go similarity index 96% rename from internal/lambdalabs/v1/capabilities_test.go rename to v1/providers/lambdalabs/capabilities_test.go index d76181f..bbbdf2e 100644 --- a/internal/lambdalabs/v1/capabilities_test.go +++ b/v1/providers/lambdalabs/capabilities_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func TestLambdaLabsClient_GetCapabilities(t *testing.T) { diff --git a/internal/lambdalabs/v1/client.go b/v1/providers/lambdalabs/client.go similarity index 97% rename from internal/lambdalabs/v1/client.go rename to v1/providers/lambdalabs/client.go index 7eab999..75db8bc 100644 --- a/internal/lambdalabs/v1/client.go +++ b/v1/providers/lambdalabs/client.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" "github.com/cenkalti/backoff/v4" ) diff --git a/internal/lambdalabs/v1/client_test.go b/v1/providers/lambdalabs/client_test.go similarity index 96% rename from internal/lambdalabs/v1/client_test.go rename to v1/providers/lambdalabs/client_test.go index 0c026bc..6e258a8 100644 --- a/internal/lambdalabs/v1/client_test.go +++ b/v1/providers/lambdalabs/client_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" ) func TestLambdaLabsClient_GetAPIType(t *testing.T) { diff --git a/internal/lambdalabs/v1/common_test.go b/v1/providers/lambdalabs/common_test.go similarity index 94% rename from internal/lambdalabs/v1/common_test.go rename to v1/providers/lambdalabs/common_test.go index df34d3f..4c4259a 100644 --- a/internal/lambdalabs/v1/common_test.go +++ b/v1/providers/lambdalabs/common_test.go @@ -1,7 +1,7 @@ package v1 import ( - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" "github.com/cenkalti/backoff/v4" "github.com/jarcoal/httpmock" ) diff --git a/internal/lambdalabs/v1/credential.go b/v1/providers/lambdalabs/credential.go similarity index 97% rename from internal/lambdalabs/v1/credential.go rename to v1/providers/lambdalabs/credential.go index e0de8ba..87985a5 100644 --- a/internal/lambdalabs/v1/credential.go +++ b/v1/providers/lambdalabs/credential.go @@ -5,7 +5,7 @@ import ( "crypto/sha256" "fmt" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) const CloudProviderID = "lambda-labs" diff --git a/internal/lambdalabs/v1/credential_test.go b/v1/providers/lambdalabs/credential_test.go similarity index 97% rename from internal/lambdalabs/v1/credential_test.go rename to v1/providers/lambdalabs/credential_test.go index 700358d..ab27800 100644 --- a/internal/lambdalabs/v1/credential_test.go +++ b/v1/providers/lambdalabs/credential_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func TestLambdaLabsCredential_GetReferenceID(t *testing.T) { diff --git a/internal/lambdalabs/v1/errors.go b/v1/providers/lambdalabs/errors.go similarity index 92% rename from internal/lambdalabs/v1/errors.go rename to v1/providers/lambdalabs/errors.go index 10a47a6..b809c3d 100644 --- a/internal/lambdalabs/v1/errors.go +++ b/v1/providers/lambdalabs/errors.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" "github.com/cenkalti/backoff/v4" ) diff --git a/internal/lambdalabs/v1/errors_test.go b/v1/providers/lambdalabs/errors_test.go similarity index 98% rename from internal/lambdalabs/v1/errors_test.go rename to v1/providers/lambdalabs/errors_test.go index d6a1cc7..8e49b77 100644 --- a/internal/lambdalabs/v1/errors_test.go +++ b/v1/providers/lambdalabs/errors_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" ) func TestHandleAPIError_InstanceNotFound(t *testing.T) { diff --git a/internal/lambdalabs/gen/lambdalabs/.gitignore b/v1/providers/lambdalabs/gen/lambdalabs/.gitignore similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/.gitignore rename to v1/providers/lambdalabs/gen/lambdalabs/.gitignore diff --git a/internal/lambdalabs/gen/lambdalabs/.openapi-generator-ignore b/v1/providers/lambdalabs/gen/lambdalabs/.openapi-generator-ignore similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/.openapi-generator-ignore rename to v1/providers/lambdalabs/gen/lambdalabs/.openapi-generator-ignore diff --git a/internal/lambdalabs/gen/lambdalabs/.openapi-generator/FILES b/v1/providers/lambdalabs/gen/lambdalabs/.openapi-generator/FILES similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/.openapi-generator/FILES rename to v1/providers/lambdalabs/gen/lambdalabs/.openapi-generator/FILES diff --git a/internal/lambdalabs/gen/lambdalabs/.openapi-generator/VERSION b/v1/providers/lambdalabs/gen/lambdalabs/.openapi-generator/VERSION similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/.openapi-generator/VERSION rename to v1/providers/lambdalabs/gen/lambdalabs/.openapi-generator/VERSION diff --git a/internal/lambdalabs/gen/lambdalabs/.travis.yml b/v1/providers/lambdalabs/gen/lambdalabs/.travis.yml similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/.travis.yml rename to v1/providers/lambdalabs/gen/lambdalabs/.travis.yml diff --git a/internal/lambdalabs/gen/lambdalabs/README.md b/v1/providers/lambdalabs/gen/lambdalabs/README.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/README.md rename to v1/providers/lambdalabs/gen/lambdalabs/README.md diff --git a/internal/lambdalabs/gen/lambdalabs/api/openapi.yaml b/v1/providers/lambdalabs/gen/lambdalabs/api/openapi.yaml similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/api/openapi.yaml rename to v1/providers/lambdalabs/gen/lambdalabs/api/openapi.yaml diff --git a/internal/lambdalabs/gen/lambdalabs/api_default.go b/v1/providers/lambdalabs/gen/lambdalabs/api_default.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/api_default.go rename to v1/providers/lambdalabs/gen/lambdalabs/api_default.go diff --git a/internal/lambdalabs/gen/lambdalabs/client.go b/v1/providers/lambdalabs/gen/lambdalabs/client.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/client.go rename to v1/providers/lambdalabs/gen/lambdalabs/client.go diff --git a/internal/lambdalabs/gen/lambdalabs/configuration.go b/v1/providers/lambdalabs/gen/lambdalabs/configuration.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/configuration.go rename to v1/providers/lambdalabs/gen/lambdalabs/configuration.go diff --git a/internal/lambdalabs/gen/lambdalabs/docs/AddSSHKey200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/AddSSHKey200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/AddSSHKey200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/AddSSHKey200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/AddSSHKeyRequest.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/AddSSHKeyRequest.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/AddSSHKeyRequest.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/AddSSHKeyRequest.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/DefaultAPI.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/DefaultAPI.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/DefaultAPI.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/DefaultAPI.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/ErrorCode.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/ErrorCode.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/ErrorCode.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/ErrorCode.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/ErrorResponseBody.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/ErrorResponseBody.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/ErrorResponseBody.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/ErrorResponseBody.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/FileSystem.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/FileSystem.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/FileSystem.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/FileSystem.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/GetInstance200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/GetInstance200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/GetInstance200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/GetInstance200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/Instance.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/Instance.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/Instance.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/Instance.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/InstanceType.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceType.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/InstanceType.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceType.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/InstanceTypeSpecs.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceTypeSpecs.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/InstanceTypeSpecs.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceTypeSpecs.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/InstanceTypes200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceTypes200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/InstanceTypes200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceTypes200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/InstanceTypes200ResponseDataValue.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceTypes200ResponseDataValue.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/InstanceTypes200ResponseDataValue.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/InstanceTypes200ResponseDataValue.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/LaunchInstance200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/LaunchInstance200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/LaunchInstance200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/LaunchInstance200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/LaunchInstance200ResponseData.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/LaunchInstance200ResponseData.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/LaunchInstance200ResponseData.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/LaunchInstance200ResponseData.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/LaunchInstanceRequest.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/LaunchInstanceRequest.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/LaunchInstanceRequest.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/LaunchInstanceRequest.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/ListFileSystems200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/ListFileSystems200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/ListFileSystems200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/ListFileSystems200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/ListInstances200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/ListInstances200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/ListInstances200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/ListInstances200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/ListSSHKeys200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/ListSSHKeys200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/ListSSHKeys200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/ListSSHKeys200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/ModelError.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/ModelError.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/ModelError.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/ModelError.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/Region.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/Region.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/Region.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/Region.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/RestartInstance200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/RestartInstance200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/RestartInstance200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/RestartInstance200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/RestartInstance200ResponseData.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/RestartInstance200ResponseData.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/RestartInstance200ResponseData.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/RestartInstance200ResponseData.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/RestartInstanceRequest.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/RestartInstanceRequest.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/RestartInstanceRequest.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/RestartInstanceRequest.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/SshKey.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/SshKey.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/SshKey.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/SshKey.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/TerminateInstance200Response.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/TerminateInstance200Response.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/TerminateInstance200Response.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/TerminateInstance200Response.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/TerminateInstance200ResponseData.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/TerminateInstance200ResponseData.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/TerminateInstance200ResponseData.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/TerminateInstance200ResponseData.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/TerminateInstanceRequest.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/TerminateInstanceRequest.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/TerminateInstanceRequest.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/TerminateInstanceRequest.md diff --git a/internal/lambdalabs/gen/lambdalabs/docs/User.md b/v1/providers/lambdalabs/gen/lambdalabs/docs/User.md similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/docs/User.md rename to v1/providers/lambdalabs/gen/lambdalabs/docs/User.md diff --git a/internal/lambdalabs/gen/lambdalabs/git_push.sh b/v1/providers/lambdalabs/gen/lambdalabs/git_push.sh similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/git_push.sh rename to v1/providers/lambdalabs/gen/lambdalabs/git_push.sh diff --git a/internal/lambdalabs/gen/lambdalabs/model_add_ssh_key_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_add_ssh_key_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_add_ssh_key_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_add_ssh_key_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_add_ssh_key_request.go b/v1/providers/lambdalabs/gen/lambdalabs/model_add_ssh_key_request.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_add_ssh_key_request.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_add_ssh_key_request.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_error.go b/v1/providers/lambdalabs/gen/lambdalabs/model_error.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_error.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_error.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_error_code.go b/v1/providers/lambdalabs/gen/lambdalabs/model_error_code.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_error_code.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_error_code.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_error_response_body.go b/v1/providers/lambdalabs/gen/lambdalabs/model_error_response_body.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_error_response_body.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_error_response_body.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_file_system.go b/v1/providers/lambdalabs/gen/lambdalabs/model_file_system.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_file_system.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_file_system.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_get_instance_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_get_instance_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_get_instance_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_get_instance_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_instance.go b/v1/providers/lambdalabs/gen/lambdalabs/model_instance.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_instance.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_instance.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_instance_type.go b/v1/providers/lambdalabs/gen/lambdalabs/model_instance_type.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_instance_type.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_instance_type.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_instance_type_specs.go b/v1/providers/lambdalabs/gen/lambdalabs/model_instance_type_specs.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_instance_type_specs.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_instance_type_specs.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_instance_types_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_instance_types_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_instance_types_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_instance_types_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_instance_types_200_response_data_value.go b/v1/providers/lambdalabs/gen/lambdalabs/model_instance_types_200_response_data_value.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_instance_types_200_response_data_value.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_instance_types_200_response_data_value.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_launch_instance_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_launch_instance_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_launch_instance_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_launch_instance_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_launch_instance_200_response_data.go b/v1/providers/lambdalabs/gen/lambdalabs/model_launch_instance_200_response_data.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_launch_instance_200_response_data.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_launch_instance_200_response_data.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_launch_instance_request.go b/v1/providers/lambdalabs/gen/lambdalabs/model_launch_instance_request.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_launch_instance_request.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_launch_instance_request.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_list_file_systems_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_list_file_systems_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_list_file_systems_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_list_file_systems_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_list_instances_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_list_instances_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_list_instances_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_list_instances_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_list_ssh_keys_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_list_ssh_keys_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_list_ssh_keys_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_list_ssh_keys_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_region.go b/v1/providers/lambdalabs/gen/lambdalabs/model_region.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_region.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_region.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_restart_instance_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_restart_instance_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_restart_instance_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_restart_instance_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_restart_instance_200_response_data.go b/v1/providers/lambdalabs/gen/lambdalabs/model_restart_instance_200_response_data.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_restart_instance_200_response_data.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_restart_instance_200_response_data.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_restart_instance_request.go b/v1/providers/lambdalabs/gen/lambdalabs/model_restart_instance_request.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_restart_instance_request.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_restart_instance_request.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_ssh_key.go b/v1/providers/lambdalabs/gen/lambdalabs/model_ssh_key.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_ssh_key.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_ssh_key.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response.go b/v1/providers/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response_data.go b/v1/providers/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response_data.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response_data.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_terminate_instance_200_response_data.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_terminate_instance_request.go b/v1/providers/lambdalabs/gen/lambdalabs/model_terminate_instance_request.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_terminate_instance_request.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_terminate_instance_request.go diff --git a/internal/lambdalabs/gen/lambdalabs/model_user.go b/v1/providers/lambdalabs/gen/lambdalabs/model_user.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/model_user.go rename to v1/providers/lambdalabs/gen/lambdalabs/model_user.go diff --git a/internal/lambdalabs/gen/lambdalabs/response.go b/v1/providers/lambdalabs/gen/lambdalabs/response.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/response.go rename to v1/providers/lambdalabs/gen/lambdalabs/response.go diff --git a/internal/lambdalabs/gen/lambdalabs/test/api_default_test.go b/v1/providers/lambdalabs/gen/lambdalabs/test/api_default_test.go similarity index 97% rename from internal/lambdalabs/gen/lambdalabs/test/api_default_test.go rename to v1/providers/lambdalabs/gen/lambdalabs/test/api_default_test.go index d5ee001..7296e42 100644 --- a/internal/lambdalabs/gen/lambdalabs/test/api_default_test.go +++ b/v1/providers/lambdalabs/gen/lambdalabs/test/api_default_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" + openapiclient "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/lambdalabs/gen/lambdalabs/utils.go b/v1/providers/lambdalabs/gen/lambdalabs/utils.go similarity index 100% rename from internal/lambdalabs/gen/lambdalabs/utils.go rename to v1/providers/lambdalabs/gen/lambdalabs/utils.go diff --git a/internal/lambdalabs/v1/helpers_test.go b/v1/providers/lambdalabs/helpers_test.go similarity index 98% rename from internal/lambdalabs/v1/helpers_test.go rename to v1/providers/lambdalabs/helpers_test.go index cb7f01f..9ec4861 100644 --- a/internal/lambdalabs/v1/helpers_test.go +++ b/v1/providers/lambdalabs/helpers_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func TestConvertLambdaLabsInstanceToV1Instance(t *testing.T) { diff --git a/internal/lambdalabs/v1/instance.go b/v1/providers/lambdalabs/instance.go similarity index 98% rename from internal/lambdalabs/v1/instance.go rename to v1/providers/lambdalabs/instance.go index 412841b..6b153eb 100644 --- a/internal/lambdalabs/v1/instance.go +++ b/v1/providers/lambdalabs/instance.go @@ -9,8 +9,8 @@ import ( "github.com/alecthomas/units" "github.com/brevdev/cloud/internal/collections" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" ) const lambdaLabsTimeNameFormat = "2006-01-02-15-04-05Z07-00" @@ -90,6 +90,7 @@ func (c *LambdaLabsClient) TerminateInstance(ctx context.Context, instanceID v1. InstanceIds: []string{string(instanceID)}, } + // TODO: since "createInstance" also creates an SSH key, we should consider cleaning up the key pair here _, err := c.terminateInstance(ctx, request) if err != nil { return fmt.Errorf("failed to terminate instance: %w", err) diff --git a/internal/lambdalabs/v1/instance_test.go b/v1/providers/lambdalabs/instance_test.go similarity index 98% rename from internal/lambdalabs/v1/instance_test.go rename to v1/providers/lambdalabs/instance_test.go index 87d388b..6020659 100644 --- a/internal/lambdalabs/v1/instance_test.go +++ b/v1/providers/lambdalabs/instance_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "github.com/brevdev/cloud/internal/collections" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" ) func TestLambdaLabsClient_CreateInstance_Success(t *testing.T) { diff --git a/internal/lambdalabs/v1/instancetype.go b/v1/providers/lambdalabs/instancetype.go similarity index 98% rename from internal/lambdalabs/v1/instancetype.go rename to v1/providers/lambdalabs/instancetype.go index 219f5b1..a1091cb 100644 --- a/internal/lambdalabs/v1/instancetype.go +++ b/v1/providers/lambdalabs/instancetype.go @@ -11,8 +11,8 @@ import ( "github.com/alecthomas/units" "github.com/bojanz/currency" "github.com/brevdev/cloud/internal/collections" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" ) // GetInstanceTypePollTime returns the polling interval for instance types diff --git a/internal/lambdalabs/v1/instancetype_test.go b/v1/providers/lambdalabs/instancetype_test.go similarity index 98% rename from internal/lambdalabs/v1/instancetype_test.go rename to v1/providers/lambdalabs/instancetype_test.go index 483eb07..6d306ab 100644 --- a/internal/lambdalabs/v1/instancetype_test.go +++ b/v1/providers/lambdalabs/instancetype_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - openapi "github.com/brevdev/cloud/internal/lambdalabs/gen/lambdalabs" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/lambdalabs/gen/lambdalabs" ) func TestLambdaLabsClient_GetInstanceTypes_Success(t *testing.T) { diff --git a/internal/lambdalabs/v1/location.go b/v1/providers/lambdalabs/location.go similarity index 98% rename from internal/lambdalabs/v1/location.go rename to v1/providers/lambdalabs/location.go index 2283407..411f114 100644 --- a/internal/lambdalabs/v1/location.go +++ b/v1/providers/lambdalabs/location.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) const lambdaLocationsData = `[ diff --git a/internal/lambdalabs/v1/location_test.go b/v1/providers/lambdalabs/location_test.go similarity index 100% rename from internal/lambdalabs/v1/location_test.go rename to v1/providers/lambdalabs/location_test.go diff --git a/internal/lambdalabs/v1/validation_test.go b/v1/providers/lambdalabs/validation_test.go similarity index 96% rename from internal/lambdalabs/v1/validation_test.go rename to v1/providers/lambdalabs/validation_test.go index 54b8b5b..8778bec 100644 --- a/internal/lambdalabs/v1/validation_test.go +++ b/v1/providers/lambdalabs/validation_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/brevdev/cloud/internal/validation" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func TestValidationFunctions(t *testing.T) { diff --git a/internal/nebius/CONTRIBUTE.md b/v1/providers/nebius/CONTRIBUTE.md similarity index 100% rename from internal/nebius/CONTRIBUTE.md rename to v1/providers/nebius/CONTRIBUTE.md diff --git a/internal/nebius/v1/README.md b/v1/providers/nebius/README.md similarity index 100% rename from internal/nebius/v1/README.md rename to v1/providers/nebius/README.md diff --git a/internal/nebius/SECURITY.md b/v1/providers/nebius/SECURITY.md similarity index 100% rename from internal/nebius/SECURITY.md rename to v1/providers/nebius/SECURITY.md diff --git a/internal/nebius/v1/capabilities.go b/v1/providers/nebius/capabilities.go similarity index 97% rename from internal/nebius/v1/capabilities.go rename to v1/providers/nebius/capabilities.go index da76b41..39cee6c 100644 --- a/internal/nebius/v1/capabilities.go +++ b/v1/providers/nebius/capabilities.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func getNebiusCapabilities() v1.Capabilities { diff --git a/internal/nebius/v1/client.go b/v1/providers/nebius/client.go similarity index 98% rename from internal/nebius/v1/client.go rename to v1/providers/nebius/client.go index 25d6d20..5301f2a 100644 --- a/internal/nebius/v1/client.go +++ b/v1/providers/nebius/client.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" "github.com/nebius/gosdk" ) diff --git a/internal/nebius/v1/image.go b/v1/providers/nebius/image.go similarity index 81% rename from internal/nebius/v1/image.go rename to v1/providers/nebius/image.go index f3540bf..cee5f48 100644 --- a/internal/nebius/v1/image.go +++ b/v1/providers/nebius/image.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) GetImages(_ context.Context, _ v1.GetImageArgs) ([]v1.Image, error) { diff --git a/internal/nebius/v1/instance.go b/v1/providers/nebius/instance.go similarity index 97% rename from internal/nebius/v1/instance.go rename to v1/providers/nebius/instance.go index 7fc2824..f86c68a 100644 --- a/internal/nebius/v1/instance.go +++ b/v1/providers/nebius/instance.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) CreateInstance(_ context.Context, _ v1.CreateInstanceAttrs) (*v1.Instance, error) { diff --git a/internal/nebius/v1/instancetype.go b/v1/providers/nebius/instancetype.go similarity index 92% rename from internal/nebius/v1/instancetype.go rename to v1/providers/nebius/instancetype.go index 80b6e83..20b76ec 100644 --- a/internal/nebius/v1/instancetype.go +++ b/v1/providers/nebius/instancetype.go @@ -4,7 +4,7 @@ import ( "context" "time" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) GetInstanceTypes(_ context.Context, _ v1.GetInstanceTypeArgs) ([]v1.InstanceType, error) { diff --git a/internal/nebius/v1/location.go b/v1/providers/nebius/location.go similarity index 82% rename from internal/nebius/v1/location.go rename to v1/providers/nebius/location.go index 3491e0b..ddab8df 100644 --- a/internal/nebius/v1/location.go +++ b/v1/providers/nebius/location.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) GetLocations(_ context.Context, _ v1.GetLocationsArgs) ([]v1.Location, error) { diff --git a/internal/nebius/v1/networking.go b/v1/providers/nebius/networking.go similarity index 89% rename from internal/nebius/v1/networking.go rename to v1/providers/nebius/networking.go index d31c39f..88fe67c 100644 --- a/internal/nebius/v1/networking.go +++ b/v1/providers/nebius/networking.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) AddFirewallRulesToInstance(_ context.Context, _ v1.AddFirewallRulesToInstanceArgs) error { diff --git a/internal/nebius/v1/quota.go b/v1/providers/nebius/quota.go similarity index 83% rename from internal/nebius/v1/quota.go rename to v1/providers/nebius/quota.go index 40601ed..dd3dc81 100644 --- a/internal/nebius/v1/quota.go +++ b/v1/providers/nebius/quota.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) GetInstanceTypeQuotas(_ context.Context, _ v1.GetInstanceTypeQuotasArgs) (v1.Quota, error) { diff --git a/internal/nebius/v1/storage.go b/v1/providers/nebius/storage.go similarity index 81% rename from internal/nebius/v1/storage.go rename to v1/providers/nebius/storage.go index b642e18..61e7374 100644 --- a/internal/nebius/v1/storage.go +++ b/v1/providers/nebius/storage.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) ResizeInstanceVolume(_ context.Context, _ v1.ResizeInstanceVolumeArgs) error { diff --git a/internal/nebius/v1/tags.go b/v1/providers/nebius/tags.go similarity index 81% rename from internal/nebius/v1/tags.go rename to v1/providers/nebius/tags.go index d79bae1..3fe8a55 100644 --- a/internal/nebius/v1/tags.go +++ b/v1/providers/nebius/tags.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *NebiusClient) UpdateInstanceTags(_ context.Context, _ v1.UpdateInstanceTagsArgs) error { diff --git a/internal/shadeform/Makefile b/v1/providers/shadeform/Makefile similarity index 100% rename from internal/shadeform/Makefile rename to v1/providers/shadeform/Makefile diff --git a/internal/shadeform/v1/capabilities.go b/v1/providers/shadeform/capabilities.go similarity index 89% rename from internal/shadeform/v1/capabilities.go rename to v1/providers/shadeform/capabilities.go index 1971f36..5d98d2f 100644 --- a/internal/shadeform/v1/capabilities.go +++ b/v1/providers/shadeform/capabilities.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) func (c *ShadeformClient) GetCapabilities(_ context.Context) (v1.Capabilities, error) { diff --git a/internal/shadeform/v1/client.go b/v1/providers/shadeform/client.go similarity index 95% rename from internal/shadeform/v1/client.go rename to v1/providers/shadeform/client.go index 14ed1b7..460cff4 100644 --- a/internal/shadeform/v1/client.go +++ b/v1/providers/shadeform/client.go @@ -6,8 +6,8 @@ import ( "fmt" "net/http" - openapi "github.com/brevdev/cloud/internal/shadeform/gen/shadeform" - "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/shadeform/gen/shadeform" ) const CloudProviderID = "shadeform" @@ -15,7 +15,7 @@ const CloudProviderID = "shadeform" // ShadeformCredential implements the CloudCredential interface for Shadeform type ShadeformCredential struct { RefID string - APIKey string + APIKey string `json:"api_key"` } var _ v1.CloudCredential = &ShadeformCredential{} diff --git a/internal/shadeform/v1/configuration.go b/v1/providers/shadeform/configuration.go similarity index 83% rename from internal/shadeform/v1/configuration.go rename to v1/providers/shadeform/configuration.go index 604a93c..90b2906 100644 --- a/internal/shadeform/v1/configuration.go +++ b/v1/providers/shadeform/configuration.go @@ -1,7 +1,7 @@ package v1 import ( - openapi "github.com/brevdev/cloud/internal/shadeform/gen/shadeform" + openapi "github.com/brevdev/cloud/v1/providers/shadeform/gen/shadeform" ) type Configuration struct { diff --git a/internal/shadeform/gen/shadeform/.gitignore b/v1/providers/shadeform/gen/shadeform/.gitignore similarity index 100% rename from internal/shadeform/gen/shadeform/.gitignore rename to v1/providers/shadeform/gen/shadeform/.gitignore diff --git a/internal/shadeform/gen/shadeform/.openapi-generator-ignore b/v1/providers/shadeform/gen/shadeform/.openapi-generator-ignore similarity index 100% rename from internal/shadeform/gen/shadeform/.openapi-generator-ignore rename to v1/providers/shadeform/gen/shadeform/.openapi-generator-ignore diff --git a/internal/shadeform/gen/shadeform/.openapi-generator/FILES b/v1/providers/shadeform/gen/shadeform/.openapi-generator/FILES similarity index 97% rename from internal/shadeform/gen/shadeform/.openapi-generator/FILES rename to v1/providers/shadeform/gen/shadeform/.openapi-generator/FILES index d6c9d50..cfdcc9e 100644 --- a/internal/shadeform/gen/shadeform/.openapi-generator/FILES +++ b/v1/providers/shadeform/gen/shadeform/.openapi-generator/FILES @@ -1,5 +1,4 @@ .gitignore -.openapi-generator-ignore .travis.yml README.md api/openapi.yaml @@ -97,5 +96,4 @@ model_volume_types_inner.go model_volumes_response.go model_volumes_types_response.go response.go -test/api_default_test.go -utils.go +utils.go \ No newline at end of file diff --git a/internal/shadeform/gen/shadeform/.openapi-generator/VERSION b/v1/providers/shadeform/gen/shadeform/.openapi-generator/VERSION similarity index 100% rename from internal/shadeform/gen/shadeform/.openapi-generator/VERSION rename to v1/providers/shadeform/gen/shadeform/.openapi-generator/VERSION diff --git a/internal/shadeform/gen/shadeform/.travis.yml b/v1/providers/shadeform/gen/shadeform/.travis.yml similarity index 100% rename from internal/shadeform/gen/shadeform/.travis.yml rename to v1/providers/shadeform/gen/shadeform/.travis.yml diff --git a/internal/shadeform/gen/shadeform/README.md b/v1/providers/shadeform/gen/shadeform/README.md similarity index 100% rename from internal/shadeform/gen/shadeform/README.md rename to v1/providers/shadeform/gen/shadeform/README.md diff --git a/internal/shadeform/gen/shadeform/api/openapi.yaml b/v1/providers/shadeform/gen/shadeform/api/openapi.yaml similarity index 99% rename from internal/shadeform/gen/shadeform/api/openapi.yaml rename to v1/providers/shadeform/gen/shadeform/api/openapi.yaml index ea04682..44cc2a3 100644 --- a/internal/shadeform/gen/shadeform/api/openapi.yaml +++ b/v1/providers/shadeform/gen/shadeform/api/openapi.yaml @@ -514,6 +514,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia os_options: - ubuntu22.04_cuda12.2_shade_os - ubuntu20.04_cuda12.0_shade_os @@ -541,6 +542,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia os_options: - ubuntu22.04_cuda12.2_shade_os - ubuntu20.04_cuda12.0_shade_os @@ -579,6 +581,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia os_options: - ubuntu22.04_cuda12.2_shade_os - ubuntu20.04_cuda12.0_shade_os @@ -652,6 +655,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia launch_configuration: docker_configuration: args: --model mistralai/Mistral-7B-v0.1 @@ -717,6 +721,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia launch_configuration: docker_configuration: args: --model mistralai/Mistral-7B-v0.1 @@ -792,6 +797,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia launch_configuration: docker_configuration: args: --model mistralai/Mistral-7B-v0.1 @@ -976,6 +982,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia cloud_instance_type: gpu_1x_a6000 auto_delete: spend_threshold: "3.14" @@ -1198,6 +1205,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia os_options: - ubuntu22.04_cuda12.2_shade_os - ubuntu20.04_cuda12.0_shade_os @@ -1245,7 +1253,12 @@ components: items: type: string type: array + gpu_manufacturer: + description: The manufacturer of the gpu + example: nvidia + type: string required: + - gpu_manufacturer - gpu_type - interconnect - memory_in_gb @@ -1292,7 +1305,12 @@ components: description: The video memory per GPU for the instance in gigabytes. example: 48 type: integer + gpu_manufacturer: + description: The manufacturer of the gpu + example: nvidia + type: string required: + - gpu_manufacturer - gpu_type - interconnect - memory_in_gb @@ -2693,6 +2711,7 @@ components: vcpus: 6 storage_in_gb: 256 interconnect: pcie + gpu_manufacturer: nvidia VolumeTypes_inner: example: cloud: hyperstack @@ -2732,4 +2751,4 @@ components: ApiKeyAuth: in: header name: X-API-KEY - type: apiKey + type: apiKey \ No newline at end of file diff --git a/internal/shadeform/gen/shadeform/api_default.go b/v1/providers/shadeform/gen/shadeform/api_default.go similarity index 100% rename from internal/shadeform/gen/shadeform/api_default.go rename to v1/providers/shadeform/gen/shadeform/api_default.go diff --git a/internal/shadeform/gen/shadeform/client.go b/v1/providers/shadeform/gen/shadeform/client.go similarity index 100% rename from internal/shadeform/gen/shadeform/client.go rename to v1/providers/shadeform/gen/shadeform/client.go diff --git a/internal/shadeform/gen/shadeform/configuration.go b/v1/providers/shadeform/gen/shadeform/configuration.go similarity index 100% rename from internal/shadeform/gen/shadeform/configuration.go rename to v1/providers/shadeform/gen/shadeform/configuration.go diff --git a/internal/shadeform/gen/shadeform/docs/AddSshKeyRequest.md b/v1/providers/shadeform/gen/shadeform/docs/AddSshKeyRequest.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/AddSshKeyRequest.md rename to v1/providers/shadeform/gen/shadeform/docs/AddSshKeyRequest.md diff --git a/internal/shadeform/gen/shadeform/docs/AddSshKeyResponse.md b/v1/providers/shadeform/gen/shadeform/docs/AddSshKeyResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/AddSshKeyResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/AddSshKeyResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/Alert.md b/v1/providers/shadeform/gen/shadeform/docs/Alert.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Alert.md rename to v1/providers/shadeform/gen/shadeform/docs/Alert.md diff --git a/internal/shadeform/gen/shadeform/docs/AutoDelete.md b/v1/providers/shadeform/gen/shadeform/docs/AutoDelete.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/AutoDelete.md rename to v1/providers/shadeform/gen/shadeform/docs/AutoDelete.md diff --git a/internal/shadeform/gen/shadeform/docs/Availability.md b/v1/providers/shadeform/gen/shadeform/docs/Availability.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Availability.md rename to v1/providers/shadeform/gen/shadeform/docs/Availability.md diff --git a/internal/shadeform/gen/shadeform/docs/BootTime.md b/v1/providers/shadeform/gen/shadeform/docs/BootTime.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/BootTime.md rename to v1/providers/shadeform/gen/shadeform/docs/BootTime.md diff --git a/internal/shadeform/gen/shadeform/docs/Cloud.md b/v1/providers/shadeform/gen/shadeform/docs/Cloud.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Cloud.md rename to v1/providers/shadeform/gen/shadeform/docs/Cloud.md diff --git a/internal/shadeform/gen/shadeform/docs/CreateRequest.md b/v1/providers/shadeform/gen/shadeform/docs/CreateRequest.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/CreateRequest.md rename to v1/providers/shadeform/gen/shadeform/docs/CreateRequest.md diff --git a/internal/shadeform/gen/shadeform/docs/CreateResponse.md b/v1/providers/shadeform/gen/shadeform/docs/CreateResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/CreateResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/CreateResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/CreateVolumeRequest.md b/v1/providers/shadeform/gen/shadeform/docs/CreateVolumeRequest.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/CreateVolumeRequest.md rename to v1/providers/shadeform/gen/shadeform/docs/CreateVolumeRequest.md diff --git a/internal/shadeform/gen/shadeform/docs/CreateVolumeResponse.md b/v1/providers/shadeform/gen/shadeform/docs/CreateVolumeResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/CreateVolumeResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/CreateVolumeResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/DefaultAPI.md b/v1/providers/shadeform/gen/shadeform/docs/DefaultAPI.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/DefaultAPI.md rename to v1/providers/shadeform/gen/shadeform/docs/DefaultAPI.md diff --git a/internal/shadeform/gen/shadeform/docs/DockerConfiguration.md b/v1/providers/shadeform/gen/shadeform/docs/DockerConfiguration.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/DockerConfiguration.md rename to v1/providers/shadeform/gen/shadeform/docs/DockerConfiguration.md diff --git a/internal/shadeform/gen/shadeform/docs/Env.md b/v1/providers/shadeform/gen/shadeform/docs/Env.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Env.md rename to v1/providers/shadeform/gen/shadeform/docs/Env.md diff --git a/internal/shadeform/gen/shadeform/docs/FeaturedTemplate.md b/v1/providers/shadeform/gen/shadeform/docs/FeaturedTemplate.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/FeaturedTemplate.md rename to v1/providers/shadeform/gen/shadeform/docs/FeaturedTemplate.md diff --git a/internal/shadeform/gen/shadeform/docs/FeaturedTemplatesResponse.md b/v1/providers/shadeform/gen/shadeform/docs/FeaturedTemplatesResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/FeaturedTemplatesResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/FeaturedTemplatesResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/Instance.md b/v1/providers/shadeform/gen/shadeform/docs/Instance.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Instance.md rename to v1/providers/shadeform/gen/shadeform/docs/Instance.md diff --git a/internal/shadeform/gen/shadeform/docs/InstanceConfiguration.md b/v1/providers/shadeform/gen/shadeform/docs/InstanceConfiguration.md similarity index 89% rename from internal/shadeform/gen/shadeform/docs/InstanceConfiguration.md rename to v1/providers/shadeform/gen/shadeform/docs/InstanceConfiguration.md index 6e4d477..832899d 100644 --- a/internal/shadeform/gen/shadeform/docs/InstanceConfiguration.md +++ b/v1/providers/shadeform/gen/shadeform/docs/InstanceConfiguration.md @@ -12,13 +12,14 @@ Name | Type | Description | Notes **Interconnect** | **string** | The type of GPU interconnect. | **Nvlink** | Pointer to **bool** | If the instance has NVLink | [optional] **VramPerGpuInGb** | **int32** | The video memory per GPU for the instance in gigabytes. | +**GpuManufacturer** | **string** | The manufacturer of the gpu | **Os** | **string** | The operating system of the instance. | ## Methods ### NewInstanceConfiguration -`func NewInstanceConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, os string, ) *InstanceConfiguration` +`func NewInstanceConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, gpuManufacturer string, os string, ) *InstanceConfiguration` NewInstanceConfiguration instantiates a new InstanceConfiguration object This constructor will assign default values to properties that have it defined, @@ -198,6 +199,26 @@ and a boolean to check if the value has been set. SetVramPerGpuInGb sets VramPerGpuInGb field to given value. +### GetGpuManufacturer + +`func (o *InstanceConfiguration) GetGpuManufacturer() string` + +GetGpuManufacturer returns the GpuManufacturer field if non-nil, zero value otherwise. + +### GetGpuManufacturerOk + +`func (o *InstanceConfiguration) GetGpuManufacturerOk() (*string, bool)` + +GetGpuManufacturerOk returns a tuple with the GpuManufacturer field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetGpuManufacturer + +`func (o *InstanceConfiguration) SetGpuManufacturer(v string)` + +SetGpuManufacturer sets GpuManufacturer field to given value. + + ### GetOs `func (o *InstanceConfiguration) GetOs() string` @@ -221,4 +242,3 @@ SetOs sets Os field to given value. [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/internal/shadeform/gen/shadeform/docs/InstanceInfoResponse.md b/v1/providers/shadeform/gen/shadeform/docs/InstanceInfoResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/InstanceInfoResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/InstanceInfoResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/InstancePortMappings.md b/v1/providers/shadeform/gen/shadeform/docs/InstancePortMappings.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/InstancePortMappings.md rename to v1/providers/shadeform/gen/shadeform/docs/InstancePortMappings.md diff --git a/internal/shadeform/gen/shadeform/docs/InstanceType.md b/v1/providers/shadeform/gen/shadeform/docs/InstanceType.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/InstanceType.md rename to v1/providers/shadeform/gen/shadeform/docs/InstanceType.md diff --git a/internal/shadeform/gen/shadeform/docs/InstanceTypeConfiguration.md b/v1/providers/shadeform/gen/shadeform/docs/InstanceTypeConfiguration.md similarity index 89% rename from internal/shadeform/gen/shadeform/docs/InstanceTypeConfiguration.md rename to v1/providers/shadeform/gen/shadeform/docs/InstanceTypeConfiguration.md index d3a3c07..d10bb1d 100644 --- a/internal/shadeform/gen/shadeform/docs/InstanceTypeConfiguration.md +++ b/v1/providers/shadeform/gen/shadeform/docs/InstanceTypeConfiguration.md @@ -13,12 +13,13 @@ Name | Type | Description | Notes **Nvlink** | Pointer to **bool** | If the instance has NVLink | [optional] **VramPerGpuInGb** | **int32** | The video memory per GPU for the instance in gigabytes. | **OsOptions** | **[]string** | The list of available operating systems for the instance. | +**GpuManufacturer** | **string** | The manufacturer of the gpu | ## Methods ### NewInstanceTypeConfiguration -`func NewInstanceTypeConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, osOptions []string, ) *InstanceTypeConfiguration` +`func NewInstanceTypeConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, osOptions []string, gpuManufacturer string, ) *InstanceTypeConfiguration` NewInstanceTypeConfiguration instantiates a new InstanceTypeConfiguration object This constructor will assign default values to properties that have it defined, @@ -218,7 +219,26 @@ and a boolean to check if the value has been set. SetOsOptions sets OsOptions field to given value. +### GetGpuManufacturer -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) +`func (o *InstanceTypeConfiguration) GetGpuManufacturer() string` + +GetGpuManufacturer returns the GpuManufacturer field if non-nil, zero value otherwise. + +### GetGpuManufacturerOk + +`func (o *InstanceTypeConfiguration) GetGpuManufacturerOk() (*string, bool)` + +GetGpuManufacturerOk returns a tuple with the GpuManufacturer field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. +### SetGpuManufacturer + +`func (o *InstanceTypeConfiguration) SetGpuManufacturer(v string)` + +SetGpuManufacturer sets GpuManufacturer field to given value. + + + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/internal/shadeform/gen/shadeform/docs/InstanceTypesResponse.md b/v1/providers/shadeform/gen/shadeform/docs/InstanceTypesResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/InstanceTypesResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/InstanceTypesResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/InstancesResponse.md b/v1/providers/shadeform/gen/shadeform/docs/InstancesResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/InstancesResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/InstancesResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/LaunchConfiguration.md b/v1/providers/shadeform/gen/shadeform/docs/LaunchConfiguration.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/LaunchConfiguration.md rename to v1/providers/shadeform/gen/shadeform/docs/LaunchConfiguration.md diff --git a/internal/shadeform/gen/shadeform/docs/Networking.md b/v1/providers/shadeform/gen/shadeform/docs/Networking.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Networking.md rename to v1/providers/shadeform/gen/shadeform/docs/Networking.md diff --git a/internal/shadeform/gen/shadeform/docs/PortMappings.md b/v1/providers/shadeform/gen/shadeform/docs/PortMappings.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/PortMappings.md rename to v1/providers/shadeform/gen/shadeform/docs/PortMappings.md diff --git a/internal/shadeform/gen/shadeform/docs/RegistryCredentials.md b/v1/providers/shadeform/gen/shadeform/docs/RegistryCredentials.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/RegistryCredentials.md rename to v1/providers/shadeform/gen/shadeform/docs/RegistryCredentials.md diff --git a/internal/shadeform/gen/shadeform/docs/ScriptConfiguration.md b/v1/providers/shadeform/gen/shadeform/docs/ScriptConfiguration.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/ScriptConfiguration.md rename to v1/providers/shadeform/gen/shadeform/docs/ScriptConfiguration.md diff --git a/internal/shadeform/gen/shadeform/docs/SshKey.md b/v1/providers/shadeform/gen/shadeform/docs/SshKey.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/SshKey.md rename to v1/providers/shadeform/gen/shadeform/docs/SshKey.md diff --git a/internal/shadeform/gen/shadeform/docs/SshKeysResponse.md b/v1/providers/shadeform/gen/shadeform/docs/SshKeysResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/SshKeysResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/SshKeysResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/Status.md b/v1/providers/shadeform/gen/shadeform/docs/Status.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Status.md rename to v1/providers/shadeform/gen/shadeform/docs/Status.md diff --git a/internal/shadeform/gen/shadeform/docs/Template.md b/v1/providers/shadeform/gen/shadeform/docs/Template.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Template.md rename to v1/providers/shadeform/gen/shadeform/docs/Template.md diff --git a/internal/shadeform/gen/shadeform/docs/TemplateCreateResponse.md b/v1/providers/shadeform/gen/shadeform/docs/TemplateCreateResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/TemplateCreateResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/TemplateCreateResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/TemplateSaveRequest.md b/v1/providers/shadeform/gen/shadeform/docs/TemplateSaveRequest.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/TemplateSaveRequest.md rename to v1/providers/shadeform/gen/shadeform/docs/TemplateSaveRequest.md diff --git a/internal/shadeform/gen/shadeform/docs/TemplatesResponse.md b/v1/providers/shadeform/gen/shadeform/docs/TemplatesResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/TemplatesResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/TemplatesResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/UfwRule.md b/v1/providers/shadeform/gen/shadeform/docs/UfwRule.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/UfwRule.md rename to v1/providers/shadeform/gen/shadeform/docs/UfwRule.md diff --git a/internal/shadeform/gen/shadeform/docs/UpdateRequest.md b/v1/providers/shadeform/gen/shadeform/docs/UpdateRequest.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/UpdateRequest.md rename to v1/providers/shadeform/gen/shadeform/docs/UpdateRequest.md diff --git a/internal/shadeform/gen/shadeform/docs/Volume.md b/v1/providers/shadeform/gen/shadeform/docs/Volume.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/Volume.md rename to v1/providers/shadeform/gen/shadeform/docs/Volume.md diff --git a/internal/shadeform/gen/shadeform/docs/VolumeMount.md b/v1/providers/shadeform/gen/shadeform/docs/VolumeMount.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/VolumeMount.md rename to v1/providers/shadeform/gen/shadeform/docs/VolumeMount.md diff --git a/internal/shadeform/gen/shadeform/docs/VolumeMounts.md b/v1/providers/shadeform/gen/shadeform/docs/VolumeMounts.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/VolumeMounts.md rename to v1/providers/shadeform/gen/shadeform/docs/VolumeMounts.md diff --git a/internal/shadeform/gen/shadeform/docs/VolumeTypesInner.md b/v1/providers/shadeform/gen/shadeform/docs/VolumeTypesInner.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/VolumeTypesInner.md rename to v1/providers/shadeform/gen/shadeform/docs/VolumeTypesInner.md diff --git a/internal/shadeform/gen/shadeform/docs/VolumesResponse.md b/v1/providers/shadeform/gen/shadeform/docs/VolumesResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/VolumesResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/VolumesResponse.md diff --git a/internal/shadeform/gen/shadeform/docs/VolumesTypesResponse.md b/v1/providers/shadeform/gen/shadeform/docs/VolumesTypesResponse.md similarity index 100% rename from internal/shadeform/gen/shadeform/docs/VolumesTypesResponse.md rename to v1/providers/shadeform/gen/shadeform/docs/VolumesTypesResponse.md diff --git a/internal/shadeform/gen/shadeform/git_push.sh b/v1/providers/shadeform/gen/shadeform/git_push.sh similarity index 100% rename from internal/shadeform/gen/shadeform/git_push.sh rename to v1/providers/shadeform/gen/shadeform/git_push.sh diff --git a/internal/shadeform/gen/shadeform/model_add_ssh_key_request.go b/v1/providers/shadeform/gen/shadeform/model_add_ssh_key_request.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_add_ssh_key_request.go rename to v1/providers/shadeform/gen/shadeform/model_add_ssh_key_request.go diff --git a/internal/shadeform/gen/shadeform/model_add_ssh_key_response.go b/v1/providers/shadeform/gen/shadeform/model_add_ssh_key_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_add_ssh_key_response.go rename to v1/providers/shadeform/gen/shadeform/model_add_ssh_key_response.go diff --git a/internal/shadeform/gen/shadeform/model_alert.go b/v1/providers/shadeform/gen/shadeform/model_alert.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_alert.go rename to v1/providers/shadeform/gen/shadeform/model_alert.go diff --git a/internal/shadeform/gen/shadeform/model_auto_delete.go b/v1/providers/shadeform/gen/shadeform/model_auto_delete.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_auto_delete.go rename to v1/providers/shadeform/gen/shadeform/model_auto_delete.go diff --git a/internal/shadeform/gen/shadeform/model_availability.go b/v1/providers/shadeform/gen/shadeform/model_availability.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_availability.go rename to v1/providers/shadeform/gen/shadeform/model_availability.go diff --git a/internal/shadeform/gen/shadeform/model_boot_time.go b/v1/providers/shadeform/gen/shadeform/model_boot_time.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_boot_time.go rename to v1/providers/shadeform/gen/shadeform/model_boot_time.go diff --git a/internal/shadeform/gen/shadeform/model_cloud.go b/v1/providers/shadeform/gen/shadeform/model_cloud.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_cloud.go rename to v1/providers/shadeform/gen/shadeform/model_cloud.go diff --git a/internal/shadeform/gen/shadeform/model_create_request.go b/v1/providers/shadeform/gen/shadeform/model_create_request.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_create_request.go rename to v1/providers/shadeform/gen/shadeform/model_create_request.go diff --git a/internal/shadeform/gen/shadeform/model_create_response.go b/v1/providers/shadeform/gen/shadeform/model_create_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_create_response.go rename to v1/providers/shadeform/gen/shadeform/model_create_response.go diff --git a/internal/shadeform/gen/shadeform/model_create_volume_request.go b/v1/providers/shadeform/gen/shadeform/model_create_volume_request.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_create_volume_request.go rename to v1/providers/shadeform/gen/shadeform/model_create_volume_request.go diff --git a/internal/shadeform/gen/shadeform/model_create_volume_response.go b/v1/providers/shadeform/gen/shadeform/model_create_volume_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_create_volume_response.go rename to v1/providers/shadeform/gen/shadeform/model_create_volume_response.go diff --git a/internal/shadeform/gen/shadeform/model_docker_configuration.go b/v1/providers/shadeform/gen/shadeform/model_docker_configuration.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_docker_configuration.go rename to v1/providers/shadeform/gen/shadeform/model_docker_configuration.go diff --git a/internal/shadeform/gen/shadeform/model_env.go b/v1/providers/shadeform/gen/shadeform/model_env.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_env.go rename to v1/providers/shadeform/gen/shadeform/model_env.go diff --git a/internal/shadeform/gen/shadeform/model_featured_template.go b/v1/providers/shadeform/gen/shadeform/model_featured_template.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_featured_template.go rename to v1/providers/shadeform/gen/shadeform/model_featured_template.go diff --git a/internal/shadeform/gen/shadeform/model_featured_templates_response.go b/v1/providers/shadeform/gen/shadeform/model_featured_templates_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_featured_templates_response.go rename to v1/providers/shadeform/gen/shadeform/model_featured_templates_response.go diff --git a/internal/shadeform/gen/shadeform/model_instance.go b/v1/providers/shadeform/gen/shadeform/model_instance.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_instance.go rename to v1/providers/shadeform/gen/shadeform/model_instance.go diff --git a/internal/shadeform/gen/shadeform/model_instance_configuration.go b/v1/providers/shadeform/gen/shadeform/model_instance_configuration.go similarity index 92% rename from internal/shadeform/gen/shadeform/model_instance_configuration.go rename to v1/providers/shadeform/gen/shadeform/model_instance_configuration.go index 8485777..ceadf42 100644 --- a/internal/shadeform/gen/shadeform/model_instance_configuration.go +++ b/v1/providers/shadeform/gen/shadeform/model_instance_configuration.go @@ -37,6 +37,8 @@ type InstanceConfiguration struct { Nvlink *bool `json:"nvlink,omitempty"` // The video memory per GPU for the instance in gigabytes. VramPerGpuInGb int32 `json:"vram_per_gpu_in_gb"` + // The manufacturer of the gpu + GpuManufacturer string `json:"gpu_manufacturer"` // The operating system of the instance. Os string `json:"os"` AdditionalProperties map[string]interface{} @@ -48,7 +50,7 @@ type _InstanceConfiguration InstanceConfiguration // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewInstanceConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, os string) *InstanceConfiguration { +func NewInstanceConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, gpuManufacturer string, os string) *InstanceConfiguration { this := InstanceConfiguration{} this.MemoryInGb = memoryInGb this.StorageInGb = storageInGb @@ -57,6 +59,7 @@ func NewInstanceConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, this.GpuType = gpuType this.Interconnect = interconnect this.VramPerGpuInGb = vramPerGpuInGb + this.GpuManufacturer = gpuManufacturer this.Os = os return &this } @@ -269,6 +272,30 @@ func (o *InstanceConfiguration) SetVramPerGpuInGb(v int32) { o.VramPerGpuInGb = v } +// GetGpuManufacturer returns the GpuManufacturer field value +func (o *InstanceConfiguration) GetGpuManufacturer() string { + if o == nil { + var ret string + return ret + } + + return o.GpuManufacturer +} + +// GetGpuManufacturerOk returns a tuple with the GpuManufacturer field value +// and a boolean to check if the value has been set. +func (o *InstanceConfiguration) GetGpuManufacturerOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.GpuManufacturer, true +} + +// SetGpuManufacturer sets field value +func (o *InstanceConfiguration) SetGpuManufacturer(v string) { + o.GpuManufacturer = v +} + // GetOs returns the Os field value func (o *InstanceConfiguration) GetOs() string { if o == nil { @@ -313,6 +340,7 @@ func (o InstanceConfiguration) ToMap() (map[string]interface{}, error) { toSerialize["nvlink"] = o.Nvlink } toSerialize["vram_per_gpu_in_gb"] = o.VramPerGpuInGb + toSerialize["gpu_manufacturer"] = o.GpuManufacturer toSerialize["os"] = o.Os for key, value := range o.AdditionalProperties { @@ -334,6 +362,7 @@ func (o *InstanceConfiguration) UnmarshalJSON(data []byte) (err error) { "gpu_type", "interconnect", "vram_per_gpu_in_gb", + "gpu_manufacturer", "os", } @@ -372,6 +401,7 @@ func (o *InstanceConfiguration) UnmarshalJSON(data []byte) (err error) { delete(additionalProperties, "interconnect") delete(additionalProperties, "nvlink") delete(additionalProperties, "vram_per_gpu_in_gb") + delete(additionalProperties, "gpu_manufacturer") delete(additionalProperties, "os") o.AdditionalProperties = additionalProperties } @@ -413,4 +443,4 @@ func (v NullableInstanceConfiguration) MarshalJSON() ([]byte, error) { func (v *NullableInstanceConfiguration) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) -} +} \ No newline at end of file diff --git a/internal/shadeform/gen/shadeform/model_instance_info_response.go b/v1/providers/shadeform/gen/shadeform/model_instance_info_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_instance_info_response.go rename to v1/providers/shadeform/gen/shadeform/model_instance_info_response.go diff --git a/internal/shadeform/gen/shadeform/model_instance_port_mappings.go b/v1/providers/shadeform/gen/shadeform/model_instance_port_mappings.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_instance_port_mappings.go rename to v1/providers/shadeform/gen/shadeform/model_instance_port_mappings.go diff --git a/internal/shadeform/gen/shadeform/model_instance_type.go b/v1/providers/shadeform/gen/shadeform/model_instance_type.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_instance_type.go rename to v1/providers/shadeform/gen/shadeform/model_instance_type.go diff --git a/internal/shadeform/gen/shadeform/model_instance_type_configuration.go b/v1/providers/shadeform/gen/shadeform/model_instance_type_configuration.go similarity index 91% rename from internal/shadeform/gen/shadeform/model_instance_type_configuration.go rename to v1/providers/shadeform/gen/shadeform/model_instance_type_configuration.go index 46d50c8..410e4f2 100644 --- a/internal/shadeform/gen/shadeform/model_instance_type_configuration.go +++ b/v1/providers/shadeform/gen/shadeform/model_instance_type_configuration.go @@ -38,7 +38,9 @@ type InstanceTypeConfiguration struct { // The video memory per GPU for the instance in gigabytes. VramPerGpuInGb int32 `json:"vram_per_gpu_in_gb"` // The list of available operating systems for the instance. - OsOptions []string `json:"os_options"` + OsOptions []string `json:"os_options"` + // The manufacturer of the gpu + GpuManufacturer string `json:"gpu_manufacturer"` AdditionalProperties map[string]interface{} } @@ -48,7 +50,7 @@ type _InstanceTypeConfiguration InstanceTypeConfiguration // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewInstanceTypeConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, osOptions []string) *InstanceTypeConfiguration { +func NewInstanceTypeConfiguration(memoryInGb int32, storageInGb int32, vcpus int32, numGpus int32, gpuType string, interconnect string, vramPerGpuInGb int32, osOptions []string, gpuManufacturer string) *InstanceTypeConfiguration { this := InstanceTypeConfiguration{} this.MemoryInGb = memoryInGb this.StorageInGb = storageInGb @@ -58,6 +60,7 @@ func NewInstanceTypeConfiguration(memoryInGb int32, storageInGb int32, vcpus int this.Interconnect = interconnect this.VramPerGpuInGb = vramPerGpuInGb this.OsOptions = osOptions + this.GpuManufacturer = gpuManufacturer return &this } @@ -293,6 +296,30 @@ func (o *InstanceTypeConfiguration) SetOsOptions(v []string) { o.OsOptions = v } +// GetGpuManufacturer returns the GpuManufacturer field value +func (o *InstanceTypeConfiguration) GetGpuManufacturer() string { + if o == nil { + var ret string + return ret + } + + return o.GpuManufacturer +} + +// GetGpuManufacturerOk returns a tuple with the GpuManufacturer field value +// and a boolean to check if the value has been set. +func (o *InstanceTypeConfiguration) GetGpuManufacturerOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.GpuManufacturer, true +} + +// SetGpuManufacturer sets field value +func (o *InstanceTypeConfiguration) SetGpuManufacturer(v string) { + o.GpuManufacturer = v +} + func (o InstanceTypeConfiguration) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -314,6 +341,7 @@ func (o InstanceTypeConfiguration) ToMap() (map[string]interface{}, error) { } toSerialize["vram_per_gpu_in_gb"] = o.VramPerGpuInGb toSerialize["os_options"] = o.OsOptions + toSerialize["gpu_manufacturer"] = o.GpuManufacturer for key, value := range o.AdditionalProperties { toSerialize[key] = value @@ -335,6 +363,7 @@ func (o *InstanceTypeConfiguration) UnmarshalJSON(data []byte) (err error) { "interconnect", "vram_per_gpu_in_gb", "os_options", + "gpu_manufacturer", } allProperties := make(map[string]interface{}) @@ -373,6 +402,7 @@ func (o *InstanceTypeConfiguration) UnmarshalJSON(data []byte) (err error) { delete(additionalProperties, "nvlink") delete(additionalProperties, "vram_per_gpu_in_gb") delete(additionalProperties, "os_options") + delete(additionalProperties, "gpu_manufacturer") o.AdditionalProperties = additionalProperties } @@ -413,4 +443,4 @@ func (v NullableInstanceTypeConfiguration) MarshalJSON() ([]byte, error) { func (v *NullableInstanceTypeConfiguration) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) -} +} \ No newline at end of file diff --git a/internal/shadeform/gen/shadeform/model_instance_types_response.go b/v1/providers/shadeform/gen/shadeform/model_instance_types_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_instance_types_response.go rename to v1/providers/shadeform/gen/shadeform/model_instance_types_response.go diff --git a/internal/shadeform/gen/shadeform/model_instances_response.go b/v1/providers/shadeform/gen/shadeform/model_instances_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_instances_response.go rename to v1/providers/shadeform/gen/shadeform/model_instances_response.go diff --git a/internal/shadeform/gen/shadeform/model_launch_configuration.go b/v1/providers/shadeform/gen/shadeform/model_launch_configuration.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_launch_configuration.go rename to v1/providers/shadeform/gen/shadeform/model_launch_configuration.go diff --git a/internal/shadeform/gen/shadeform/model_networking.go b/v1/providers/shadeform/gen/shadeform/model_networking.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_networking.go rename to v1/providers/shadeform/gen/shadeform/model_networking.go diff --git a/internal/shadeform/gen/shadeform/model_port_mappings.go b/v1/providers/shadeform/gen/shadeform/model_port_mappings.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_port_mappings.go rename to v1/providers/shadeform/gen/shadeform/model_port_mappings.go diff --git a/internal/shadeform/gen/shadeform/model_registry_credentials.go b/v1/providers/shadeform/gen/shadeform/model_registry_credentials.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_registry_credentials.go rename to v1/providers/shadeform/gen/shadeform/model_registry_credentials.go diff --git a/internal/shadeform/gen/shadeform/model_script_configuration.go b/v1/providers/shadeform/gen/shadeform/model_script_configuration.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_script_configuration.go rename to v1/providers/shadeform/gen/shadeform/model_script_configuration.go diff --git a/internal/shadeform/gen/shadeform/model_ssh_key.go b/v1/providers/shadeform/gen/shadeform/model_ssh_key.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_ssh_key.go rename to v1/providers/shadeform/gen/shadeform/model_ssh_key.go diff --git a/internal/shadeform/gen/shadeform/model_ssh_keys_response.go b/v1/providers/shadeform/gen/shadeform/model_ssh_keys_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_ssh_keys_response.go rename to v1/providers/shadeform/gen/shadeform/model_ssh_keys_response.go diff --git a/internal/shadeform/gen/shadeform/model_status.go b/v1/providers/shadeform/gen/shadeform/model_status.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_status.go rename to v1/providers/shadeform/gen/shadeform/model_status.go diff --git a/internal/shadeform/gen/shadeform/model_template.go b/v1/providers/shadeform/gen/shadeform/model_template.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_template.go rename to v1/providers/shadeform/gen/shadeform/model_template.go diff --git a/internal/shadeform/gen/shadeform/model_template_create_response.go b/v1/providers/shadeform/gen/shadeform/model_template_create_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_template_create_response.go rename to v1/providers/shadeform/gen/shadeform/model_template_create_response.go diff --git a/internal/shadeform/gen/shadeform/model_template_save_request.go b/v1/providers/shadeform/gen/shadeform/model_template_save_request.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_template_save_request.go rename to v1/providers/shadeform/gen/shadeform/model_template_save_request.go diff --git a/internal/shadeform/gen/shadeform/model_templates_response.go b/v1/providers/shadeform/gen/shadeform/model_templates_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_templates_response.go rename to v1/providers/shadeform/gen/shadeform/model_templates_response.go diff --git a/internal/shadeform/gen/shadeform/model_ufw_rule.go b/v1/providers/shadeform/gen/shadeform/model_ufw_rule.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_ufw_rule.go rename to v1/providers/shadeform/gen/shadeform/model_ufw_rule.go diff --git a/internal/shadeform/gen/shadeform/model_update_request.go b/v1/providers/shadeform/gen/shadeform/model_update_request.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_update_request.go rename to v1/providers/shadeform/gen/shadeform/model_update_request.go diff --git a/internal/shadeform/gen/shadeform/model_volume.go b/v1/providers/shadeform/gen/shadeform/model_volume.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_volume.go rename to v1/providers/shadeform/gen/shadeform/model_volume.go diff --git a/internal/shadeform/gen/shadeform/model_volume_mount.go b/v1/providers/shadeform/gen/shadeform/model_volume_mount.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_volume_mount.go rename to v1/providers/shadeform/gen/shadeform/model_volume_mount.go diff --git a/internal/shadeform/gen/shadeform/model_volume_mounts.go b/v1/providers/shadeform/gen/shadeform/model_volume_mounts.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_volume_mounts.go rename to v1/providers/shadeform/gen/shadeform/model_volume_mounts.go diff --git a/internal/shadeform/gen/shadeform/model_volume_types_inner.go b/v1/providers/shadeform/gen/shadeform/model_volume_types_inner.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_volume_types_inner.go rename to v1/providers/shadeform/gen/shadeform/model_volume_types_inner.go diff --git a/internal/shadeform/gen/shadeform/model_volumes_response.go b/v1/providers/shadeform/gen/shadeform/model_volumes_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_volumes_response.go rename to v1/providers/shadeform/gen/shadeform/model_volumes_response.go diff --git a/internal/shadeform/gen/shadeform/model_volumes_types_response.go b/v1/providers/shadeform/gen/shadeform/model_volumes_types_response.go similarity index 100% rename from internal/shadeform/gen/shadeform/model_volumes_types_response.go rename to v1/providers/shadeform/gen/shadeform/model_volumes_types_response.go diff --git a/internal/shadeform/gen/shadeform/response.go b/v1/providers/shadeform/gen/shadeform/response.go similarity index 100% rename from internal/shadeform/gen/shadeform/response.go rename to v1/providers/shadeform/gen/shadeform/response.go diff --git a/internal/shadeform/gen/shadeform/test/api_default_test.go b/v1/providers/shadeform/gen/shadeform/test/api_default_test.go similarity index 98% rename from internal/shadeform/gen/shadeform/test/api_default_test.go rename to v1/providers/shadeform/gen/shadeform/test/api_default_test.go index ed79488..08d02f3 100644 --- a/internal/shadeform/gen/shadeform/test/api_default_test.go +++ b/v1/providers/shadeform/gen/shadeform/test/api_default_test.go @@ -13,7 +13,7 @@ import ( "context" "testing" - openapiclient "github.com/brevdev/cloud/internal/shadeform/gen/shadeform" + openapiclient "github.com/brevdev/cloud/v1/providers/shadeform/gen/shadeform" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/shadeform/gen/shadeform/utils.go b/v1/providers/shadeform/gen/shadeform/utils.go similarity index 100% rename from internal/shadeform/gen/shadeform/utils.go rename to v1/providers/shadeform/gen/shadeform/utils.go diff --git a/internal/shadeform/v1/instance.go b/v1/providers/shadeform/instance.go similarity index 88% rename from internal/shadeform/v1/instance.go rename to v1/providers/shadeform/instance.go index f98d563..8b0828b 100644 --- a/internal/shadeform/v1/instance.go +++ b/v1/providers/shadeform/instance.go @@ -4,11 +4,12 @@ import ( "context" "errors" "fmt" + "io" "strings" "github.com/alecthomas/units" - openapi "github.com/brevdev/cloud/internal/shadeform/gen/shadeform" - "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/shadeform/gen/shadeform" "github.com/google/uuid" ) @@ -104,7 +105,8 @@ func (c *ShadeformClient) CreateInstance(ctx context.Context, attrs v1.CreateIns defer func() { _ = httpResp.Body.Close() }() } if err != nil { - return nil, fmt.Errorf("failed to create instance: %w", err) + httpMessage, _ := io.ReadAll(httpResp.Body) + return nil, fmt.Errorf("failed to create instance: %w, %s", err, string(httpMessage)) } if resp == nil { @@ -134,7 +136,8 @@ func (c *ShadeformClient) addSSHKey(ctx context.Context, keyPairName string, pub defer func() { _ = httpResp.Body.Close() }() } if err != nil { - return "", fmt.Errorf("failed to add SSH Key: %w", err) + httpMessage, _ := io.ReadAll(httpResp.Body) + return "", fmt.Errorf("failed to add SSH Key: %w, %s", err, string(httpMessage)) } if resp == nil { @@ -208,12 +211,12 @@ func (c *ShadeformClient) RebootInstance(_ context.Context, _ v1.CloudProviderIn return v1.ErrNotImplemented } -func (c *ShadeformClient) MergeInstanceForUpdate(currInst v1.Instance, _ v1.Instance) v1.Instance { - return currInst +func (c *ShadeformClient) MergeInstanceForUpdate(_ v1.Instance, newInstance v1.Instance) v1.Instance { + return newInstance } -func (c *ShadeformClient) MergeInstanceTypeForUpdate(currIt v1.InstanceType, _ v1.InstanceType) v1.InstanceType { - return currIt +func (c *ShadeformClient) MergeInstanceTypeForUpdate(_ v1.InstanceType, newInstanceType v1.InstanceType) v1.InstanceType { + return newInstanceType } func (c *ShadeformClient) getLifecycleStatus(status string) v1.LifecycleStatus { @@ -258,16 +261,18 @@ func (c *ShadeformClient) convertInstanceInfoResponseToV1Instance(instanceInfo o delete(tags, cloudCredRefIDTagName) instance := &v1.Instance{ - Name: instanceInfo.Name, - CreatedAt: instanceInfo.CreatedAt, - CloudID: v1.CloudProviderInstanceID(instanceInfo.Id), - PublicIP: instanceInfo.Ip, - Hostname: hostname, - ImageID: instanceInfo.Configuration.Os, - InstanceType: instanceType, - DiskSize: units.Base2Bytes(instanceInfo.Configuration.StorageInGb) * units.GiB, - SSHUser: instanceInfo.SshUser, - SSHPort: int(instanceInfo.SshPort), + Name: instanceInfo.Name, + CreatedAt: instanceInfo.CreatedAt, + CloudID: v1.CloudProviderInstanceID(instanceInfo.Id), + PublicIP: instanceInfo.Ip, + PublicDNS: instanceInfo.Ip, + Hostname: hostname, + ImageID: instanceInfo.Configuration.Os, + InstanceType: instanceType, + InstanceTypeID: v1.InstanceTypeID(c.getInstanceTypeID(instanceType, instanceInfo.Region)), + DiskSize: units.Base2Bytes(instanceInfo.Configuration.StorageInGb) * units.GiB, + SSHUser: instanceInfo.SshUser, + SSHPort: int(instanceInfo.SshPort), Status: v1.Status{ LifecycleStatus: lifeCycleStatus, }, @@ -310,6 +315,7 @@ func (c *ShadeformClient) convertShadeformInstanceToV1Instance(shadeformInstance CreatedAt: shadeformInstance.CreatedAt, CloudID: v1.CloudProviderInstanceID(shadeformInstance.Id), PublicIP: shadeformInstance.Ip, + PublicDNS: shadeformInstance.Ip, Hostname: hostname, ImageID: shadeformInstance.Configuration.Os, InstanceType: instanceType, diff --git a/internal/shadeform/v1/instancetype.go b/v1/providers/shadeform/instancetype.go similarity index 85% rename from internal/shadeform/v1/instancetype.go rename to v1/providers/shadeform/instancetype.go index 10f6dc3..09f8730 100644 --- a/internal/shadeform/v1/instancetype.go +++ b/v1/providers/shadeform/instancetype.go @@ -10,9 +10,8 @@ import ( "github.com/alecthomas/units" "github.com/bojanz/currency" - openapi "github.com/brevdev/cloud/internal/shadeform/gen/shadeform" - - "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/shadeform/gen/shadeform" ) const ( @@ -153,6 +152,8 @@ func (c *ShadeformClient) convertShadeformInstanceTypeToV1InstanceType(shadeform return nil, err } + gpuName := shadeformGPUTypeToBrevGPUName(shadeformInstanceType.Configuration.GpuType) + for _, region := range shadeformInstanceType.Availability { instanceTypes = append(instanceTypes, v1.InstanceType{ ID: v1.InstanceTypeID(c.getInstanceTypeID(instanceType, region.Region)), @@ -163,17 +164,25 @@ func (c *ShadeformClient) convertShadeformInstanceTypeToV1InstanceType(shadeform { Count: shadeformInstanceType.Configuration.NumGpus, Memory: units.Base2Bytes(shadeformInstanceType.Configuration.VramPerGpuInGb) * units.GiB, - MemoryDetails: "", - NetworkDetails: "", - Manufacturer: "", - Name: shadeformInstanceType.Configuration.GpuType, + MemoryDetails: "", // TODO: add memory details + NetworkDetails: shadeformInstanceType.Configuration.Interconnect, + Manufacturer: shadeformInstanceType.Configuration.GpuManufacturer, + Name: gpuName, Type: shadeformInstanceType.Configuration.GpuType, }, }, + SupportedStorage: []v1.Storage{ // TODO: add storage (look in configuration) + { + Type: "ssd", + Count: 1, + Size: units.Base2Bytes(shadeformInstanceType.Configuration.StorageInGb) * units.GiB, + }, + }, BasePrice: basePrice, IsAvailable: region.Available, Location: region.Region, - Provider: CloudProviderID, + Provider: string(shadeformInstanceType.Cloud), + CloudBroker: CloudProviderID, }) } @@ -189,3 +198,12 @@ func convertHourlyPriceToAmount(hourlyPrice int32) (*currency.Amount, error) { } return &amount, nil } + +func shadeformGPUTypeToBrevGPUName(gpuType string) string { + // Shadeform may include a memory size as a suffix. This must be cleaned up before + // being used as a name. + // e.g. A100_80GB -> A100, H100_40GB -> H100 + + gpuType = strings.Split(gpuType, "_")[0] + return gpuType +} diff --git a/internal/shadeform/v1/ufw.go b/v1/providers/shadeform/ufw.go similarity index 98% rename from internal/shadeform/v1/ufw.go rename to v1/providers/shadeform/ufw.go index 16e3333..ae666ec 100644 --- a/internal/shadeform/v1/ufw.go +++ b/v1/providers/shadeform/ufw.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "fmt" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" ) const ( diff --git a/internal/shadeform/v1/validation_test.go b/v1/providers/shadeform/validation_test.go similarity index 95% rename from internal/shadeform/v1/validation_test.go rename to v1/providers/shadeform/validation_test.go index 71204fd..f59a4cf 100644 --- a/internal/shadeform/v1/validation_test.go +++ b/v1/providers/shadeform/validation_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - openapi "github.com/brevdev/cloud/internal/shadeform/gen/shadeform" + "github.com/brevdev/cloud/internal/ssh" "github.com/brevdev/cloud/internal/validation" - "github.com/brevdev/cloud/pkg/ssh" - v1 "github.com/brevdev/cloud/pkg/v1" + v1 "github.com/brevdev/cloud/v1" + openapi "github.com/brevdev/cloud/v1/providers/shadeform/gen/shadeform" "github.com/google/uuid" "github.com/stretchr/testify/require" ) diff --git a/pkg/v1/quota.go b/v1/quota.go similarity index 100% rename from pkg/v1/quota.go rename to v1/quota.go diff --git a/pkg/v1/storage.go b/v1/storage.go similarity index 100% rename from pkg/v1/storage.go rename to v1/storage.go diff --git a/pkg/v1/utils.go b/v1/utils.go similarity index 100% rename from pkg/v1/utils.go rename to v1/utils.go diff --git a/pkg/v1/waiters.go b/v1/waiters.go similarity index 100% rename from pkg/v1/waiters.go rename to v1/waiters.go diff --git a/pkg/v1/waiters_test.go b/v1/waiters_test.go similarity index 100% rename from pkg/v1/waiters_test.go rename to v1/waiters_test.go