60732577f5
* 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
159 lines
3.1 KiB
Go
159 lines
3.1 KiB
Go
package command
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/hashicorp/vault/api"
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
func testLeaseRenewCommand(tb testing.TB) (*cli.MockUi, *LeaseRenewCommand) {
|
|
tb.Helper()
|
|
|
|
ui := cli.NewMockUi()
|
|
return ui, &LeaseRenewCommand{
|
|
BaseCommand: &BaseCommand{
|
|
UI: ui,
|
|
},
|
|
}
|
|
}
|
|
|
|
// testLeaseRenewCommandMountAndLease mounts a leased secret backend and returns
|
|
// the leaseID of an item.
|
|
func testLeaseRenewCommandMountAndLease(tb testing.TB, client *api.Client) string {
|
|
if err := client.Sys().Mount("testing", &api.MountInput{
|
|
Type: "generic-leased",
|
|
}); err != nil {
|
|
tb.Fatal(err)
|
|
}
|
|
|
|
if _, err := client.Logical().Write("testing/foo", map[string]interface{}{
|
|
"key": "value",
|
|
"lease": "5m",
|
|
}); err != nil {
|
|
tb.Fatal(err)
|
|
}
|
|
|
|
// Read the secret back to get the leaseID
|
|
secret, err := client.Logical().Read("testing/foo")
|
|
if err != nil {
|
|
tb.Fatal(err)
|
|
}
|
|
if secret == nil || secret.LeaseID == "" {
|
|
tb.Fatalf("missing secret or lease: %#v", secret)
|
|
}
|
|
|
|
return secret.LeaseID
|
|
}
|
|
|
|
func TestLeaseRenewCommand_Run(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
cases := []struct {
|
|
name string
|
|
args []string
|
|
out string
|
|
code int
|
|
}{
|
|
{
|
|
"empty",
|
|
nil,
|
|
"Missing ID!",
|
|
1,
|
|
},
|
|
{
|
|
"increment",
|
|
[]string{"-increment", "60s"},
|
|
"foo",
|
|
0,
|
|
},
|
|
{
|
|
"increment_no_suffix",
|
|
[]string{"-increment", "60"},
|
|
"foo",
|
|
0,
|
|
},
|
|
}
|
|
|
|
t.Run("group", 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()
|
|
|
|
leaseID := testLeaseRenewCommandMountAndLease(t, client)
|
|
|
|
ui, cmd := testLeaseRenewCommand(t)
|
|
cmd.client = client
|
|
|
|
if tc.args != nil {
|
|
tc.args = append(tc.args, leaseID)
|
|
}
|
|
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("integration", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
client, closer := testVaultServer(t)
|
|
defer closer()
|
|
|
|
leaseID := testLeaseRenewCommandMountAndLease(t, client)
|
|
|
|
_, cmd := testLeaseRenewCommand(t)
|
|
cmd.client = client
|
|
|
|
code := cmd.Run([]string{leaseID})
|
|
if exp := 0; code != exp {
|
|
t.Errorf("expected %d to be %d", code, exp)
|
|
}
|
|
})
|
|
|
|
t.Run("communication_failure", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
client, closer := testVaultServerBad(t)
|
|
defer closer()
|
|
|
|
ui, cmd := testLeaseRenewCommand(t)
|
|
cmd.client = client
|
|
|
|
code := cmd.Run([]string{
|
|
"foo/bar",
|
|
})
|
|
if exp := 2; code != exp {
|
|
t.Errorf("expected %d to be %d", code, exp)
|
|
}
|
|
|
|
expected := "Error renewing foo/bar: "
|
|
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 := testLeaseRenewCommand(t)
|
|
assertNoTabs(t, cmd)
|
|
})
|
|
}
|