mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 02:28:09 +00:00 
			
		
		
		
	 3189278c84
			
		
	
	3189278c84
	
	
	
		
			
			* Use Colored UI if stdout is a tty * Add format options to operator unseal * Add format test on operator unseal * Add -no-color output flag, and use BasicUi if no-color flag is provided * Move seal status formatting logic to OutputSealStatus * Apply no-color to warnings from DeprecatedCommands as well * Add OutputWithFormat to support arbitrary data, add format option to auth list * Add ability to output arbitrary list data on TableFormatter * Clear up switch logic on format * Add format option for list-related commands * Add format option to rest of commands that returns a client API response * Remove initOutputYAML and initOutputJSON, and use OutputWithFormat instead * Remove outputAsYAML and outputAsJSON, and use OutputWithFormat instead * Remove -no-color flag, use env var exclusively to toggle colored output * Fix compile * Remove -no-color flag in main.go * Add missing FlagSetOutputFormat * Fix generate-root/decode test * Migrate init functions to main.go * Add no-color flag back as hidden * Handle non-supported data types for TableFormatter.OutputList * Pull formatting much further up to remove the need to use c.flagFormat (#3950) * Pull formatting much further up to remove the need to use c.flagFormat Also remove OutputWithFormat as the logic can cause issues. * Use const for env var * Minor updates * Remove unnecessary check * Fix SSH output and some tests * Fix tests * Make race detector not run on generate root since it kills Travis these days * Update docs * Update docs * Address review feedback * Handle --format as well as -format
		
			
				
	
	
		
			133 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			133 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package command
 | |
| 
 | |
| import (
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 
 | |
| 	"github.com/mitchellh/cli"
 | |
| )
 | |
| 
 | |
| func testListCommand(tb testing.TB) (*cli.MockUi, *ListCommand) {
 | |
| 	tb.Helper()
 | |
| 
 | |
| 	ui := cli.NewMockUi()
 | |
| 	return ui, &ListCommand{
 | |
| 		BaseCommand: &BaseCommand{
 | |
| 			UI: ui,
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestListCommand_Run(t *testing.T) {
 | |
| 	t.Parallel()
 | |
| 
 | |
| 	cases := []struct {
 | |
| 		name string
 | |
| 		args []string
 | |
| 		out  string
 | |
| 		code int
 | |
| 	}{
 | |
| 		{
 | |
| 			"not_enough_args",
 | |
| 			[]string{},
 | |
| 			"Not enough arguments",
 | |
| 			1,
 | |
| 		},
 | |
| 		{
 | |
| 			"too_many_args",
 | |
| 			[]string{"foo", "bar"},
 | |
| 			"Too many arguments",
 | |
| 			1,
 | |
| 		},
 | |
| 		{
 | |
| 			"not_found",
 | |
| 			[]string{"nope/not/once/never"},
 | |
| 			"",
 | |
| 			2,
 | |
| 		},
 | |
| 		{
 | |
| 			"default",
 | |
| 			[]string{"secret/list"},
 | |
| 			"bar\nbaz\nfoo",
 | |
| 			0,
 | |
| 		},
 | |
| 		{
 | |
| 			"default_slash",
 | |
| 			[]string{"secret/list/"},
 | |
| 			"bar\nbaz\nfoo",
 | |
| 			0,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	t.Run("validations", func(t *testing.T) {
 | |
| 		t.Parallel()
 | |
| 
 | |
| 		for _, tc := range cases {
 | |
| 			tc := tc
 | |
| 
 | |
| 			t.Run(tc.name, func(t *testing.T) {
 | |
| 				t.Parallel()
 | |
| 
 | |
| 				client, closer := testVaultServer(t)
 | |
| 				defer closer()
 | |
| 
 | |
| 				keys := []string{
 | |
| 					"secret/list/foo",
 | |
| 					"secret/list/bar",
 | |
| 					"secret/list/baz",
 | |
| 				}
 | |
| 				for _, k := range keys {
 | |
| 					if _, err := client.Logical().Write(k, map[string]interface{}{
 | |
| 						"foo": "bar",
 | |
| 					}); err != nil {
 | |
| 						t.Fatal(err)
 | |
| 					}
 | |
| 				}
 | |
| 
 | |
| 				ui, cmd := testListCommand(t)
 | |
| 				cmd.client = client
 | |
| 
 | |
| 				code := cmd.Run(tc.args)
 | |
| 				if code != tc.code {
 | |
| 					t.Errorf("expected %d to be %d", code, tc.code)
 | |
| 				}
 | |
| 
 | |
| 				combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 				if !strings.Contains(combined, tc.out) {
 | |
| 					t.Errorf("expected %q to contain %q", combined, tc.out)
 | |
| 				}
 | |
| 			})
 | |
| 		}
 | |
| 	})
 | |
| 
 | |
| 	t.Run("communication_failure", func(t *testing.T) {
 | |
| 		t.Parallel()
 | |
| 
 | |
| 		client, closer := testVaultServerBad(t)
 | |
| 		defer closer()
 | |
| 
 | |
| 		ui, cmd := testListCommand(t)
 | |
| 		cmd.client = client
 | |
| 
 | |
| 		code := cmd.Run([]string{
 | |
| 			"secret/list",
 | |
| 		})
 | |
| 		if exp := 2; code != exp {
 | |
| 			t.Errorf("expected %d to be %d", code, exp)
 | |
| 		}
 | |
| 
 | |
| 		expected := "Error listing secret/list/: "
 | |
| 		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 		if !strings.Contains(combined, expected) {
 | |
| 			t.Errorf("expected %q to contain %q", combined, expected)
 | |
| 		}
 | |
| 	})
 | |
| 
 | |
| 	t.Run("no_tabs", func(t *testing.T) {
 | |
| 		t.Parallel()
 | |
| 
 | |
| 		_, cmd := testListCommand(t)
 | |
| 		assertNoTabs(t, cmd)
 | |
| 	})
 | |
| }
 |