From 7a6bd437ba523816f4b0266ff44f3dfaefc1dc89 Mon Sep 17 00:00:00 2001 From: Alexander Dahmen Date: Thu, 30 Jan 2025 11:52:40 +0100 Subject: [PATCH] Onboard server machine-types command Signed-off-by: Alexander Dahmen --- docs/stackit_beta_server.md | 1 + docs/stackit_beta_server_machine-type.md | 35 +++ ...ackit_beta_server_machine-type_describe.md | 43 ++++ docs/stackit_beta_server_machine-type_list.md | 47 ++++ .../server/machine-type/describe/describe.go | 140 ++++++++++++ .../machine-type/describe/describe_test.go | 206 ++++++++++++++++++ .../cmd/beta/server/machine-type/list/list.go | 171 +++++++++++++++ .../server/machine-type/list/list_test.go | 190 ++++++++++++++++ .../beta/server/machine-type/machine-type.go | 28 +++ internal/cmd/beta/server/server.go | 2 + .../performance-class/describe/describe.go | 17 +- 11 files changed, 877 insertions(+), 3 deletions(-) create mode 100644 docs/stackit_beta_server_machine-type.md create mode 100644 docs/stackit_beta_server_machine-type_describe.md create mode 100644 docs/stackit_beta_server_machine-type_list.md create mode 100644 internal/cmd/beta/server/machine-type/describe/describe.go create mode 100644 internal/cmd/beta/server/machine-type/describe/describe_test.go create mode 100644 internal/cmd/beta/server/machine-type/list/list.go create mode 100644 internal/cmd/beta/server/machine-type/list/list_test.go create mode 100644 internal/cmd/beta/server/machine-type/machine-type.go diff --git a/docs/stackit_beta_server.md b/docs/stackit_beta_server.md index a56612e08..8846ca99c 100644 --- a/docs/stackit_beta_server.md +++ b/docs/stackit_beta_server.md @@ -39,6 +39,7 @@ stackit beta server [flags] * [stackit beta server describe](./stackit_beta_server_describe.md) - Shows details of a server * [stackit beta server list](./stackit_beta_server_list.md) - Lists all servers of a project * [stackit beta server log](./stackit_beta_server_log.md) - Gets server console log +* [stackit beta server machine-type](./stackit_beta_server_machine-type.md) - Provides functionality for server machine types available inside a project * [stackit beta server network-interface](./stackit_beta_server_network-interface.md) - Allows attaching/detaching network interfaces to servers * [stackit beta server os-update](./stackit_beta_server_os-update.md) - Provides functionality for managed server updates * [stackit beta server public-ip](./stackit_beta_server_public-ip.md) - Allows attaching/detaching public IPs to servers diff --git a/docs/stackit_beta_server_machine-type.md b/docs/stackit_beta_server_machine-type.md new file mode 100644 index 000000000..406ff1176 --- /dev/null +++ b/docs/stackit_beta_server_machine-type.md @@ -0,0 +1,35 @@ +## stackit beta server machine-type + +Provides functionality for server machine types available inside a project + +### Synopsis + +Provides functionality for server machine types available inside a project. + +``` +stackit beta server machine-type [flags] +``` + +### Options + +``` + -h, --help Help for "stackit beta server machine-type" +``` + +### Options inherited from parent commands + +``` + -y, --assume-yes If set, skips all confirmation prompts + --async If set, runs the command asynchronously + -o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"] + -p, --project-id string Project ID + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta server](./stackit_beta_server.md) - Provides functionality for servers +* [stackit beta server machine-type describe](./stackit_beta_server_machine-type_describe.md) - Shows details of a server machine type +* [stackit beta server machine-type list](./stackit_beta_server_machine-type_list.md) - Get list of all machine types available in a project + diff --git a/docs/stackit_beta_server_machine-type_describe.md b/docs/stackit_beta_server_machine-type_describe.md new file mode 100644 index 000000000..81519354a --- /dev/null +++ b/docs/stackit_beta_server_machine-type_describe.md @@ -0,0 +1,43 @@ +## stackit beta server machine-type describe + +Shows details of a server machine type + +### Synopsis + +Shows details of a server machine type. + +``` +stackit beta server machine-type describe MACHINE_TYPE [flags] +``` + +### Examples + +``` + Show details of a server machine type with name "xxx" + $ stackit beta server machine-type describe xxx + + Show details of a server machine type with name "xxx" in JSON format + $ stackit beta server machine-type describe xxx --output-format json +``` + +### Options + +``` + -h, --help Help for "stackit beta server machine-type describe" +``` + +### Options inherited from parent commands + +``` + -y, --assume-yes If set, skips all confirmation prompts + --async If set, runs the command asynchronously + -o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"] + -p, --project-id string Project ID + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta server machine-type](./stackit_beta_server_machine-type.md) - Provides functionality for server machine types available inside a project + diff --git a/docs/stackit_beta_server_machine-type_list.md b/docs/stackit_beta_server_machine-type_list.md new file mode 100644 index 000000000..3a10a8be5 --- /dev/null +++ b/docs/stackit_beta_server_machine-type_list.md @@ -0,0 +1,47 @@ +## stackit beta server machine-type list + +Get list of all machine types available in a project + +### Synopsis + +Get list of all machine types available in a project. + +``` +stackit beta server machine-type list [flags] +``` + +### Examples + +``` + Get list of all machine types + $ stackit beta server machine-type list + + Get list of all machine types in JSON format + $ stackit beta server machine-type list --output-format json + + List the first 10 machine types + $ stackit beta server machine-type list --limit=10 +``` + +### Options + +``` + -h, --help Help for "stackit beta server machine-type list" + --limit int Limit the output to the first n elements +``` + +### Options inherited from parent commands + +``` + -y, --assume-yes If set, skips all confirmation prompts + --async If set, runs the command asynchronously + -o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"] + -p, --project-id string Project ID + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta server machine-type](./stackit_beta_server_machine-type.md) - Provides functionality for server machine types available inside a project + diff --git a/internal/cmd/beta/server/machine-type/describe/describe.go b/internal/cmd/beta/server/machine-type/describe/describe.go new file mode 100644 index 000000000..4caf15d8b --- /dev/null +++ b/internal/cmd/beta/server/machine-type/describe/describe.go @@ -0,0 +1,140 @@ +package describe + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/goccy/go-yaml" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client" + "github.com/stackitcloud/stackit-cli/internal/pkg/tables" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + "github.com/stackitcloud/stackit-sdk-go/services/iaas" + + "github.com/spf13/cobra" +) + +const ( + machineTypeArg = "MACHINE_TYPE" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + MachineType string +} + +func NewCmd(p *print.Printer) *cobra.Command { + cmd := &cobra.Command{ + Use: fmt.Sprintf("describe %s", machineTypeArg), + Short: "Shows details of a server machine type", + Long: "Shows details of a server machine type.", + Args: args.SingleArg(machineTypeArg, nil), + Example: examples.Build( + examples.NewExample( + `Show details of a server machine type with name "xxx"`, + "$ stackit beta server machine-type describe xxx", + ), + examples.NewExample( + `Show details of a server machine type with name "xxx" in JSON format`, + "$ stackit beta server machine-type describe xxx --output-format json", + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(p, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(p) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + resp, err := req.Execute() + if err != nil { + return fmt.Errorf("read server machine type: %w", err) + } + + return outputResult(p, model.OutputFormat, resp) + }, + } + return cmd +} + +func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) { + machineType := inputArgs[0] + + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + MachineType: machineType, + } + + if p.IsVerbosityDebug() { + modelStr, err := print.BuildDebugStrFromInputModel(model) + if err != nil { + p.Debug(print.ErrorLevel, "convert model to string for debugging: %v", err) + } else { + p.Debug(print.DebugLevel, "parsed input values: %s", modelStr) + } + } + + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiGetMachineTypeRequest { + return apiClient.GetMachineType(ctx, model.ProjectId, model.MachineType) +} + +func outputResult(p *print.Printer, outputFormat string, machineType *iaas.MachineType) error { + switch outputFormat { + case print.JSONOutputFormat: + details, err := json.MarshalIndent(machineType, "", " ") + if err != nil { + return fmt.Errorf("marshal server machine type: %w", err) + } + p.Outputln(string(details)) + + return nil + case print.YAMLOutputFormat: + details, err := yaml.MarshalWithOptions(machineType, yaml.IndentSequence(true)) + if err != nil { + return fmt.Errorf("marshal server machine type: %w", err) + } + p.Outputln(string(details)) + + return nil + default: + table := tables.NewTable() + table.AddRow("NAME", utils.PtrString(machineType.Name)) + table.AddSeparator() + table.AddRow("VCPUS", utils.PtrString(machineType.Vcpus)) + table.AddSeparator() + table.AddRow("RAM (in MB)", utils.PtrString(machineType.Ram)) + table.AddSeparator() + table.AddRow("DISK SIZE (in GB)", utils.PtrString(machineType.Disk)) + table.AddSeparator() + table.AddRow("DESCRIPTION", utils.PtrString(machineType.Description)) + table.AddSeparator() + + err := table.Display(p) + if err != nil { + return fmt.Errorf("render table: %w", err) + } + return nil + } +} diff --git a/internal/cmd/beta/server/machine-type/describe/describe_test.go b/internal/cmd/beta/server/machine-type/describe/describe_test.go new file mode 100644 index 000000000..44c5bcb78 --- /dev/null +++ b/internal/cmd/beta/server/machine-type/describe/describe_test.go @@ -0,0 +1,206 @@ +package describe + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/iaas" +) + +var projectIdFlag = globalflags.ProjectIdFlag + +type testCtxKey struct{} + +var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") +var testClient = &iaas.APIClient{} +var testProjectId = uuid.NewString() +var testMachineType = "t1.1" + +func fixtureArgValues(mods ...func(argValues []string)) []string { + argValues := []string{ + testMachineType, + } + for _, mod := range mods { + mod(argValues) + } + return argValues +} + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + projectIdFlag: testProjectId, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + ProjectId: testProjectId, + Verbosity: globalflags.VerbosityDefault, + }, + MachineType: testMachineType, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *iaas.ApiGetMachineTypeRequest)) iaas.ApiGetMachineTypeRequest { + request := testClient.GetMachineType(testCtx, testProjectId, testMachineType) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no values", + argValues: []string{}, + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "missing machine type arg", + argValues: []string{}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + { + description: "no flag values", + argValues: fixtureArgValues(), + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, projectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + p := print.NewPrinter() + cmd := NewCmd(p) + err := globalflags.Configure(cmd.Flags()) + if err != nil { + t.Fatalf("configure global flags: %v", err) + } + + for flag, value := range tt.flagValues { + err := cmd.Flags().Set(flag, value) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("setting flag --%s=%s: %v", flag, value, err) + } + } + + err = cmd.ValidateArgs(tt.argValues) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating args: %v", err) + } + + err = cmd.ValidateRequiredFlags() + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating flags: %v", err) + } + + model, err := parseInput(p, cmd, tt.argValues) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error parsing input: %v", err) + } + + if !tt.isValid { + t.Fatalf("did not fail on invalid input") + } + diff := cmp.Diff(model, tt.expectedModel) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest iaas.ApiGetMachineTypeRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} diff --git a/internal/cmd/beta/server/machine-type/list/list.go b/internal/cmd/beta/server/machine-type/list/list.go new file mode 100644 index 000000000..db378a1e7 --- /dev/null +++ b/internal/cmd/beta/server/machine-type/list/list.go @@ -0,0 +1,171 @@ +package list + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/goccy/go-yaml" + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/projectname" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client" + "github.com/stackitcloud/stackit-cli/internal/pkg/tables" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/spf13/cobra" + "github.com/stackitcloud/stackit-sdk-go/services/iaas" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + Limit *int64 +} + +const ( + limitFlag = "limit" +) + +func NewCmd(p *print.Printer) *cobra.Command { + cmd := &cobra.Command{ + Use: "list", + Short: "Get list of all machine types available in a project", + Long: "Get list of all machine types available in a project.", + Args: args.NoArgs, + Example: examples.Build( + examples.NewExample( + `Get list of all machine types`, + "$ stackit beta server machine-type list", + ), + examples.NewExample( + `Get list of all machine types in JSON format`, + "$ stackit beta server machine-type list --output-format json", + ), + examples.NewExample( + `List the first 10 machine types`, + `$ stackit beta server machine-type list --limit=10`, + ), + ), + RunE: func(cmd *cobra.Command, _ []string) error { + ctx := context.Background() + model, err := parseInput(p, cmd) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(p) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + resp, err := req.Execute() + if err != nil { + return fmt.Errorf("read machine-types: %w", err) + } + + if resp.Items == nil || len(*resp.Items) == 0 { + projectLabel, err := projectname.GetProjectName(ctx, p, cmd) + if err != nil { + p.Debug(print.ErrorLevel, "get project name: %v", err) + projectLabel = model.ProjectId + } + p.Info("No machine-types found for project %q\n", projectLabel) + return nil + } + + // limit output + if model.Limit != nil && len(*resp.Items) > int(*model.Limit) { + *resp.Items = (*resp.Items)[:*model.Limit] + } + + return outputResult(p, model, resp) + }, + } + + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Int64(limitFlag, 0, "Limit the output to the first n elements") +} + +func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + limit := flags.FlagToInt64Pointer(p, cmd, limitFlag) + if limit != nil && *limit < 1 { + return nil, &errors.FlagValidationError{ + Flag: limitFlag, + Details: "must be greater than 0", + } + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + Limit: flags.FlagToInt64Pointer(p, cmd, limitFlag), + } + + if p.IsVerbosityDebug() { + modelStr, err := print.BuildDebugStrFromInputModel(model) + if err != nil { + p.Debug(print.ErrorLevel, "convert model to string for debugging: %v", err) + } else { + p.Debug(print.DebugLevel, "parsed input values: %s", modelStr) + } + } + + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiListMachineTypesRequest { + return apiClient.ListMachineTypes(ctx, model.ProjectId) +} + +func outputResult(p *print.Printer, model *inputModel, machineTypes *iaas.MachineTypeListResponse) error { + outputFormat := model.OutputFormat + + switch outputFormat { + case print.JSONOutputFormat: + details, err := json.MarshalIndent(machineTypes, "", " ") + if err != nil { + return fmt.Errorf("marshal machineTypes: %w", err) + } + p.Outputln(string(details)) + + return nil + case print.YAMLOutputFormat: + details, err := yaml.MarshalWithOptions(machineTypes, yaml.IndentSequence(true)) + if err != nil { + return fmt.Errorf("marshal machineTypes: %w", err) + } + p.Outputln(string(details)) + + return nil + default: + table := tables.NewTable() + table.SetTitle("Machine-Types") + + table.SetHeader("NAME", "DESCRIPTION") + for _, machineType := range *machineTypes.GetItems() { + table.AddRow(*machineType.Name, utils.PtrString(machineType.Description)) + } + + err := table.Display(p) + if err != nil { + return fmt.Errorf("render table: %w", err) + } + + return nil + } +} diff --git a/internal/cmd/beta/server/machine-type/list/list_test.go b/internal/cmd/beta/server/machine-type/list/list_test.go new file mode 100644 index 000000000..a76fcf00b --- /dev/null +++ b/internal/cmd/beta/server/machine-type/list/list_test.go @@ -0,0 +1,190 @@ +package list + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/iaas" +) + +var projectIdFlag = globalflags.ProjectIdFlag + +type testCtxKey struct{} + +var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") +var testClient = &iaas.APIClient{} +var testProjectId = uuid.NewString() + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + projectIdFlag: testProjectId, + limitFlag: "10", + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + }, + Limit: utils.Ptr(int64(10)), + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *iaas.ApiListMachineTypesRequest)) iaas.ApiListMachineTypesRequest { + request := testClient.ListMachineTypes(testCtx, testProjectId) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "no flag values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, projectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "limit invalid", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[limitFlag] = "invalid" + }), + isValid: false, + }, + { + description: "limit invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[limitFlag] = "0" + }), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + p := print.NewPrinter() + cmd := NewCmd(p) + err := globalflags.Configure(cmd.Flags()) + if err != nil { + t.Fatalf("configure global flags: %v", err) + } + + for flag, value := range tt.flagValues { + err := cmd.Flags().Set(flag, value) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("setting flag --%s=%s: %v", flag, value, err) + } + } + + err = cmd.ValidateRequiredFlags() + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating flags: %v", err) + } + + model, err := parseInput(p, cmd) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error parsing input: %v", err) + } + + if !tt.isValid { + t.Fatalf("did not fail on invalid input") + } + diff := cmp.Diff(model, tt.expectedModel) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest iaas.ApiListMachineTypesRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} diff --git a/internal/cmd/beta/server/machine-type/machine-type.go b/internal/cmd/beta/server/machine-type/machine-type.go new file mode 100644 index 000000000..8878cc29f --- /dev/null +++ b/internal/cmd/beta/server/machine-type/machine-type.go @@ -0,0 +1,28 @@ +package machinetype + +import ( + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/machine-type/describe" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/machine-type/list" + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/spf13/cobra" +) + +func NewCmd(p *print.Printer) *cobra.Command { + cmd := &cobra.Command{ + Use: "machine-type", + Short: "Provides functionality for server machine types available inside a project", + Long: "Provides functionality for server machine types available inside a project.", + Args: args.NoArgs, + Run: utils.CmdHelp, + } + addSubcommands(cmd, p) + return cmd +} + +func addSubcommands(cmd *cobra.Command, p *print.Printer) { + cmd.AddCommand(describe.NewCmd(p)) + cmd.AddCommand(list.NewCmd(p)) +} diff --git a/internal/cmd/beta/server/server.go b/internal/cmd/beta/server/server.go index ef8922220..888ed703a 100644 --- a/internal/cmd/beta/server/server.go +++ b/internal/cmd/beta/server/server.go @@ -10,6 +10,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/describe" "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/list" "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/log" + machinetype "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/machine-type" networkinterface "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/network-interface" osUpdate "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/os-update" publicip "github.com/stackitcloud/stackit-cli/internal/cmd/beta/server/public-ip" @@ -64,4 +65,5 @@ func addSubcommands(cmd *cobra.Command, p *print.Printer) { cmd.AddCommand(rescue.NewCmd(p)) cmd.AddCommand(unrescue.NewCmd(p)) cmd.AddCommand(osUpdate.NewCmd(p)) + cmd.AddCommand(machinetype.NewCmd(p)) } diff --git a/internal/cmd/beta/volume/performance-class/describe/describe.go b/internal/cmd/beta/volume/performance-class/describe/describe.go index fa9625853..4864f25c5 100644 --- a/internal/cmd/beta/volume/performance-class/describe/describe.go +++ b/internal/cmd/beta/volume/performance-class/describe/describe.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "strings" "github.com/goccy/go-yaml" @@ -14,6 +15,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/print" "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client" "github.com/stackitcloud/stackit-cli/internal/pkg/tables" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" "github.com/stackitcloud/stackit-sdk-go/services/iaas" "github.com/spf13/cobra" @@ -121,13 +123,22 @@ func outputResult(p *print.Printer, outputFormat string, performanceClass *iaas. table := tables.NewTable() table.AddRow("NAME", *performanceClass.Name) table.AddSeparator() - table.AddRow("DESCRIPTION", *performanceClass.Description) + table.AddRow("DESCRIPTION", utils.PtrString(performanceClass.Description)) table.AddSeparator() - table.AddRow("IOPS", *performanceClass.Iops) + table.AddRow("IOPS", utils.PtrString(performanceClass.Iops)) table.AddSeparator() - table.AddRow("THROUGHPUT", *performanceClass.Throughput) + table.AddRow("THROUGHPUT", utils.PtrString(performanceClass.Throughput)) table.AddSeparator() + if performanceClass.Labels != nil && len(*performanceClass.Labels) > 0 { + labels := []string{} + for key, value := range *performanceClass.Labels { + labels = append(labels, fmt.Sprintf("%s: %s", key, value)) + } + table.AddRow("LABELS", strings.Join(labels, "\n")) + table.AddSeparator() + } + err := table.Display(p) if err != nil { return fmt.Errorf("render table: %w", err)