refactoring

Author: Benjosh95

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

@@ -14,6 +14,7 @@ import (
 	"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"
+	iaasUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
@@ -71,12 +72,10 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Get volume name for label
-			volumeLabel := model.VolumeID
-			volume, err := apiClient.GetVolume(ctx, model.ProjectId, model.VolumeID).Execute()
+			volumeLabel, err := iaasUtils.GetVolumeName(ctx, apiClient, model.ProjectId, model.VolumeID)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get volume name: %v", err)
-			} else if volume != nil && volume.Name != nil {
-				volumeLabel = *volume.Name
+				volumeLabel = model.VolumeID
 			}
 
 			if !model.AssumeYes {
@@ -105,11 +104,11 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				s.Stop()
 			}
 
+			operationState := "Created"
 			if model.Async {
-				params.Printer.Outputf("Triggered snapshot of %q in %q. Snapshot ID: %s\n", volumeLabel, projectLabel, utils.PtrString(resp.Id))
-			} else {
-				params.Printer.Outputf("Created snapshot of %q in %q. Snapshot ID: %s\n", volumeLabel, projectLabel, utils.PtrString(resp.Id))
+				operationState = "Triggered creation of"
 			}
+			params.Printer.Outputf("%s snapshot of %q in %q. Snapshot ID: %s\n", operationState, volumeLabel, projectLabel, utils.PtrString(resp.Id))
 			return nil
 		},
 	}

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

@@ -12,6 +12,7 @@ import (
 	"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"
+	iaasUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
@@ -53,12 +54,10 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Get snapshot name for label
-			snapshotLabel := model.SnapshotId
-			snapshot, err := apiClient.GetSnapshot(ctx, model.ProjectId, model.SnapshotId).Execute()
+			snapshotLabel, err := iaasUtils.GetSnapshotName(ctx, apiClient, model.ProjectId, model.SnapshotId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get snapshot name: %v", err)
-			} else if snapshot != nil && snapshot.Name != nil {
-				snapshotLabel = *snapshot.Name
+				snapshotLabel = model.SnapshotId
 			}
 
 			if !model.AssumeYes {
@@ -87,11 +86,11 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				s.Stop()
 			}
 
+			operationState := "Deleted"
 			if model.Async {
-				params.Printer.Outputf("Triggered deletion of snapshot %q\n", snapshotLabel)
-			} else {
-				params.Printer.Outputf("Deleted snapshot %q\n", snapshotLabel)
+				operationState = "Triggered deletion of"
 			}
+			params.Printer.Outputf("%s snapshot %q\n", operationState, snapshotLabel)
 			return nil
 		},
 	}

internal/pkg/services/iaas/utils/utils.go

@@ -177,6 +177,10 @@ func GetSnapshotName(ctx context.Context, apiClient IaaSClient, projectId, snaps
 	resp, err := apiClient.GetSnapshotExecute(ctx, projectId, snapshotId)
 	if err != nil {
 		return "", fmt.Errorf("get snapshot: %w", err)
+	} else if resp == nil {
+		return "", ErrResponseNil
+	} else if resp.Name == nil {
+		return "", ErrNameNil
 	}
 	return *resp.Name, nil
 }