refactoring

Author: Benjosh95

internal/cmd/volume/backup/delete/delete.go

@@ -15,6 +15,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
+	iaasutils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas/wait"
 )
@@ -51,14 +52,10 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				return err
 			}
 
-			backup, err := apiClient.GetBackup(ctx, model.ProjectId, model.BackupId).Execute()
+			backupLabel, err := iaasutils.GetBackupName(ctx, apiClient, model.ProjectId, model.BackupId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get backup name: %v", err)
 			}
-			backupLabel := model.BackupId
-			if backup != nil && backup.Name != nil {
-				backupLabel = *backup.Name
-			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to delete backup %q? (This cannot be undone)", backupLabel)

internal/cmd/volume/backup/restore/restore.go

@@ -15,6 +15,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
+	iaasutils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas/wait"
 )
@@ -51,25 +52,21 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				return err
 			}
 
-			// Get backup details for labels
-			backup, err := apiClient.GetBackup(ctx, model.ProjectId, model.BackupId).Execute()
+			backupLabel, err := iaasutils.GetBackupName(ctx, apiClient, model.ProjectId, model.BackupId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get backup details: %v", err)
 			}
-			backupLabel := model.BackupId
-			if backup != nil && backup.Name != nil {
-				backupLabel = *backup.Name
-			}
 
 			// Get source details for labels
 			var sourceLabel string
-			if backup != nil && backup.VolumeId != nil {
+			backup, err := apiClient.GetBackup(ctx, model.ProjectId, model.BackupId).Execute()
+			if err == nil && backup != nil && backup.VolumeId != nil {
 				sourceLabel = *backup.VolumeId
-				volume, err := apiClient.GetVolume(ctx, model.ProjectId, *backup.VolumeId).Execute()
+				name, err := iaasutils.GetVolumeName(ctx, apiClient, model.ProjectId, *backup.VolumeId)
 				if err != nil {
 					params.Printer.Debug(print.ErrorLevel, "get volume details: %v", err)
-				} else if volume.Name != nil {
-					sourceLabel = *volume.Name
+				} else if name != "" {
+					sourceLabel = name
 				}
 			}
 

internal/cmd/volume/backup/update/update.go

@@ -15,6 +15,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/utils"
 
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
@@ -54,6 +55,17 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				return err
 			}
 
+			// Configure API client
+			apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
+			if err != nil {
+				return err
+			}
+
+			backupLabel, err := iaasutils.GetBackupName(ctx, apiClient, model.ProjectId, model.BackupId)
+			if err != nil {
+				params.Printer.Debug(print.ErrorLevel, "get backup name: %v", err)
+			}
+
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to update backup %q? (This cannot be undone)", model.BackupId)
 				err = params.Printer.PromptForConfirmation(prompt)
@@ -62,25 +74,13 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				}
 			}
 
-			// Configure API client
-			apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
-			if err != nil {
-				return err
-			}
-
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
 			resp, err := req.Execute()
 			if err != nil {
 				return fmt.Errorf("update backup: %w", err)
 			}
 
-			// Get backup label (use ID if name not available)
-			backupLabel := model.BackupId
-			if resp.Name != nil {
-				backupLabel = *resp.Name
-			}
-
 			return outputResult(params.Printer, model.OutputFormat, backupLabel, resp)
 		},
 	}

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

@@ -20,6 +20,7 @@ type IaaSClient interface {
 	GetImageExecute(ctx context.Context, projectId string, imageId string) (*iaas.Image, error)
 	GetAffinityGroupExecute(ctx context.Context, projectId string, affinityGroupId string) (*iaas.AffinityGroup, error)
 	GetSnapshotExecute(ctx context.Context, projectId, snapshotId string) (*iaas.Snapshot, error)
+	GetBackupExecute(ctx context.Context, projectId, backupId string) (*iaas.Backup, error)
 }
 
 func GetSecurityGroupRuleName(ctx context.Context, apiClient IaaSClient, projectId, securityGroupRuleId, securityGroupId string) (string, error) {
@@ -150,3 +151,14 @@ func GetSnapshotName(ctx context.Context, apiClient IaaSClient, projectId, snaps
 	}
 	return *resp.Name, nil
 }
+
+func GetBackupName(ctx context.Context, apiClient IaaSClient, projectId, backupId string) (string, error) {
+	resp, err := apiClient.GetBackupExecute(ctx, projectId, backupId)
+	if err != nil {
+		return backupId, fmt.Errorf("get backup: %w", err)
+	}
+	if resp != nil && resp.Name != nil {
+		return *resp.Name, nil
+	}
+	return backupId, nil
+}