update examples, format labels, typing fix

Author: Benjosh95

internal/cmd/volume/snapshot/create/create.go

@@ -42,14 +42,14 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 		Args:  args.NoArgs,
 		Example: examples.Build(
 			examples.NewExample(
-				`Create a snapshot from a volume`,
-				"$ stackit volume snapshot create --volume-id xxx --project-id xxx"),
+				`Create a snapshot from a volume with ID "xxx"`,
+				"$ stackit volume snapshot create --volume-id xxx"),
 			examples.NewExample(
-				`Create a snapshot with a name`,
-				"$ stackit volume snapshot create --volume-id xxx --name my-snapshot --project-id xxx"),
+				`Create a snapshot from a volume with ID "xxx" and name "my-snapshot"`,
+				"$ stackit volume snapshot create --volume-id xxx --name my-snapshot"),
 			examples.NewExample(
-				`Create a snapshot with labels`,
-				"$ stackit volume snapshot create --volume-id xxx --labels key1=value1,key2=value2 --project-id xxx"),
+				`Create a snapshot from a volume with ID "xxx" and labels`,
+				"$ stackit volume snapshot create --volume-id xxx --labels key1=value1,key2=value2"),
 		),
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := context.Background()
@@ -106,9 +106,9 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			if model.Async {
-				params.Printer.Info("Triggered snapshot of %q in %q. Snapshot ID: %s\n", volumeLabel, projectLabel, *resp.Id)
+				params.Printer.Info("Triggered snapshot of %q in %q. Snapshot ID: %s\n", volumeLabel, projectLabel, utils.PtrString(resp.Id))
 			} else {
-				params.Printer.Info("Created snapshot of %q in %q. Snapshot ID: %s\n", volumeLabel, projectLabel, *resp.Id)
+				params.Printer.Info("Created snapshot of %q in %q. Snapshot ID: %s\n", volumeLabel, projectLabel, utils.PtrString(resp.Id))
 			}
 			return nil
 		},

internal/cmd/volume/snapshot/delete/delete.go

@@ -36,11 +36,8 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 		Args:  args.SingleArg(snapshotIdArg, utils.ValidateUUID),
 		Example: examples.Build(
 			examples.NewExample(
-				`Delete a snapshot`,
-				"$ stackit volume snapshot delete xxx-xxx-xxx"),
-			examples.NewExample(
-				`Delete a snapshot and wait for deletion to be completed`,
-				"$ stackit volume snapshot delete xxx-xxx-xxx --async=false"),
+				`Delete a snapshot with ID "xxx"`,
+				"$ stackit volume snapshot delete xxx"),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()

internal/cmd/volume/snapshot/describe/describe.go

@@ -38,11 +38,11 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 		Args:  args.SingleArg(snapshotIdArg, utils.ValidateUUID),
 		Example: examples.Build(
 			examples.NewExample(
-				`Get details of a snapshot`,
-				"$ stackit volume snapshot describe xxx-xxx-xxx"),
+				`Get details of a snapshot with ID "xxx"`,
+				"$ stackit volume snapshot describe xxx"),
 			examples.NewExample(
-				`Get details of a snapshot in JSON format`,
-				"$ stackit volume snapshot describe xxx-xxx-xxx --output-format json"),
+				`Get details of a snapshot with ID "xxx" in JSON format`,
+				"$ stackit volume snapshot describe xxx --output-format json"),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
@@ -127,7 +127,7 @@ func outputResult(p *print.Printer, outputFormat string, snapshot *iaas.Snapshot
 		table.AddSeparator()
 		table.AddRow("NAME", utils.PtrString(snapshot.Name))
 		table.AddSeparator()
-		table.AddRow("SIZE", utils.PtrByteSizeDefault((*int64)(snapshot.Size), ""))
+		table.AddRow("SIZE", utils.PtrByteSizeDefault(snapshot.Size, ""))
 		table.AddSeparator()
 		table.AddRow("STATUS", utils.PtrString(snapshot.Status))
 		table.AddSeparator()

internal/cmd/volume/snapshot/list/list.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"github.com/goccy/go-yaml"
 	"github.com/spf13/cobra"
@@ -177,15 +178,22 @@ func outputResult(p *print.Printer, outputFormat string, snapshots []iaas.Snapsh
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", "SIZE", "STATUS", "VOLUME ID", "LABELS", "CREATED AT", "UPDATED AT")
 
-		for i := range snapshots {
-			snapshot := snapshots[i]
+		for _, snapshot := range snapshots {
+			var labelsString string
+			if snapshot.Labels != nil {
+				var labels []string
+				for key, value := range *snapshot.Labels {
+					labels = append(labels, fmt.Sprintf("%s: %s", key, value))
+				}
+				labelsString = strings.Join(labels, "\n")
+			}
 			table.AddRow(
 				utils.PtrString(snapshot.Id),
 				utils.PtrString(snapshot.Name),
-				utils.PtrByteSizeDefault((*int64)(snapshot.Size), ""),
+				utils.PtrByteSizeDefault(snapshot.Size, ""),
 				utils.PtrString(snapshot.Status),
 				utils.PtrString(snapshot.VolumeId),
-				utils.PtrStringDefault(snapshot.Labels, ""),
+				labelsString,
 				utils.ConvertTimePToDateTimeString(snapshot.CreatedAt),
 				utils.ConvertTimePToDateTimeString(snapshot.UpdatedAt),
 			)

internal/cmd/volume/snapshot/update/update.go

@@ -39,11 +39,11 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 		Args:  args.SingleArg(snapshotIdArg, utils.ValidateUUID),
 		Example: examples.Build(
 			examples.NewExample(
-				`Update a snapshot name`,
-				"$ stackit volume snapshot update xxx-xxx-xxx --name my-new-name"),
+				`Update a snapshot name with ID "xxx"`,
+				"$ stackit volume snapshot update xxx --name my-new-name"),
 			examples.NewExample(
-				`Update a snapshot labels`,
-				"$ stackit volume snapshot update xxx-xxx-xxx --labels key1=value1,key2=value2"),
+				`Update a snapshot labels with ID "xxx"`,
+				"$ stackit volume snapshot update xxx --labels key1=value1,key2=value2"),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()