launchpad instance types

Author: drewmalin

internal/currency/currency.go

@@ -0,0 +1,82 @@
+package currency
+
+import (
+	"strconv"
+
+	"github.com/bojanz/currency"
+	"github.com/brevdev/cloud/internal/errors"
+)
+
+func NaNMaker(currencyCode string) (currency.Amount, error) {
+	nan, err := currency.NewAmount("nan", currencyCode)
+	if err != nil {
+		return currency.Amount{}, errors.WrapAndTrace(err)
+	}
+	return nan, nil
+}
+
+func NewAmount(amount string, currencyCode string) (currency.Amount, error) {
+	a, err := currency.NewAmount(amount, currencyCode)
+	if err != nil {
+		return currency.Amount{}, errors.WrapAndTrace(err)
+	}
+	nan, err := NaNMaker(currencyCode)
+	if err != nil {
+		return currency.Amount{}, errors.WrapAndTrace(err)
+	}
+	if a.Equal(nan) {
+		return currency.Amount{}, errors.WrapAndTrace(errors.New("invalid limit amount"))
+	}
+	return a, nil
+}
+
+func MustAmount(amount string, currencyCode string) currency.Amount {
+	a, err := currency.NewAmount(amount, currencyCode)
+	if err != nil {
+		panic(err)
+	}
+	return a
+}
+
+// regular currency is causing issues
+type AmountJSON struct {
+	Number       string `json:"number"`
+	CurrencyCode string `json:"currency"`
+}
+
+func (a AmountJSON) ToAmount() (currency.Amount, error) {
+	return NewAmount(a.Number, a.CurrencyCode)
+}
+
+func FromAmount(a currency.Amount) AmountJSON {
+	return AmountJSON{
+		Number:       a.Number(),
+		CurrencyCode: a.CurrencyCode(),
+	}
+}
+
+func ToDollarsFloat(a currency.Amount) (float64, error) {
+	amountInDollars, err := strconv.ParseFloat(a.Number(), 64)
+	if err != nil {
+		return 0, errors.WrapAndTrace(err)
+	}
+	return amountInDollars, nil
+}
+
+func ToCentsInt(a currency.Amount) (int64, error) {
+	c, err := a.Int64()
+	if err != nil {
+		return 0, errors.WrapAndTrace(err)
+	}
+	return c, nil
+}
+
+func ToDollarsInt(a currency.Amount) (int64, error) {
+	fd, err := ToDollarsFloat(a)
+	if err != nil {
+		return 0, errors.WrapAndTrace(err)
+	}
+	return int64(fd), nil
+}
+
+var ZeroAmount = MustAmount("0", "USD")

internal/currency/currency_test.go

