Add checks if serverLabel is empty

marceljk · marceljk · commit 5bb16271d4b9 · 2025-02-19T11:24:27.000+01:00
diff --git a/internal/cmd/beta/server/backup/create/create.go b/internal/cmd/beta/server/backup/create/create.go
@@ -73,7 +73,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/backup/disable/disable.go b/internal/cmd/beta/server/backup/disable/disable.go
@@ -58,7 +58,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/backup/enable/enable.go b/internal/cmd/beta/server/backup/enable/enable.go
@@ -58,7 +58,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/backup/list/list.go b/internal/cmd/beta/server/backup/list/list.go
@@ -13,6 +13,8 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
+	iaasClient "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/services/serverbackup/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
@@ -65,7 +67,17 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			}
 			backups := *resp.Items
 			if len(backups) == 0 {
-				p.Info("No backups found for server %s\n", model.ServerId)
+				serverLabel := model.ServerId
+				// Get server name
+				if iaasApiClient, err := iaasClient.ConfigureClient(p); err == nil {
+					serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
+					if err != nil {
+						p.Debug(print.ErrorLevel, "get server name: %v", err)
+					} else if serverName != "" {
+						serverLabel = serverName
+					}
+				}
+				p.Info("No backups found for server %s\n", serverLabel)
 				return nil
 			}
 
diff --git a/internal/cmd/beta/server/backup/schedule/create/create.go b/internal/cmd/beta/server/backup/schedule/create/create.go
@@ -81,7 +81,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/backup/schedule/delete/delete.go b/internal/cmd/beta/server/backup/schedule/delete/delete.go
@@ -59,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/backup/schedule/list/list.go b/internal/cmd/beta/server/backup/schedule/list/list.go
@@ -65,7 +65,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/command/create/create.go b/internal/cmd/beta/server/command/create/create.go
@@ -69,7 +69,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/command/list/list.go b/internal/cmd/beta/server/command/list/list.go
@@ -65,7 +65,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/console/console.go b/internal/cmd/beta/server/console/console.go
@@ -63,6 +63,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
diff --git a/internal/cmd/beta/server/deallocate/deallocate.go b/internal/cmd/beta/server/deallocate/deallocate.go
@@ -58,6 +58,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to deallocate server %q?", serverLabel)
diff --git a/internal/cmd/beta/server/delete/delete.go b/internal/cmd/beta/server/delete/delete.go
@@ -61,6 +61,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ProjectId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to delete server %q?", serverLabel)
diff --git a/internal/cmd/beta/server/log/log.go b/internal/cmd/beta/server/log/log.go
@@ -72,6 +72,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
diff --git a/internal/cmd/beta/server/network-interface/detach/detach.go b/internal/cmd/beta/server/network-interface/detach/detach.go
@@ -69,6 +69,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			// if the delete flag is provided a network interface is detached and deleted
 			if model.Delete != nil && *model.Delete {
diff --git a/internal/cmd/beta/server/network-interface/list/list.go b/internal/cmd/beta/server/network-interface/list/list.go
@@ -77,6 +77,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
 					serverLabel = *model.ServerId
 				}
+				if serverLabel == "" {
+					serverLabel = *model.ServerId
+				}
 				p.Info("No attached network interfaces found for server %q\n", serverLabel)
 				return nil
 			}
diff --git a/internal/cmd/beta/server/os-update/create/create.go b/internal/cmd/beta/server/os-update/create/create.go
@@ -68,7 +68,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/os-update/disable/disable.go b/internal/cmd/beta/server/os-update/disable/disable.go
@@ -57,7 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/os-update/enable/enable.go b/internal/cmd/beta/server/os-update/enable/enable.go
@@ -58,7 +58,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/os-update/list/list.go b/internal/cmd/beta/server/os-update/list/list.go
@@ -75,7 +75,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 					serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 					if err != nil {
 						p.Debug(print.ErrorLevel, "get server name: %v", err)
-					} else {
+					} else if serverName != "" {
 						serverLabel = serverName
 					}
 				}
diff --git a/internal/cmd/beta/server/os-update/schedule/create/create.go b/internal/cmd/beta/server/os-update/schedule/create/create.go
@@ -77,7 +77,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
-				} else {
+				} else if serverName != "" {
 					serverLabel = serverName
 				}
 			}
diff --git a/internal/cmd/beta/server/os-update/schedule/list/list.go b/internal/cmd/beta/server/os-update/schedule/list/list.go
@@ -73,7 +73,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 					serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
 					if err != nil {
 						p.Debug(print.ErrorLevel, "get server name: %v", err)
-					} else {
+					} else if serverName != "" {
 						serverLabel = serverName
 					}
 				}
diff --git a/internal/cmd/beta/server/public-ip/attach/attach.go b/internal/cmd/beta/server/public-ip/attach/attach.go
@@ -66,6 +66,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to attach public IP %q to server %q?", publicIpLabel, serverLabel)
diff --git a/internal/cmd/beta/server/public-ip/detach/detach.go b/internal/cmd/beta/server/public-ip/detach/detach.go
@@ -68,6 +68,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to detach public IP %q from server %q?", publicIpLabel, serverLabel)
diff --git a/internal/cmd/beta/server/reboot/reboot.go b/internal/cmd/beta/server/reboot/reboot.go
@@ -66,7 +66,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
-
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to reboot server %q?", serverLabel)
 				err = p.PromptForConfirmation(prompt)
