adapted observability scrape configs list command to return valid json and yaml when no configs are found

Author: j1n-o9r

internal/cmd/observability/scrape-config/list/list.go

@@ -69,23 +69,21 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("get scrape configurations: %w", err)
 			}
-			configs := *resp.Data
-			if len(configs) == 0 {
-				instanceLabel, err := observabilityUtils.GetInstanceName(ctx, apiClient, model.InstanceId, model.ProjectId)
-				if err != nil {
-					params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err)
-					instanceLabel = model.InstanceId
-				}
-				params.Printer.Info("No scrape configurations found for instance %q\n", instanceLabel)
-				return nil
+
+			configs := resp.GetData()
+
+			instanceLabel, err := observabilityUtils.GetInstanceName(ctx, apiClient, model.InstanceId, model.ProjectId)
+			if err != nil {
+				params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err)
+				instanceLabel = model.InstanceId
 			}
 
 			// Truncate output
 			if model.Limit != nil && len(configs) > int(*model.Limit) {
 				configs = configs[:*model.Limit]
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, configs)
+			return outputResult(params.Printer, model.OutputFormat, instanceLabel, configs)
 		},
 	}
 
@@ -127,8 +125,12 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *observabili
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat string, configs []observability.Job) error {
+func outputResult(p *print.Printer, outputFormat, instanceLabel string, configs []observability.Job) error {
 	return p.OutputResult(outputFormat, configs, func() error {
+		if len(configs) == 0 {
+			p.Outputf("No scrape configurations found for instance %q\n", instanceLabel)
+			return nil
+		}
 		table := tables.NewTable()
 		table.SetHeader("NAME", "TARGETS", "SCRAPE INTERVAL")
 		for i := range configs {

internal/cmd/observability/scrape-config/list/list_test.go

@@ -174,8 +174,9 @@ func TestBuildRequest(t *testing.T) {
 
 func TestOutputResult(t *testing.T) {
 	type args struct {
-		outputFormat string
-		configs      []observability.Job
+		outputFormat  string
+		instanceLabel string
+		configs       []observability.Job
 	}
 	tests := []struct {
 		name    string
@@ -205,7 +206,7 @@ func TestOutputResult(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.configs); (err != nil) != tt.wantErr {
+			if err := outputResult(params.Printer, tt.args.outputFormat, tt.args.instanceLabel, tt.args.configs); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})