adapted server machine-types list command to align to expectations

Author: j1n-o9r

internal/cmd/server/machine-type/list/list.go

@@ -80,22 +80,18 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("read machine-types: %w", err)
 			}
 
-			if resp.Items == nil || len(*resp.Items) == 0 {
-				projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
-				if err != nil {
-					params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
-					projectLabel = model.ProjectId
-				}
-				params.Printer.Info("No machine-types found for project %q\n", projectLabel)
-				return nil
+			projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
+			if err != nil {
+				params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
+				projectLabel = model.ProjectId
 			}
 
 			// limit output
 			if model.Limit != nil && len(*resp.Items) > int(*model.Limit) {
 				*resp.Items = (*resp.Items)[:*model.Limit]
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, *resp)
+			return outputResult(params.Printer, model.OutputFormat, projectLabel, *resp)
 		},
 	}
 
@@ -140,8 +136,12 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat string, machineTypes iaas.MachineTypeListResponse) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, machineTypes iaas.MachineTypeListResponse) error {
 	return p.OutputResult(outputFormat, machineTypes, func() error {
+		if machineTypes.Items == nil || len(*machineTypes.Items) == 0 {
+			p.Outputf("No machine-types found for project %q\n", projectLabel)
+			return nil
+		}
 		table := tables.NewTable()
 		table.SetTitle("Machine-Types")
 		table.SetHeader("NAME", "VCPUS", "RAM (GB)", "DESCRIPTION", "EXTRA SPECS")

internal/cmd/server/machine-type/list/list_test.go

@@ -181,6 +181,7 @@ func TestBuildRequest(t *testing.T) {
 func TestOutputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
+		projectLabel string
 		machineTypes iaas.MachineTypeListResponse
 	}
 	tests := []struct {
@@ -225,7 +226,7 @@ func TestOutputResult(t *testing.T) {
 	p.Cmd = NewCmd(&types.CmdParams{Printer: p})
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(p, tt.args.outputFormat, tt.args.machineTypes); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.machineTypes); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})