diff --git a/internal/cmd/beta/server/rescue/rescue.go b/internal/cmd/beta/server/rescue/rescue.go
@@ -62,6 +62,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to rescue server %q?", serverLabel)
diff --git a/internal/cmd/beta/server/resize/resize.go b/internal/cmd/beta/server/resize/resize.go
@@ -62,6 +62,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to resize server %q to machine type %q?", serverLabel, *model.MachineType)
diff --git a/internal/cmd/beta/server/service-account/attach/attach.go b/internal/cmd/beta/server/service-account/attach/attach.go
@@ -60,6 +60,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to attach service account %q to server %q?", model.ServiceAccMail, serverLabel)
diff --git a/internal/cmd/beta/server/service-account/detach/detach.go b/internal/cmd/beta/server/service-account/detach/detach.go
@@ -60,6 +60,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are your sure you want to detach service account %q from a server %q?", model.ServiceAccMail, serverLabel)
diff --git a/internal/cmd/beta/server/service-account/list/list.go b/internal/cmd/beta/server/service-account/list/list.go
@@ -68,6 +68,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverName = *model.ServerId
 			}
+			if serverName == "" {
+				serverName = *model.ServerId
+			}
 
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
diff --git a/internal/cmd/beta/server/start/start.go b/internal/cmd/beta/server/start/start.go
@@ -58,6 +58,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
diff --git a/internal/cmd/beta/server/stop/stop.go b/internal/cmd/beta/server/stop/stop.go
@@ -58,6 +58,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to stop server %q?", serverLabel)
diff --git a/internal/cmd/beta/server/unrescue/unrescue.go b/internal/cmd/beta/server/unrescue/unrescue.go
@@ -58,6 +58,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to unrescue server %q?", serverLabel)
diff --git a/internal/cmd/beta/server/update/update.go b/internal/cmd/beta/server/update/update.go
@@ -68,6 +68,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to update server %q?", serverLabel)
diff --git a/internal/cmd/beta/server/volume/attach/attach.go b/internal/cmd/beta/server/volume/attach/attach.go
@@ -78,6 +78,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to attach volume %q to server %q?", volumeLabel, serverLabel)
diff --git a/internal/cmd/beta/server/volume/describe/describe.go b/internal/cmd/beta/server/volume/describe/describe.go
@@ -69,12 +69,18 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get volume name: %v", err)
 				volumeLabel = model.VolumeId
 			}
+			if volumeLabel == "" {
+				volumeLabel = model.VolumeId
+			}
 
 			serverLabel, err := iaasUtils.GetServerName(ctx, apiClient, model.ProjectId, *model.ServerId)
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
diff --git a/internal/cmd/beta/server/volume/detach/detach.go b/internal/cmd/beta/server/volume/detach/detach.go
@@ -68,6 +68,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to detach volume %q from server %q?", volumeLabel, serverLabel)
diff --git a/internal/cmd/beta/server/volume/list/list.go b/internal/cmd/beta/server/volume/list/list.go
@@ -61,6 +61,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
 			}
+			if serverLabel == "" {
+				serverLabel = *model.ServerId
+			}
 
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
@@ -70,7 +73,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			}
 			volumes := *resp.Items
 			if len(volumes) == 0 {
-				p.Info("No volumes found for server %s\n", *model.ServerId)
+				p.Info("No volumes found for server %s\n", serverLabel)
 				return nil
 			}
 
diff --git a/internal/cmd/beta/server/volume/update/update.go b/internal/cmd/beta/server/volume/update/update.go

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`73`	`73`	`serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)`
`74`	`74`	`if err != nil {`
`75`	`75`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`76`		`- } else {`
	`76`	`+ } else if serverName != "" {`
`77`	`77`	`serverLabel = serverName`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`58`	`58`	`serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)`
`59`	`59`	`if err != nil {`
`60`	`60`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`61`		`- } else {`
	`61`	`+ } else if serverName != "" {`
`62`	`62`	`serverLabel = serverName`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`81`	`81`	`serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)`
`82`	`82`	`if err != nil {`
`83`	`83`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`84`		`- } else {`
	`84`	`+ } else if serverName != "" {`
`85`	`85`	`serverLabel = serverName`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`59`	`59`	`serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)`
`60`	`60`	`if err != nil {`
`61`	`61`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`62`		`- } else {`
	`62`	`+ } else if serverName != "" {`
`63`	`63`	`serverLabel = serverName`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`65`	`65`	`serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)`
`66`	`66`	`if err != nil {`
`67`	`67`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`68`		`- } else {`
	`68`	`+ } else if serverName != "" {`
`69`	`69`	`serverLabel = serverName`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`69`	`69`	`serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)`
`70`	`70`	`if err != nil {`
`71`	`71`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`72`		`- } else {`
	`72`	`+ } else if serverName != "" {`
`73`	`73`	`serverLabel = serverName`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ func NewCmd(p print.Printer) cobra.Command {`
`63`	`63`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`64`	`64`	`serverLabel = model.ServerId`
`65`	`65`	`}`
	`66`	`+ if serverLabel == "" {`
	`67`	`+ serverLabel = model.ServerId`
	`68`	`+ }`
`66`	`69`
`67`	`70`	`// Call API`
`68`	`71`	`req := buildRequest(ctx, model, apiClient)`