review feedback: different code style in get server name

marceljk · marceljk · commit e1381de55912 · 2025-02-20T09:46:16.000+01:00
diff --git a/internal/cmd/beta/server/console/console.go b/internal/cmd/beta/server/console/console.go
@@ -62,8 +62,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/deallocate/deallocate.go b/internal/cmd/beta/server/deallocate/deallocate.go
@@ -57,8 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/delete/delete.go b/internal/cmd/beta/server/delete/delete.go
@@ -60,8 +60,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ProjectId
 			}
 
diff --git a/internal/cmd/beta/server/log/log.go b/internal/cmd/beta/server/log/log.go
@@ -71,8 +71,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/network-interface/detach/detach.go b/internal/cmd/beta/server/network-interface/detach/detach.go
@@ -68,8 +68,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/network-interface/list/list.go b/internal/cmd/beta/server/network-interface/list/list.go
@@ -76,8 +76,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get server name: %v", err)
 					serverLabel = *model.ServerId
-				}
-				if serverLabel == "" {
+				} else if serverLabel == "" {
 					serverLabel = *model.ServerId
 				}
 				p.Info("No attached network interfaces found for server %q\n", serverLabel)
diff --git a/internal/cmd/beta/server/public-ip/attach/attach.go b/internal/cmd/beta/server/public-ip/attach/attach.go
@@ -56,17 +56,16 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			publicIpLabel, _, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public ip name: %v", err)
-			}
-			if publicIpLabel == "" {
+				publicIpLabel = model.PublicIpId
+			} else if publicIpLabel == "" {
 				publicIpLabel = model.PublicIpId
 			}
 
 			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 == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/public-ip/detach/detach.go b/internal/cmd/beta/server/public-ip/detach/detach.go
@@ -58,17 +58,15 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public ip: %v", err)
 				publicIpLabel = model.PublicIpId
-			}
-			if publicIpLabel == "" {
+			} else if publicIpLabel == "" {
 				publicIpLabel = model.PublicIpId
 			}
 
 			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 == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/reboot/reboot.go b/internal/cmd/beta/server/reboot/reboot.go
@@ -65,8 +65,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 			if !model.AssumeYes {
diff --git a/internal/cmd/beta/server/rescue/rescue.go b/internal/cmd/beta/server/rescue/rescue.go
@@ -61,8 +61,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/resize/resize.go b/internal/cmd/beta/server/resize/resize.go
@@ -61,8 +61,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/service-account/attach/attach.go b/internal/cmd/beta/server/service-account/attach/attach.go
@@ -59,8 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/service-account/detach/detach.go b/internal/cmd/beta/server/service-account/detach/detach.go
@@ -59,8 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/service-account/list/list.go b/internal/cmd/beta/server/service-account/list/list.go
@@ -67,8 +67,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverName = *model.ServerId
-			}
-			if serverName == "" {
+			} else if serverName == "" {
 				serverName = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/start/start.go b/internal/cmd/beta/server/start/start.go
@@ -57,8 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/stop/stop.go b/internal/cmd/beta/server/stop/stop.go
@@ -57,8 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/unrescue/unrescue.go b/internal/cmd/beta/server/unrescue/unrescue.go
@@ -57,8 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/update/update.go b/internal/cmd/beta/server/update/update.go
@@ -67,8 +67,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/volume/attach/attach.go b/internal/cmd/beta/server/volume/attach/attach.go
@@ -68,17 +68,15 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get volume name: %v", err)
 				volumeLabel = model.VolumeId
-			}
-			if volumeLabel == "" {
+			} else 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 == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/volume/describe/describe.go b/internal/cmd/beta/server/volume/describe/describe.go
@@ -68,17 +68,15 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get volume name: %v", err)
 				volumeLabel = model.VolumeId
-			}
-			if volumeLabel == "" {
+			} else 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 == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/volume/detach/detach.go b/internal/cmd/beta/server/volume/detach/detach.go
@@ -58,17 +58,15 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get volume name: %v", err)
 				volumeLabel = model.VolumeId
-			}
-			if volumeLabel == "" {
+			} else 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 == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/volume/list/list.go b/internal/cmd/beta/server/volume/list/list.go
@@ -60,8 +60,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get server name: %v", err)
 				serverLabel = *model.ServerId
-			}
-			if serverLabel == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 
diff --git a/internal/cmd/beta/server/volume/update/update.go b/internal/cmd/beta/server/volume/update/update.go
@@ -64,17 +64,15 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get volume name: %v", err)
 				volumeLabel = model.VolumeId
-			}
-			if volumeLabel == "" {
+			} else 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 == "" {
+			} else if serverLabel == "" {
 				serverLabel = *model.ServerId
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`62`	`62`	`if err != nil {`
`63`	`63`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`64`	`64`	`serverLabel = model.ServerId`
`65`		`- }`
`66`		`- if serverLabel == "" {`
	`65`	`+ } else if serverLabel == "" {`
`67`	`66`	`serverLabel = model.ServerId`
`68`	`67`	`}`
`69`	`68`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`57`	`57`	`if err != nil {`
`58`	`58`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`59`	`59`	`serverLabel = model.ServerId`
`60`		`- }`
`61`		`- if serverLabel == "" {`
	`60`	`+ } else if serverLabel == "" {`
`62`	`61`	`serverLabel = model.ServerId`
`63`	`62`	`}`
`64`	`63`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`60`	`60`	`if err != nil {`
`61`	`61`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`62`	`62`	`serverLabel = model.ServerId`
`63`		`- }`
`64`		`- if serverLabel == "" {`
	`63`	`+ } else if serverLabel == "" {`
`65`	`64`	`serverLabel = model.ProjectId`
`66`	`65`	`}`
`67`	`66`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`71`	`71`	`if err != nil {`
`72`	`72`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`73`	`73`	`serverLabel = model.ServerId`
`74`		`- }`
`75`		`- if serverLabel == "" {`
	`74`	`+ } else if serverLabel == "" {`
`76`	`75`	`serverLabel = model.ServerId`
`77`	`76`	`}`
`78`	`77`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`68`	`68`	`if err != nil {`
`69`	`69`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`70`	`70`	`serverLabel = *model.ServerId`
`71`		`- }`
`72`		`- if serverLabel == "" {`
	`71`	`+ } else if serverLabel == "" {`
`73`	`72`	`serverLabel = *model.ServerId`
`74`	`73`	`}`
`75`	`74`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`61`	`61`	`if err != nil {`
`62`	`62`	`p.Debug(print.ErrorLevel, "get server name: %v", err)`
`63`	`63`	`serverLabel = model.ServerId`
`64`		`- }`
`65`		`- if serverLabel == "" {`
	`64`	`+ } else if serverLabel == "" {`
`66`	`65`	`serverLabel = model.ServerId`
`67`	`66`	`}`
`68`	`67`