fix: iaas update

Author: marceljk

internal/cmd/image/create/create.go

@@ -141,7 +141,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if !ok {
 				return fmt.Errorf("create image: no upload URL has been provided")
 			}
-			if err := uploadAsync(ctx, p, model, file, *url); err != nil {
+			if err := uploadAsync(ctx, p, model, file, url); err != nil {
 				return err
 			}
 

internal/cmd/image/list/list.go

@@ -80,13 +80,13 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("list images: %w", err)
 			}
 
-			if items := response.GetItems(); items == nil || len(*items) == 0 {
+			if items := response.GetItems(); len(items) == 0 {
 				p.Info("No images found for project %q", projectLabel)
 			} else {
-				if model.Limit != nil && len(*items) > int(*model.Limit) {
-					*items = (*items)[:*model.Limit]
+				if model.Limit != nil && len(items) > int(*model.Limit) {
+					items = (items)[:*model.Limit]
 				}
-				if err := outputResult(p, model.OutputFormat, *items); err != nil {
+				if err := outputResult(p, model.OutputFormat, items); err != nil {
 					return fmt.Errorf("output images: %w", err)
 				}
 			}

internal/cmd/observability/credentials/create/create_test.go

@@ -6,7 +6,6 @@ import (
 
 	"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/stackitcloud/stackit-sdk-go/services/observability"
 
 	"github.com/google/go-cmp/cmp"
@@ -218,7 +217,7 @@ func TestOutputResult(t *testing.T) {
 			name: "set response with credentials",
 			args: args{
 				resp: &observability.CreateCredentialsResponse{
-					Credentials: observability.NewCredentials(utils.Ptr("dummy-pw"), utils.Ptr("dummy-user")),
+					Credentials: observability.NewCredentials("dummy-pw", "dummy-user"),
 				},
 			},
 			wantErr: false,

internal/cmd/quota/list/list.go

@@ -133,40 +133,40 @@ func outputResult(p *print.Printer, outputFormat string, quotas *iaas.QuotaList)
 		table := tables.NewTable()
 		table.SetHeader("NAME", "LIMIT", "CURRENT USAGE", "PERCENT")
 		if val := quotas.BackupGigabytes; val != nil {
-			table.AddRow("Total size in GiB of backups [GiB]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Total size in GiB of backups [GiB]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Backups; val != nil {
-			table.AddRow("Number of backups [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of backups [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Gigabytes; val != nil {
-			table.AddRow("Total size in GiB of volumes and snapshots [GiB]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Total size in GiB of volumes and snapshots [GiB]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Networks; val != nil {
-			table.AddRow("Number of networks [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of networks [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Nics; val != nil {
-			table.AddRow("Number of network interfaces (nics) [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of network interfaces (nics) [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.PublicIps; val != nil {
-			table.AddRow("Number of public IP addresses [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of public IP addresses [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Ram; val != nil {
-			table.AddRow("Amount of server RAM in MiB [MiB]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Amount of server RAM in MiB [MiB]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.SecurityGroupRules; val != nil {
-			table.AddRow("Number of security group rules [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of security group rules [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.SecurityGroups; val != nil {
-			table.AddRow("Number of security groups [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of security groups [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Snapshots; val != nil {
-			table.AddRow("Number of snapshots [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of snapshots [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Vcpu; val != nil {
-			table.AddRow("Number of server cores (vcpu) [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of server cores (vcpu) [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		if val := quotas.Volumes; val != nil {
-			table.AddRow("Number of volumes [Count]", conv(val.GetLimit()), conv(val.GetUsage()), percentage(val))
+			table.AddRow("Number of volumes [Count]", conv(val.Limit), conv(val.Usage), percentage(val))
 		}
 		err := table.Display(p)
 		if err != nil {
@@ -185,11 +185,13 @@ func conv(n *int64) string {
 }
 
 func percentage(val interface {
-	GetLimit() *int64
-	GetUsage() *int64
+	GetLimitOk() (int64, bool)
+	GetUsageOk() (int64, bool)
 }) string {
-	if a, b := val.GetLimit(), val.GetUsage(); a != nil && b != nil {
-		return fmt.Sprintf("%3.1f%%", 100.0/float64(*a)*float64(*b))
+	a, aOk := val.GetLimitOk()
+	b, bOk := val.GetUsageOk()
+	if aOk && bOk {
+		return fmt.Sprintf("%3.1f%%", 100.0/float64(a)*float64(b))
 	}
 	return "n/a"
 }

internal/cmd/security-group/list/list.go

@@ -67,10 +67,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("list security group: %w", err)
 			}
 
-			if items := response.GetItems(); items == nil || len(*items) == 0 {
+			if items := response.GetItems(); len(items) == 0 {
 				p.Info("No security groups found for project %q", projectLabel)
 			} else {
-				if err := outputResult(p, model.OutputFormat, *items); err != nil {
+				if err := outputResult(p, model.OutputFormat, items); err != nil {
 					return fmt.Errorf("output security groups: %w", err)
 				}
 			}

internal/cmd/server/console/console.go

@@ -127,11 +127,11 @@ func outputResult(p *print.Printer, outputFormat, serverLabel string, serverUrl
 
 		return nil
 	default:
-		if serverUrl.GetUrl() == nil {
+		if _, ok := serverUrl.GetUrlOk(); !ok {
 			return fmt.Errorf("server url is nil")
 		}
 		// unescape url in order to get rid of e.g. %40
-		unescapedURL, err := url.PathUnescape(*serverUrl.GetUrl())
+		unescapedURL, err := url.PathUnescape(serverUrl.GetUrl())
 		if err != nil {
 			return fmt.Errorf("unescape url: %w", err)
 		}

internal/cmd/server/create/create.go

@@ -289,6 +289,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		}
 	}
 
+	var userData *[]byte
+	if model.UserData != nil {
+		userData = utils.Ptr([]byte(*model.UserData))
+	}
+
 	payload := iaas.CreateServerPayload{
 		Name:             model.Name,
 		MachineType:      model.MachineType,
@@ -299,7 +304,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		KeypairName:         model.KeypairName,
 		SecurityGroups:      model.SecurityGroups,
 		ServiceAccountMails: model.ServiceAccountMails,
-		UserData:            model.UserData,
+		UserData:            userData,
 		Volumes:             model.Volumes,
 		Labels:              labelsMap,
 	}

internal/cmd/server/create/create_test.go

@@ -120,7 +120,7 @@ func fixturePayload(mods ...func(payload *iaas.CreateServerPayload)) iaas.Create
 		KeypairName:         utils.Ptr("test-keypair-name"),
 		SecurityGroups:      utils.Ptr([]string{"test-security-groups"}),
 		ServiceAccountMails: utils.Ptr([]string{"test-service-account"}),
-		UserData:            utils.Ptr("test-user-data"),
+		UserData:            utils.Ptr([]byte("test-user-data")),
 		Volumes:             utils.Ptr([]string{testVolumeId}),
 		BootVolume: &iaas.CreateServerPayloadBootVolume{
 			PerformanceClass:    utils.Ptr("test-perf-class"),

internal/cmd/server/log/log.go

@@ -82,7 +82,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("server log: %w", err)
 			}
 
-			log := *resp.GetOutput()
+			log := resp.GetOutput()
 			lines := strings.Split(log, "\n")
 
 			if len(lines) > int(*model.Length) {

internal/cmd/server/machine-type/list/list.go

@@ -155,8 +155,8 @@ func outputResult(p *print.Printer, outputFormat string, machineTypes iaas.Machi
 		table.SetTitle("Machine-Types")
 
 		table.SetHeader("NAME", "DESCRIPTION")
-		if items := machineTypes.GetItems(); items != nil && len(*items) > 0 {
-			for _, machineType := range *items {
+		if items := machineTypes.GetItems(); len(items) > 0 {
+			for _, machineType := range items {
 				table.AddRow(*machineType.Name, utils.PtrString(machineType.Description))
 			}
 		}