fixed json/yaml for list

Author: Manuelvaas

internal/cmd/beta/logs/access_token/list/list.go

@@ -72,16 +72,12 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("list access tokens: %w", err)
 			}
 
-			if resp.Tokens == nil || len(*resp.Tokens) == 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
-				} else if projectLabel == "" {
-					projectLabel = model.ProjectId
-				}
-				params.Printer.Outputf("No access token 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
+			} else if projectLabel == "" {
+				projectLabel = model.ProjectId
 			}
 
 			// Truncate output
@@ -90,7 +86,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				items = items[:*model.Limit]
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, items)
+			return outputResult(params.Printer, model.OutputFormat, items, projectLabel)
 		},
 	}
 	configureFlags(cmd)
@@ -133,8 +129,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APICli
 	return apiClient.ListAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId)
 }
 
-func outputResult(p *print.Printer, outputFormat string, tokens []logs.AccessToken) error {
+func outputResult(p *print.Printer, outputFormat string, tokens []logs.AccessToken, projectLabel string) error {
 	return p.OutputResult(outputFormat, tokens, func() error {
+		if len(tokens) == 0 {
+			p.Outputf("No access token found for project %q\n", projectLabel)
+			return nil
+		}
+
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", "DESCRIPTION", "PERMISSIONS", "VALID UNTIL", "STATUS")
 

internal/cmd/beta/logs/access_token/list/list_test.go

@@ -186,6 +186,7 @@ func TestOutputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
 		accessTokens []logs.AccessToken
+		projectLabel string
 	}
 	tests := []struct {
 		name    string
@@ -231,7 +232,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.accessTokens); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.accessTokens, tt.args.projectLabel); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})