adapted server quotas list command to return valid json/yaml when quotas is empty

Author: j1n-o9r

internal/cmd/quota/list/list.go

@@ -64,16 +64,8 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("list quotas: %w", err)
 			}
-			response.Quotas = nil
-			if items := response.Quotas; items == nil {
-				params.Printer.Info("No quotas found for project %q", projectLabel)
-			} else {
-				if err := outputResult(params.Printer, model.OutputFormat, items); err != nil {
-					return fmt.Errorf("output quotas: %w", err)
-				}
-			}
 
-			return nil
+			return outputResult(params.Printer, model.OutputFormat, projectLabel, response.Quotas)
 		},
 	}
 
@@ -100,11 +92,12 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return request
 }
 
-func outputResult(p *print.Printer, outputFormat string, quotas *iaas.QuotaList) error {
-	if quotas == nil {
-		return fmt.Errorf("quotas is nil")
-	}
+func outputResult(p *print.Printer, outputFormat, projectLabel string, quotas *iaas.QuotaList) error {
 	return p.OutputResult(outputFormat, quotas, func() error {
+		if quotas == nil {
+			p.Outputf("No quotas found for project %q", projectLabel)
+			return nil
+		}
 		table := tables.NewTable()
 		table.SetHeader("NAME", "LIMIT", "CURRENT USAGE", "PERCENT")
 		if val := quotas.BackupGigabytes; val != nil {

internal/cmd/quota/list/list_test.go

@@ -138,6 +138,7 @@ func TestBuildRequest(t *testing.T) {
 func Test_outputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
+		projectLabel string
 		quotas       *iaas.QuotaList
 	}
 	tests := []struct {
@@ -148,7 +149,7 @@ func Test_outputResult(t *testing.T) {
 		{
 			name:    "empty",
 			args:    args{},
-			wantErr: true,
+			wantErr: false,
 		},
 		{
 			name: "set quota empty",
@@ -161,7 +162,7 @@ func Test_outputResult(t *testing.T) {
 	params := testparams.NewTestParams()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(params.Printer, tt.args.outputFormat, tt.args.quotas); (err != nil) != tt.wantErr {
+			if err := outputResult(params.Printer, tt.args.outputFormat, tt.args.projectLabel, tt.args.quotas); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})