@@ -0,0 +1,71 @@
+package currency
+
+import (
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/bojanz/currency"
+	"github.com/brevdev/dev-plane/pkg/collections"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_CurrencyConversion(t *testing.T) {
+	bad := "$1.22"
+	res, err := currency.NewAmount(bad, "USD")
+	assert.Error(t, err)
+	assert.Empty(t, res)
+
+	res, err = currency.NewAmount(bad, "EU")
+	assert.Error(t, err)
+	assert.Empty(t, res)
+
+	good := "1.22"
+	res, err = currency.NewAmount(good, "USD")
+	assert.NoError(t, err)
+	assert.NotEmpty(t, res)
+
+	r, _ := json.Marshal(res)
+	fmt.Println(string(r))
+	_, _ = collections.FromJSON[currency.Amount](r)
+
+	nan := "nan"
+	res, err = currency.NewAmount(nan, "USD")
+	assert.NoError(t, err)
+	assert.NotEmpty(t, res)
+
+	nanU := "NaN"
+	res, err = currency.NewAmount(nanU, "USD")
+	assert.NoError(t, err)
+	assert.NotEmpty(t, res)
+
+	cents := 550
+	res, err = currency.NewAmountFromInt64(int64(cents), "USD")
+	assert.NoError(t, err)
+	assert.NotEmpty(t, res)
+	assert.Equal(t, "5.50 USD", res.String())
+}
+
+func Test_Int(t *testing.T) {
+	amount, err := currency.NewAmount("5.50", "USD")
+	assert.NoError(t, err)
+	i, err := amount.Int64()
+	assert.NoError(t, err)
+	assert.Equal(t, int64(550), i)
+}
+
+func Test_DollarsInt(t *testing.T) {
+	amount, err := currency.NewAmount("5.50", "USD")
+	assert.NoError(t, err)
+	d, err := ToDollarsInt(amount)
+	assert.NoError(t, err)
+	assert.Equal(t, int64(5), d)
+}
+
+func Test_ToDollarsFloat(t *testing.T) {
+	amount, err := currency.NewAmount("5.50", "USD")
+	assert.NoError(t, err)
+	d, err := ToDollarsFloat(amount)
+	assert.NoError(t, err)
+	assert.Equal(t, float64(5.5), d)
+}

v1/location.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"context"
 	"fmt"
+	"slices"
 )
 
 type CloudLocation interface {
@@ -35,6 +36,13 @@ func (l LocationsFilter) IsAll() bool {
 	return false
 }
 
+func (f LocationsFilter) IsAllowed(location string) bool {
+	if f.IsAll() {
+		return true
+	}
+	return slices.Contains(f, location)
+}
+
 // ValidateGetLocations validates that the CloudLocation implementation returns at least one available location without error.
 func ValidateGetLocations(ctx context.Context, client CloudLocation) error {
 	locs, err := client.GetLocations(ctx, GetLocationsArgs{})

v1/log.go

@@ -0,0 +1,19 @@
+package v1
+
+import "context"
+
+type Logger interface {
+	Debug(ctx context.Context, msg string, args ...any)
+	Info(ctx context.Context, msg string, args ...any)
+	Warn(ctx context.Context, msg string, args ...any)
+	Error(ctx context.Context, msg string, args ...any)
+}
+
+type NoopLogger struct{}
+
+func (l *NoopLogger) Debug(ctx context.Context, msg string, args ...any) {}
+func (l *NoopLogger) Info(ctx context.Context, msg string, args ...any)  {}
+func (l *NoopLogger) Warn(ctx context.Context, msg string, args ...any)  {}
+func (l *NoopLogger) Error(ctx context.Context, msg string, args ...any) {}
+
+var _ Logger = &NoopLogger{}

v1/providers/launchpad/Makefile

@@ -1,4 +1,4 @@
-SPEC_VERSION ?= v2.34.2
+SPEC_VERSION ?= v2.35.4
 SPEC_FILE    ?= /local/swagger-${SPEC_VERSION}.yaml
 OUTPUT_DIR   ?= launchpad
 # To understand disallowAdditionalPropertiesIfNotPresent=false

v1/providers/launchpad/client.go

@@ -10,17 +10,25 @@ import (
 	"github.com/pkg/errors"
 )
 
-
 type LaunchpadClient struct {
 	v1.NotImplCloudClient
 	refID  string
 	apiKey string
 	client *openapi.APIClient
+	logger v1.Logger
 }
 
 var _ v1.CloudClient = &LaunchpadClient{}
 
-func NewLaunchpadClient(launchpadCredential LaunchpadCredential) (*LaunchpadClient, error) {
+type LaunchpadClientOption func(c *LaunchpadClient)
+
+func WithLogger(logger v1.Logger) LaunchpadClientOption {
+	return func(c *LaunchpadClient) {
+		c.logger = logger
+	}
+}
+
+func NewLaunchpadClient(launchpadCredential LaunchpadCredential, opts ...LaunchpadClientOption) (*LaunchpadClient, error) {
 	launchpadCredential.SetDefaults()
 	err := launchpadCredential.Validate()
 	if err != nil {
@@ -37,11 +45,18 @@ func NewLaunchpadClient(launchpadCredential LaunchpadCredential) (*LaunchpadClie
 	}
 	client := openapi.NewAPIClient(conf)
 
-	return &LaunchpadClient{
+	launchpadClient := &LaunchpadClient{
 		refID:  launchpadCredential.RefID,
 		apiKey: launchpadCredential.APIToken,
 		client: client,
-	}, nil
+		logger: &v1.NoopLogger{},
+	}
+
+	for _, opt := range opts {
+		opt(launchpadClient)
+	}
+
+	return launchpadClient, nil
 }
 
 func (c *LaunchpadClient) makeAuthContext(ctx context.Context) context.Context {

v1/providers/launchpad/credential.go

@@ -71,9 +71,13 @@ func (c *LaunchpadCredential) GetTenantID() (string, error) {
 	return fmt.Sprintf("launchpad-%s", hAPIKey), nil
 }
 
+func (c *LaunchpadCredential) MakeClientWithOptions(_ context.Context, _ string, opts ...LaunchpadClientOption) (v1.CloudClient, error) {
+	return NewLaunchpadClient(*c, opts...)
+}
+
 // MakeClient implements v1.CloudCredential.
-func (c *LaunchpadCredential) MakeClient(_ context.Context, _ string) (v1.CloudClient, error) {
-	return NewLaunchpadClient(*c)
+func (c *LaunchpadCredential) MakeClient(ctx context.Context, location string) (v1.CloudClient, error) {
+	return c.MakeClientWithOptions(ctx, location)
 }
 
 func (c *LaunchpadCredential) GetInstancePollTime() time.Duration {

v1/providers/launchpad/gen/launchpad/.openapi-generator/FILES

@@ -7,6 +7,7 @@ api_auth.go
 api_catalog_deployments.go
 api_catalog_experiences.go
 api_catalog_gpu_os_choices.go
+api_catalog_instance_types.go
 api_catalog_persona_choices.go
 api_identity_profile.go
 api_inventory_clusters.go
@@ -26,6 +27,7 @@ docs/BlankEnum.md
 docs/CatalogDeploymentsAPI.md
 docs/CatalogExperiencesAPI.md
 docs/CatalogGpuOsChoicesAPI.md
+docs/CatalogInstanceTypesAPI.md
 docs/CatalogPersonaChoicesAPI.md
 docs/CategoryEnum.md
 docs/Cluster.md
@@ -41,6 +43,7 @@ docs/DeploymentCluster.md
 docs/DeploymentExperience.md
 docs/DeploymentInstance.md
 docs/DeploymentKey.md
+docs/DeploymentNote.md
 docs/DeploymentPipeline.md
 docs/DeploymentPipelineActionEnum.md
 docs/DeploymentService.md
@@ -52,6 +55,7 @@ docs/DocDeploymentDelete.md
 docs/Experience.md
 docs/ExperienceBulk.md
 docs/ExperienceBulkUpdate.md
+docs/ExperienceNote.md
 docs/FcPlatformEnum.md
 docs/FormFactorEnum.md
 docs/Gpu.md
@@ -62,6 +66,11 @@ docs/IdentityProfileAPI.md
 docs/Instance.md
 docs/InstanceBulkUpdate.md
 docs/InstanceState.md
+docs/InstanceType.md
+docs/InstanceTypeGpu.md
+docs/InstanceTypePrice.md
+docs/InstanceTypeStorage.md
+docs/InterconnectionTypeEnum.md
 docs/InventoryClustersAPI.md
 docs/InventoryGpusAPI.md
 docs/InventoryInstancesAPI.md
@@ -86,13 +95,16 @@ docs/PaginatedClusterList.md
 docs/PaginatedDeploymentInstanceList.md
 docs/PaginatedDeploymentKeyList.md
 docs/PaginatedDeploymentList.md
+docs/PaginatedDeploymentNoteList.md
 docs/PaginatedDeploymentPipelineList.md
 docs/PaginatedDeploymentServiceList.md
 docs/PaginatedDeploymentTaskList.md
 docs/PaginatedExperienceList.md
+docs/PaginatedExperienceNoteList.md
 docs/PaginatedGpuList.md
 docs/PaginatedGpuOsChoiceList.md
 docs/PaginatedInstanceList.md
+docs/PaginatedInstanceTypeList.md
 docs/PaginatedLocationList.md
 docs/PaginatedModelChangeList.md
 docs/PaginatedNodeList.md
@@ -135,6 +147,7 @@ model_deployment_cluster.go
 model_deployment_experience.go
 model_deployment_instance.go
 model_deployment_key.go
+model_deployment_note.go
 model_deployment_pipeline.go
 model_deployment_pipeline_action_enum.go
 model_deployment_service.go
@@ -146,6 +159,7 @@ model_doc_deployment_delete.go
 model_experience.go
 model_experience_bulk.go
 model_experience_bulk_update.go
+model_experience_note.go
 model_fc_platform_enum.go
 model_form_factor_enum.go
 model_gpu.go
@@ -155,6 +169,11 @@ model_gpu_os_choice.go
 model_instance.go
 model_instance_bulk_update.go
 model_instance_state.go
+model_instance_type.go
+model_instance_type_gpu.go
+model_instance_type_price.go
+model_instance_type_storage.go
+model_interconnection_type_enum.go
 model_location.go
 model_location_provider.go
 model_logout.go
@@ -172,13 +191,16 @@ model_paginated_cluster_list.go
 model_paginated_deployment_instance_list.go
 model_paginated_deployment_key_list.go
 model_paginated_deployment_list.go
+model_paginated_deployment_note_list.go
 model_paginated_deployment_pipeline_list.go
 model_paginated_deployment_service_list.go
 model_paginated_deployment_task_list.go
 model_paginated_experience_list.go
+model_paginated_experience_note_list.go
 model_paginated_gpu_list.go
 model_paginated_gpu_os_choice_list.go
 model_paginated_instance_list.go
+model_paginated_instance_type_list.go
 model_paginated_location_list.go
 model_paginated_model_change_list.go
 model_paginated_node_list.go
@@ -205,6 +227,7 @@ test/api_auth_test.go
 test/api_catalog_deployments_test.go
 test/api_catalog_experiences_test.go
 test/api_catalog_gpu_os_choices_test.go
+test/api_catalog_instance_types_test.go
 test/api_catalog_persona_choices_test.go
 test/api_identity_profile_test.go
 test/api_inventory_clusters_test.go