From 6ed8b88f5ff2402f10e85e36424aafe71c76f0e6 Mon Sep 17 00:00:00 2001 From: Christopher Swenson Date: Mon, 4 Dec 2023 11:05:02 -0800 Subject: [PATCH] Switch from mitchellh/cli to hashicorp/cli (#24239) @mitchellh suggested we fork `cli` and switch to that. Since we primarily use the interfaces in `cli`, and the new fork has not changed those, this is (mostly) a drop-in replacement. A small fix will be necessary for Vault Enterprise, I believe. --- command/agent.go | 2 +- command/agent_generate_config.go | 2 +- command/agent_test.go | 2 +- command/audit.go | 2 +- command/audit_disable.go | 2 +- command/audit_disable_test.go | 2 +- command/audit_enable.go | 2 +- command/audit_enable_test.go | 2 +- command/audit_list.go | 2 +- command/audit_list_test.go | 2 +- command/auth.go | 2 +- command/auth_disable.go | 2 +- command/auth_disable_test.go | 2 +- command/auth_enable.go | 2 +- command/auth_enable_test.go | 2 +- command/auth_help.go | 2 +- command/auth_help_test.go | 2 +- command/auth_list.go | 2 +- command/auth_list_test.go | 2 +- command/auth_move.go | 2 +- command/auth_move_test.go | 2 +- command/auth_test.go | 2 +- command/auth_tune.go | 2 +- command/auth_tune_test.go | 2 +- command/base.go | 2 +- command/command_stubs_oss.go | 2 +- command/command_test.go | 2 +- command/commands.go | 2 +- command/debug.go | 2 +- command/debug_test.go | 2 +- command/delete.go | 2 +- command/delete_test.go | 2 +- command/events.go | 2 +- command/events_test.go | 2 +- command/format.go | 2 +- command/kv.go | 2 +- command/kv_delete.go | 2 +- command/kv_destroy.go | 2 +- command/kv_enable_versioning.go | 2 +- command/kv_get.go | 2 +- command/kv_helpers.go | 2 +- command/kv_list.go | 2 +- command/kv_metadata.go | 2 +- command/kv_metadata_delete.go | 2 +- command/kv_metadata_get.go | 2 +- command/kv_metadata_patch.go | 2 +- command/kv_metadata_patch_test.go | 2 +- command/kv_metadata_put.go | 2 +- command/kv_metadata_put_test.go | 2 +- command/kv_patch.go | 2 +- command/kv_put.go | 2 +- command/kv_rollback.go | 2 +- command/kv_test.go | 2 +- command/kv_undelete.go | 2 +- command/lease.go | 2 +- command/lease_lookup.go | 2 +- command/lease_lookup_test.go | 2 +- command/lease_renew.go | 2 +- command/lease_renew_test.go | 2 +- command/lease_revoke.go | 2 +- command/lease_revoke_test.go | 2 +- command/list.go | 2 +- command/list_test.go | 2 +- command/login_test.go | 2 +- command/main.go | 2 +- command/monitor.go | 2 +- command/monitor_test.go | 2 +- command/namespace.go | 2 +- command/namespace_api_lock.go | 2 +- command/namespace_api_unlock.go | 2 +- command/namespace_create.go | 2 +- command/namespace_delete.go | 2 +- command/namespace_list.go | 2 +- command/namespace_lookup.go | 2 +- command/namespace_patch.go | 2 +- command/operator.go | 2 +- command/operator_diagnose.go | 2 +- command/operator_diagnose_test.go | 2 +- command/operator_generate_root.go | 2 +- command/operator_generate_root_test.go | 2 +- command/operator_init.go | 2 +- command/operator_init_test.go | 2 +- command/operator_key_status.go | 2 +- command/operator_key_status_test.go | 2 +- command/operator_members.go | 2 +- command/operator_migrate.go | 2 +- command/operator_raft.go | 2 +- command/operator_raft_autopilot_get_config.go | 2 +- command/operator_raft_autopilot_set_config.go | 2 +- command/operator_raft_autopilot_state.go | 2 +- command/operator_raft_join.go | 2 +- command/operator_raft_listpeers.go | 2 +- command/operator_raft_remove_peer.go | 2 +- command/operator_raft_snapshot.go | 2 +- command/operator_raft_snapshot_inspect.go | 2 +- .../operator_raft_snapshot_inspect_test.go | 2 +- command/operator_raft_snapshot_restore.go | 2 +- command/operator_raft_snapshot_save.go | 2 +- command/operator_rekey.go | 2 +- command/operator_rekey_test.go | 2 +- command/operator_seal.go | 2 +- command/operator_seal_test.go | 2 +- command/operator_step_down.go | 2 +- command/operator_step_down_test.go | 2 +- command/operator_unseal.go | 2 +- command/operator_unseal_test.go | 2 +- command/operator_usage.go | 2 +- command/patch.go | 2 +- command/patch_test.go | 2 +- command/path_help.go | 2 +- command/path_help_test.go | 2 +- command/pki.go | 2 +- command/pki_health_check.go | 2 +- command/pki_health_check_test.go | 2 +- command/plugin.go | 2 +- command/plugin_deregister.go | 2 +- command/plugin_deregister_test.go | 2 +- command/plugin_info.go | 2 +- command/plugin_info_test.go | 2 +- command/plugin_list.go | 2 +- command/plugin_list_test.go | 2 +- command/plugin_register.go | 2 +- command/plugin_register_test.go | 2 +- command/plugin_reload.go | 2 +- command/plugin_reload_status.go | 2 +- command/plugin_reload_test.go | 2 +- command/plugin_runtime.go | 2 +- command/plugin_runtime_deregister.go | 2 +- command/plugin_runtime_deregister_test.go | 2 +- command/plugin_runtime_info.go | 2 +- command/plugin_runtime_info_test.go | 2 +- command/plugin_runtime_list.go | 2 +- command/plugin_runtime_list_test.go | 2 +- command/plugin_runtime_register.go | 2 +- command/plugin_runtime_register_test.go | 2 +- command/policy.go | 2 +- command/policy_delete.go | 2 +- command/policy_delete_test.go | 2 +- command/policy_fmt.go | 2 +- command/policy_fmt_test.go | 2 +- command/policy_list.go | 2 +- command/policy_list_test.go | 2 +- command/policy_read.go | 2 +- command/policy_read_test.go | 2 +- command/policy_write.go | 2 +- command/policy_write_test.go | 2 +- command/print.go | 2 +- command/print_token.go | 2 +- command/proxy.go | 2 +- command/proxy_test.go | 2 +- command/read.go | 2 +- command/read_test.go | 2 +- command/rotate.go | 2 +- command/rotate_test.go | 2 +- command/secrets.go | 2 +- command/secrets_disable.go | 2 +- command/secrets_disable_test.go | 2 +- command/secrets_enable.go | 2 +- command/secrets_enable_test.go | 2 +- command/secrets_list.go | 2 +- command/secrets_list_test.go | 2 +- command/secrets_move.go | 2 +- command/secrets_move_test.go | 2 +- command/secrets_tune.go | 2 +- command/secrets_tune_test.go | 2 +- command/server.go | 2 +- command/server/listener.go | 2 +- command/server/listener_tcp.go | 2 +- command/server/listener_tcp_test.go | 2 +- command/server/listener_unix.go | 2 +- command/server/listener_unix_test.go | 2 +- command/server_test.go | 2 +- command/ssh.go | 2 +- command/ssh_test.go | 2 +- command/status.go | 2 +- command/status_test.go | 2 +- command/token.go | 2 +- command/token/testing.go | 2 +- command/token_capabilities.go | 2 +- command/token_capabilities_test.go | 2 +- command/token_create.go | 2 +- command/token_create_test.go | 2 +- command/token_lookup.go | 2 +- command/token_lookup_test.go | 2 +- command/token_renew.go | 2 +- command/token_renew_test.go | 2 +- command/token_revoke.go | 2 +- command/token_revoke_test.go | 2 +- command/transform.go | 2 +- command/transform_import_key.go | 2 +- command/transform_import_key_version.go | 2 +- command/transit.go | 2 +- command/transit_import_key.go | 2 +- command/transit_import_key_version.go | 2 +- command/unwrap.go | 2 +- command/unwrap_test.go | 2 +- command/util.go | 2 +- command/version.go | 2 +- command/version_history.go | 2 +- command/version_history_test.go | 2 +- command/version_test.go | 2 +- command/write.go | 2 +- command/write_test.go | 2 +- go.mod | 8 ++++---- go.sum | 20 ++++++++----------- internalshared/configutil/telemetry.go | 2 +- internalshared/listenerutil/listener.go | 2 +- 207 files changed, 217 insertions(+), 221 deletions(-) diff --git a/command/agent.go b/command/agent.go index 94db44c86d..a3d46a32ed 100644 --- a/command/agent.go +++ b/command/agent.go @@ -19,6 +19,7 @@ import ( "time" systemd "github.com/coreos/go-systemd/daemon" + "github.com/hashicorp/cli" ctconfig "github.com/hashicorp/consul-template/config" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" @@ -45,7 +46,6 @@ import ( "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/version" "github.com/kr/pretty" - "github.com/mitchellh/cli" "github.com/oklog/run" "github.com/posener/complete" "golang.org/x/text/cases" diff --git a/command/agent_generate_config.go b/command/agent_generate_config.go index f2ff1abf95..31bbcd255c 100644 --- a/command/agent_generate_config.go +++ b/command/agent_generate_config.go @@ -13,10 +13,10 @@ import ( "strings" "unicode" + "github.com/hashicorp/cli" "github.com/hashicorp/hcl/v2/gohcl" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/mitchellh/go-homedir" "github.com/posener/complete" ) diff --git a/command/agent_test.go b/command/agent_test.go index 3ab66b4623..8d12f6584d 100644 --- a/command/agent_test.go +++ b/command/agent_test.go @@ -20,6 +20,7 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/go-hclog" vaultjwt "github.com/hashicorp/vault-plugin-auth-jwt" logicalKv "github.com/hashicorp/vault-plugin-secrets-kv" @@ -35,7 +36,6 @@ import ( "github.com/hashicorp/vault/sdk/helper/pointerutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" - "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/command/audit.go b/command/audit.go index 67f5b194da..1c59140a9a 100644 --- a/command/audit.go +++ b/command/audit.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*AuditCommand)(nil) diff --git a/command/audit_disable.go b/command/audit_disable.go index 0e99da438d..79914ea5d9 100644 --- a/command/audit_disable.go +++ b/command/audit_disable.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/audit_disable_test.go b/command/audit_disable_test.go index ec28f70ddf..786140ee32 100644 --- a/command/audit_disable_test.go +++ b/command/audit_disable_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testAuditDisableCommand(tb testing.TB) (*cli.MockUi, *AuditDisableCommand) { diff --git a/command/audit_enable.go b/command/audit_enable.go index c77fe277d1..a163f471cc 100644 --- a/command/audit_enable.go +++ b/command/audit_enable.go @@ -9,8 +9,8 @@ import ( "os" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/audit_enable_test.go b/command/audit_enable_test.go index 58dca872e6..6c0c769e23 100644 --- a/command/audit_enable_test.go +++ b/command/audit_enable_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testAuditEnableCommand(tb testing.TB) (*cli.MockUi, *AuditEnableCommand) { diff --git a/command/audit_list.go b/command/audit_list.go index a7793fcee4..cf3a16f0f0 100644 --- a/command/audit_list.go +++ b/command/audit_list.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/audit_list_test.go b/command/audit_list_test.go index bc41c13d60..43ddbacf91 100644 --- a/command/audit_list_test.go +++ b/command/audit_list_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testAuditListCommand(tb testing.TB) (*cli.MockUi, *AuditListCommand) { diff --git a/command/auth.go b/command/auth.go index 76919ed208..57489a186f 100644 --- a/command/auth.go +++ b/command/auth.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*AuthCommand)(nil) diff --git a/command/auth_disable.go b/command/auth_disable.go index 775f7fabc7..1476b71d0f 100644 --- a/command/auth_disable.go +++ b/command/auth_disable.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/auth_disable_test.go b/command/auth_disable_test.go index 1cf4298760..f9da8a7d77 100644 --- a/command/auth_disable_test.go +++ b/command/auth_disable_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testAuthDisableCommand(tb testing.TB) (*cli.MockUi, *AuthDisableCommand) { diff --git a/command/auth_enable.go b/command/auth_enable.go index cd47d2f35f..912f410e82 100644 --- a/command/auth_enable.go +++ b/command/auth_enable.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/auth_enable_test.go b/command/auth_enable_test.go index 93c685819e..0cdaf0fc79 100644 --- a/command/auth_enable_test.go +++ b/command/auth_enable_test.go @@ -11,10 +11,10 @@ import ( "github.com/go-test/deep" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/helper/builtinplugins" "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/sdk/helper/strutil" - "github.com/mitchellh/cli" ) func testAuthEnableCommand(tb testing.TB) (*cli.MockUi, *AuthEnableCommand) { diff --git a/command/auth_help.go b/command/auth_help.go index 5e971ebbac..68365e737c 100644 --- a/command/auth_help.go +++ b/command/auth_help.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/auth_help_test.go b/command/auth_help_test.go index d87832c892..e437f29199 100644 --- a/command/auth_help_test.go +++ b/command/auth_help_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" credUserpass "github.com/hashicorp/vault/builtin/credential/userpass" ) diff --git a/command/auth_list.go b/command/auth_list.go index e1a8771d7f..d095156e15 100644 --- a/command/auth_list.go +++ b/command/auth_list.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/auth_list_test.go b/command/auth_list_test.go index 8e019f1b8f..087010a8ce 100644 --- a/command/auth_list_test.go +++ b/command/auth_list_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testAuthListCommand(tb testing.TB) (*cli.MockUi, *AuthListCommand) { diff --git a/command/auth_move.go b/command/auth_move.go index e91d9d82fb..3ede5fc49f 100644 --- a/command/auth_move.go +++ b/command/auth_move.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/auth_move_test.go b/command/auth_move_test.go index 095c3ae9da..0b585e7e00 100644 --- a/command/auth_move_test.go +++ b/command/auth_move_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testAuthMoveCommand(tb testing.TB) (*cli.MockUi, *AuthMoveCommand) { diff --git a/command/auth_test.go b/command/auth_test.go index 4eb7d4ee3e..9071c0c157 100644 --- a/command/auth_test.go +++ b/command/auth_test.go @@ -6,7 +6,7 @@ package command import ( "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/command/token" ) diff --git a/command/auth_tune.go b/command/auth_tune.go index 65b3070666..10e7f9fe41 100644 --- a/command/auth_tune.go +++ b/command/auth_tune.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/auth_tune_test.go b/command/auth_tune_test.go index ea0449b9d5..4bc8ddf465 100644 --- a/command/auth_tune_test.go +++ b/command/auth_tune_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/go-test/deep" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/testhelpers/corehelpers" - "github.com/mitchellh/cli" ) func testAuthTuneCommand(tb testing.TB) (*cli.MockUi, *AuthTuneCommand) { diff --git a/command/base.go b/command/base.go index 10be15b636..c2657e7fd8 100644 --- a/command/base.go +++ b/command/base.go @@ -15,11 +15,11 @@ import ( "sync" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/token" "github.com/hashicorp/vault/helper/namespace" "github.com/mattn/go-isatty" - "github.com/mitchellh/cli" "github.com/pkg/errors" "github.com/posener/complete" ) diff --git a/command/command_stubs_oss.go b/command/command_stubs_oss.go index bc90a1585a..d1de67e4de 100644 --- a/command/command_stubs_oss.go +++ b/command/command_stubs_oss.go @@ -8,9 +8,9 @@ package command //go:generate go run github.com/hashicorp/vault/tools/stubmaker import ( + "github.com/hashicorp/cli" "github.com/hashicorp/vault/command/server" "github.com/hashicorp/vault/vault" - "github.com/mitchellh/cli" ) func entInitCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions, commands map[string]cli.CommandFactory) { diff --git a/command/command_test.go b/command/command_test.go index 34bd3b4533..5ef880b787 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -12,6 +12,7 @@ import ( "testing" "time" + "github.com/hashicorp/cli" log "github.com/hashicorp/go-hclog" kv "github.com/hashicorp/vault-plugin-secrets-kv" "github.com/hashicorp/vault/api" @@ -25,7 +26,6 @@ import ( "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal" - "github.com/mitchellh/cli" auditFile "github.com/hashicorp/vault/builtin/audit/file" credUserpass "github.com/hashicorp/vault/builtin/credential/userpass" diff --git a/command/commands.go b/command/commands.go index 1a52e121a1..aac2d57bc7 100644 --- a/command/commands.go +++ b/command/commands.go @@ -8,12 +8,12 @@ import ( "os/signal" "syscall" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/audit" "github.com/hashicorp/vault/builtin/plugin" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/version" - "github.com/mitchellh/cli" /* The builtinplugins package is initialized here because it, in turn, diff --git a/command/debug.go b/command/debug.go index 941249657a..09df88fb4d 100644 --- a/command/debug.go +++ b/command/debug.go @@ -17,6 +17,7 @@ import ( "sync" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-secure-stdlib/gatedwriter" "github.com/hashicorp/go-secure-stdlib/strutil" @@ -26,7 +27,6 @@ import ( "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/version" "github.com/mholt/archiver/v3" - "github.com/mitchellh/cli" "github.com/oklog/run" "github.com/posener/complete" ) diff --git a/command/debug_test.go b/command/debug_test.go index 80576311dd..279c48f0a5 100644 --- a/command/debug_test.go +++ b/command/debug_test.go @@ -16,9 +16,9 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/mholt/archiver/v3" - "github.com/mitchellh/cli" ) func testDebugCommand(tb testing.TB) (*cli.MockUi, *DebugCommand) { diff --git a/command/delete.go b/command/delete.go index 58005e95b2..6986a84ec3 100644 --- a/command/delete.go +++ b/command/delete.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/delete_test.go b/command/delete_test.go index 3c08bc685b..6da1d1d7fa 100644 --- a/command/delete_test.go +++ b/command/delete_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testDeleteCommand(tb testing.TB) (*cli.MockUi, *DeleteCommand) { diff --git a/command/events.go b/command/events.go index acc68b117f..48f1fdd226 100644 --- a/command/events.go +++ b/command/events.go @@ -11,8 +11,8 @@ import ( "os" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" "nhooyr.io/websocket" ) diff --git a/command/events_test.go b/command/events_test.go index 336dc0a342..dfeb12d706 100644 --- a/command/events_test.go +++ b/command/events_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testEventsSubscribeCommand(tb testing.TB) (*cli.MockUi, *EventsSubscribeCommands) { diff --git a/command/format.go b/command/format.go index 4b12771d98..548a9a089c 100644 --- a/command/format.go +++ b/command/format.go @@ -14,8 +14,8 @@ import ( "time" "github.com/ghodss/yaml" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/ryanuber/columnize" ) diff --git a/command/kv.go b/command/kv.go index 9a7e9eaee1..f17baf5d3a 100644 --- a/command/kv.go +++ b/command/kv.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*KVCommand)(nil) diff --git a/command/kv_delete.go b/command/kv_delete.go index acb4abecaf..67cc56ac4e 100644 --- a/command/kv_delete.go +++ b/command/kv_delete.go @@ -8,8 +8,8 @@ import ( "path" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/kv_destroy.go b/command/kv_destroy.go index bc73021fff..0299be4cea 100644 --- a/command/kv_destroy.go +++ b/command/kv_destroy.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_enable_versioning.go b/command/kv_enable_versioning.go index 1b52226903..921c286e3a 100644 --- a/command/kv_enable_versioning.go +++ b/command/kv_enable_versioning.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/kv_get.go b/command/kv_get.go index d852a722b4..e31c8a32a5 100644 --- a/command/kv_get.go +++ b/command/kv_get.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_helpers.go b/command/kv_helpers.go index 844af21848..ed3bc38118 100644 --- a/command/kv_helpers.go +++ b/command/kv_helpers.go @@ -12,9 +12,9 @@ import ( "sort" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func kvReadRequest(client *api.Client, path string, params map[string]string) (*api.Secret, error) { diff --git a/command/kv_list.go b/command/kv_list.go index d4733a137f..4e19d9d7ae 100644 --- a/command/kv_list.go +++ b/command/kv_list.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_metadata.go b/command/kv_metadata.go index 8c0d2ca592..14e1b5bfa3 100644 --- a/command/kv_metadata.go +++ b/command/kv_metadata.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*KVMetadataCommand)(nil) diff --git a/command/kv_metadata_delete.go b/command/kv_metadata_delete.go index 8163cc6bde..6f672fc6ae 100644 --- a/command/kv_metadata_delete.go +++ b/command/kv_metadata_delete.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_metadata_get.go b/command/kv_metadata_get.go index 54d73c0b3a..2722c330ef 100644 --- a/command/kv_metadata_get.go +++ b/command/kv_metadata_get.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_metadata_patch.go b/command/kv_metadata_patch.go index 74c46476d0..ff59c12fb7 100644 --- a/command/kv_metadata_patch.go +++ b/command/kv_metadata_patch.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_metadata_patch_test.go b/command/kv_metadata_patch_test.go index a8dc583780..1dc0e12377 100644 --- a/command/kv_metadata_patch_test.go +++ b/command/kv_metadata_patch_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/go-test/deep" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testKVMetadataPatchCommand(tb testing.TB) (*cli.MockUi, *KVMetadataPatchCommand) { diff --git a/command/kv_metadata_put.go b/command/kv_metadata_put.go index 1cd8375320..5b8124229d 100644 --- a/command/kv_metadata_put.go +++ b/command/kv_metadata_put.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_metadata_put_test.go b/command/kv_metadata_put_test.go index a4068e23c8..edd0b6bf2e 100644 --- a/command/kv_metadata_put_test.go +++ b/command/kv_metadata_put_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/go-test/deep" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testKVMetadataPutCommand(tb testing.TB) (*cli.MockUi, *KVMetadataPutCommand) { diff --git a/command/kv_patch.go b/command/kv_patch.go index da96088d11..7eaf710ebe 100644 --- a/command/kv_patch.go +++ b/command/kv_patch.go @@ -11,8 +11,8 @@ import ( "path" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/kv_put.go b/command/kv_put.go index d450b4415c..b51705791f 100644 --- a/command/kv_put.go +++ b/command/kv_put.go @@ -10,7 +10,7 @@ import ( "path" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_rollback.go b/command/kv_rollback.go index 798e4a8988..a0544b69d7 100644 --- a/command/kv_rollback.go +++ b/command/kv_rollback.go @@ -9,7 +9,7 @@ import ( "path" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/kv_test.go b/command/kv_test.go index e8abba0b1d..c5ca555be6 100644 --- a/command/kv_test.go +++ b/command/kv_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testKVPutCommand(tb testing.TB) (*cli.MockUi, *KVPutCommand) { diff --git a/command/kv_undelete.go b/command/kv_undelete.go index abc90879e6..7d43838719 100644 --- a/command/kv_undelete.go +++ b/command/kv_undelete.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/lease.go b/command/lease.go index 5e8f46afe1..3e0817ffd0 100644 --- a/command/lease.go +++ b/command/lease.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*LeaseCommand)(nil) diff --git a/command/lease_lookup.go b/command/lease_lookup.go index 8c38c1cfd7..51b7aab604 100644 --- a/command/lease_lookup.go +++ b/command/lease_lookup.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/lease_lookup_test.go b/command/lease_lookup_test.go index bc00194280..2c9b81caf5 100644 --- a/command/lease_lookup_test.go +++ b/command/lease_lookup_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testLeaseLookupCommand(tb testing.TB) (*cli.MockUi, *LeaseLookupCommand) { diff --git a/command/lease_renew.go b/command/lease_renew.go index 0918d8ed4b..b0671c3796 100644 --- a/command/lease_renew.go +++ b/command/lease_renew.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/lease_renew_test.go b/command/lease_renew_test.go index 40719d1f0a..eac098fe46 100644 --- a/command/lease_renew_test.go +++ b/command/lease_renew_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testLeaseRenewCommand(tb testing.TB) (*cli.MockUi, *LeaseRenewCommand) { diff --git a/command/lease_revoke.go b/command/lease_revoke.go index 751cce9744..59a09de597 100644 --- a/command/lease_revoke.go +++ b/command/lease_revoke.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/lease_revoke_test.go b/command/lease_revoke_test.go index ece8d31f06..aeb9987e7d 100644 --- a/command/lease_revoke_test.go +++ b/command/lease_revoke_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testLeaseRevokeCommand(tb testing.TB) (*cli.MockUi, *LeaseRevokeCommand) { diff --git a/command/list.go b/command/list.go index 1f300cb459..6505f76af8 100644 --- a/command/list.go +++ b/command/list.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/list_test.go b/command/list_test.go index 60467647a0..e7a870d7ff 100644 --- a/command/list_test.go +++ b/command/list_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testListCommand(tb testing.TB) (*cli.MockUi, *ListCommand) { diff --git a/command/login_test.go b/command/login_test.go index deb96be188..b8afeffbf2 100644 --- a/command/login_test.go +++ b/command/login_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" credToken "github.com/hashicorp/vault/builtin/credential/token" diff --git a/command/main.go b/command/main.go index 22dde07fa7..359ae471ed 100644 --- a/command/main.go +++ b/command/main.go @@ -15,10 +15,10 @@ import ( "text/tabwriter" "github.com/fatih/color" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/token" colorable "github.com/mattn/go-colorable" - "github.com/mitchellh/cli" ) type VaultUI struct { diff --git a/command/monitor.go b/command/monitor.go index acfbc24be7..f39ca72a36 100644 --- a/command/monitor.go +++ b/command/monitor.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/strutil" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/monitor_test.go b/command/monitor_test.go index 8c2c288d84..fd1b288fd2 100644 --- a/command/monitor_test.go +++ b/command/monitor_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testMonitorCommand(tb testing.TB) (*cli.MockUi, *MonitorCommand) { diff --git a/command/namespace.go b/command/namespace.go index 4bc6cfa1c7..c47b26648c 100644 --- a/command/namespace.go +++ b/command/namespace.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*NamespaceCommand)(nil) diff --git a/command/namespace_api_lock.go b/command/namespace_api_lock.go index 22a3169304..4193508ec4 100644 --- a/command/namespace_api_lock.go +++ b/command/namespace_api_lock.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/helper/namespace" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/namespace_api_unlock.go b/command/namespace_api_unlock.go index fa05d43ca5..0c9cd22ead 100644 --- a/command/namespace_api_unlock.go +++ b/command/namespace_api_unlock.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/helper/namespace" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/namespace_create.go b/command/namespace_create.go index 20dc639ad6..6499bf2a25 100644 --- a/command/namespace_create.go +++ b/command/namespace_create.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/namespace_delete.go b/command/namespace_delete.go index f034ec4771..e7704ca5cd 100644 --- a/command/namespace_delete.go +++ b/command/namespace_delete.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/namespace_list.go b/command/namespace_list.go index 8bb30ed9bb..e8581670ed 100644 --- a/command/namespace_list.go +++ b/command/namespace_list.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/namespace_lookup.go b/command/namespace_lookup.go index 480da0b914..376a0adc41 100644 --- a/command/namespace_lookup.go +++ b/command/namespace_lookup.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/namespace_patch.go b/command/namespace_patch.go index 40c1d05f9d..d3868c6134 100644 --- a/command/namespace_patch.go +++ b/command/namespace_patch.go @@ -9,8 +9,8 @@ import ( "net/http" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator.go b/command/operator.go index 94b02994d8..8d918f3492 100644 --- a/command/operator.go +++ b/command/operator.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*OperatorCommand)(nil) diff --git a/command/operator_diagnose.go b/command/operator_diagnose.go index 360feb287b..a3f02fba97 100644 --- a/command/operator_diagnose.go +++ b/command/operator_diagnose.go @@ -18,6 +18,7 @@ import ( "golang.org/x/term" + "github.com/hashicorp/cli" "github.com/hashicorp/consul/api" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-secure-stdlib/reloadutil" @@ -36,7 +37,6 @@ import ( "github.com/hashicorp/vault/vault/diagnose" "github.com/hashicorp/vault/vault/hcp_link" "github.com/hashicorp/vault/version" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_diagnose_test.go b/command/operator_diagnose_test.go index 31b38f1c50..8b15cc8b1d 100644 --- a/command/operator_diagnose_test.go +++ b/command/operator_diagnose_test.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/vault/command/server" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/vault/diagnose" - "github.com/mitchellh/cli" ) func testOperatorDiagnoseCommand(tb testing.TB) *OperatorDiagnoseCommand { diff --git a/command/operator_generate_root.go b/command/operator_generate_root.go index e660a6e1c1..b7518aa91c 100644 --- a/command/operator_generate_root.go +++ b/command/operator_generate_root.go @@ -10,11 +10,11 @@ import ( "os" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/password" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/pgpkeys" "github.com/hashicorp/vault/sdk/helper/roottoken" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_generate_root_test.go b/command/operator_generate_root_test.go index 4db2262cad..e27592d856 100644 --- a/command/operator_generate_root_test.go +++ b/command/operator_generate_root_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/sdk/helper/xor" "github.com/hashicorp/vault/vault" - "github.com/mitchellh/cli" ) func testOperatorGenerateRootCommand(tb testing.TB) (*cli.MockUi, *OperatorGenerateRootCommand) { diff --git a/command/operator_init.go b/command/operator_init.go index 4b0f26bb4a..576f7fe2dc 100644 --- a/command/operator_init.go +++ b/command/operator_init.go @@ -9,9 +9,9 @@ import ( "runtime" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/pgpkeys" - "github.com/mitchellh/cli" "github.com/posener/complete" consulapi "github.com/hashicorp/consul/api" diff --git a/command/operator_init_test.go b/command/operator_init_test.go index 9176865432..73fe4ff59e 100644 --- a/command/operator_init_test.go +++ b/command/operator_init_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/pgpkeys" "github.com/hashicorp/vault/vault" - "github.com/mitchellh/cli" ) func testOperatorInitCommand(tb testing.TB) (*cli.MockUi, *OperatorInitCommand) { diff --git a/command/operator_key_status.go b/command/operator_key_status.go index 866b7d7e7e..015bd891f7 100644 --- a/command/operator_key_status.go +++ b/command/operator_key_status.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_key_status_test.go b/command/operator_key_status_test.go index db92eb9e9b..ccaac38830 100644 --- a/command/operator_key_status_test.go +++ b/command/operator_key_status_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testOperatorKeyStatusCommand(tb testing.TB) (*cli.MockUi, *OperatorKeyStatusCommand) { diff --git a/command/operator_members.go b/command/operator_members.go index c280f315bf..83d7a2d430 100644 --- a/command/operator_members.go +++ b/command/operator_members.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_migrate.go b/command/operator_migrate.go index 2e956046f3..3af73e6963 100644 --- a/command/operator_migrate.go +++ b/command/operator_migrate.go @@ -14,6 +14,7 @@ import ( "strings" "time" + "github.com/hashicorp/cli" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/hcl" @@ -23,7 +24,6 @@ import ( "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault" - "github.com/mitchellh/cli" "github.com/pkg/errors" "github.com/posener/complete" "golang.org/x/sync/errgroup" diff --git a/command/operator_raft.go b/command/operator_raft.go index 9e02371dcb..deaff14cdf 100644 --- a/command/operator_raft.go +++ b/command/operator_raft.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*OperatorRaftCommand)(nil) diff --git a/command/operator_raft_autopilot_get_config.go b/command/operator_raft_autopilot_get_config.go index 81ee3b6b88..bdeeed6f8c 100644 --- a/command/operator_raft_autopilot_get_config.go +++ b/command/operator_raft_autopilot_get_config.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_autopilot_set_config.go b/command/operator_raft_autopilot_set_config.go index 3ac287cc74..39b9b2ddcb 100644 --- a/command/operator_raft_autopilot_set_config.go +++ b/command/operator_raft_autopilot_set_config.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_autopilot_state.go b/command/operator_raft_autopilot_state.go index a5b31a3413..4fc4ca4445 100644 --- a/command/operator_raft_autopilot_state.go +++ b/command/operator_raft_autopilot_state.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_join.go b/command/operator_raft_join.go index 74fc7f487f..aaaaf2891e 100644 --- a/command/operator_raft_join.go +++ b/command/operator_raft_join.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_listpeers.go b/command/operator_raft_listpeers.go index 434fcc0eec..b92ab8f0b5 100644 --- a/command/operator_raft_listpeers.go +++ b/command/operator_raft_listpeers.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_remove_peer.go b/command/operator_raft_remove_peer.go index 1f9c33ba1c..fabd9ce30d 100644 --- a/command/operator_raft_remove_peer.go +++ b/command/operator_raft_remove_peer.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_snapshot.go b/command/operator_raft_snapshot.go index c78ef8d4e7..02fc4c2b8a 100644 --- a/command/operator_raft_snapshot.go +++ b/command/operator_raft_snapshot.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*OperatorRaftSnapshotCommand)(nil) diff --git a/command/operator_raft_snapshot_inspect.go b/command/operator_raft_snapshot_inspect.go index a64c5ba347..43c3fb0e4a 100644 --- a/command/operator_raft_snapshot_inspect.go +++ b/command/operator_raft_snapshot_inspect.go @@ -20,11 +20,11 @@ import ( "strings" "text/tabwriter" + "github.com/hashicorp/cli" "github.com/hashicorp/go-hclog" "github.com/hashicorp/raft" protoio "github.com/hashicorp/vault/physical/raft" "github.com/hashicorp/vault/sdk/plugin/pb" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_snapshot_inspect_test.go b/command/operator_raft_snapshot_inspect_test.go index de306595e5..d700376956 100644 --- a/command/operator_raft_snapshot_inspect_test.go +++ b/command/operator_raft_snapshot_inspect_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/physical/raft" "github.com/hashicorp/vault/sdk/physical" - "github.com/mitchellh/cli" ) func testOperatorRaftSnapshotInspectCommand(tb testing.TB) (*cli.MockUi, *OperatorRaftSnapshotInspectCommand) { diff --git a/command/operator_raft_snapshot_restore.go b/command/operator_raft_snapshot_restore.go index 56c24b61b5..516fba522f 100644 --- a/command/operator_raft_snapshot_restore.go +++ b/command/operator_raft_snapshot_restore.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_raft_snapshot_save.go b/command/operator_raft_snapshot_save.go index 95ecae87c0..38580ed5e1 100644 --- a/command/operator_raft_snapshot_save.go +++ b/command/operator_raft_snapshot_save.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_rekey.go b/command/operator_rekey.go index 415b634a07..9b48415682 100644 --- a/command/operator_rekey.go +++ b/command/operator_rekey.go @@ -11,10 +11,10 @@ import ( "strings" "github.com/fatih/structs" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/password" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/pgpkeys" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_rekey_test.go b/command/operator_rekey_test.go index f06ac56134..b21d9c367b 100644 --- a/command/operator_rekey_test.go +++ b/command/operator_rekey_test.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/vault/sdk/helper/roottoken" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testOperatorRekeyCommand(tb testing.TB) (*cli.MockUi, *OperatorRekeyCommand) { diff --git a/command/operator_seal.go b/command/operator_seal.go index e8f55805b0..f390972f20 100644 --- a/command/operator_seal.go +++ b/command/operator_seal.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_seal_test.go b/command/operator_seal_test.go index 7a8e5c35ed..6208d63963 100644 --- a/command/operator_seal_test.go +++ b/command/operator_seal_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testOperatorSealCommand(tb testing.TB) (*cli.MockUi, *OperatorSealCommand) { diff --git a/command/operator_step_down.go b/command/operator_step_down.go index b9350ee088..e8b93acf07 100644 --- a/command/operator_step_down.go +++ b/command/operator_step_down.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/operator_step_down_test.go b/command/operator_step_down_test.go index 376f4ef2e6..8cb108be98 100644 --- a/command/operator_step_down_test.go +++ b/command/operator_step_down_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testOperatorStepDownCommand(tb testing.TB) (*cli.MockUi, *OperatorStepDownCommand) { diff --git a/command/operator_unseal.go b/command/operator_unseal.go index 18bd5f4a02..a667f209dc 100644 --- a/command/operator_unseal.go +++ b/command/operator_unseal.go @@ -9,9 +9,9 @@ import ( "os" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/password" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_unseal_test.go b/command/operator_unseal_test.go index 8e45978c0b..42f603e488 100644 --- a/command/operator_unseal_test.go +++ b/command/operator_unseal_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testOperatorUnsealCommand(tb testing.TB) (*cli.MockUi, *OperatorUnsealCommand) { diff --git a/command/operator_usage.go b/command/operator_usage.go index fda1caf29a..8fa0f8f415 100644 --- a/command/operator_usage.go +++ b/command/operator_usage.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/ryanuber/columnize" ) diff --git a/command/patch.go b/command/patch.go index f2092f3eba..f7b006f0f1 100644 --- a/command/patch.go +++ b/command/patch.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/patch_test.go b/command/patch_test.go index a8476722e2..3572579373 100644 --- a/command/patch_test.go +++ b/command/patch_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testPatchCommand(tb testing.TB) (*cli.MockUi, *PatchCommand) { diff --git a/command/path_help.go b/command/path_help.go index 3525f2eded..335de68400 100644 --- a/command/path_help.go +++ b/command/path_help.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/path_help_test.go b/command/path_help_test.go index 0bce2c788f..33c06b4fe5 100644 --- a/command/path_help_test.go +++ b/command/path_help_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPathHelpCommand(tb testing.TB) (*cli.MockUi, *PathHelpCommand) { diff --git a/command/pki.go b/command/pki.go index 63655da5ca..8b90a6aa7b 100644 --- a/command/pki.go +++ b/command/pki.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*PKICommand)(nil) diff --git a/command/pki_health_check.go b/command/pki_health_check.go index a06a8eccf8..0ae44499fb 100644 --- a/command/pki_health_check.go +++ b/command/pki_health_check.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/vault/command/healthcheck" "github.com/ghodss/yaml" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" "github.com/ryanuber/columnize" ) diff --git a/command/pki_health_check_test.go b/command/pki_health_check_test.go index b3b2dfb8c8..5f86b3b97f 100644 --- a/command/pki_health_check_test.go +++ b/command/pki_health_check_test.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/healthcheck" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/stretchr/testify/require" ) diff --git a/command/plugin.go b/command/plugin.go index 49e5635db1..862b55bb04 100644 --- a/command/plugin.go +++ b/command/plugin.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*PluginCommand)(nil) diff --git a/command/plugin_deregister.go b/command/plugin_deregister.go index 5355a95157..1f1e4360ac 100644 --- a/command/plugin_deregister.go +++ b/command/plugin_deregister.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" + "github.com/hashicorp/cli" semver "github.com/hashicorp/go-version" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_deregister_test.go b/command/plugin_deregister_test.go index b5bf4f7be9..d80ed9f3fe 100644 --- a/command/plugin_deregister_test.go +++ b/command/plugin_deregister_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/testhelpers/corehelpers" "github.com/hashicorp/vault/sdk/helper/consts" - "github.com/mitchellh/cli" ) func testPluginDeregisterCommand(tb testing.TB) (*cli.MockUi, *PluginDeregisterCommand) { diff --git a/command/plugin_info.go b/command/plugin_info.go index 0211555027..e47a23c665 100644 --- a/command/plugin_info.go +++ b/command/plugin_info.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_info_test.go b/command/plugin_info_test.go index 3ffaa69720..f0e66d8be5 100644 --- a/command/plugin_info_test.go +++ b/command/plugin_info_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/testhelpers/corehelpers" "github.com/hashicorp/vault/helper/versions" "github.com/hashicorp/vault/sdk/helper/consts" - "github.com/mitchellh/cli" ) func testPluginInfoCommand(tb testing.TB) (*cli.MockUi, *PluginInfoCommand) { diff --git a/command/plugin_list.go b/command/plugin_list.go index a325264eaf..28714adf4f 100644 --- a/command/plugin_list.go +++ b/command/plugin_list.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_list_test.go b/command/plugin_list_test.go index 395167e45f..4ad37868b2 100644 --- a/command/plugin_list_test.go +++ b/command/plugin_list_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPluginListCommand(tb testing.TB) (*cli.MockUi, *PluginListCommand) { diff --git a/command/plugin_register.go b/command/plugin_register.go index e8cb406b40..d124b38b89 100644 --- a/command/plugin_register.go +++ b/command/plugin_register.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_register_test.go b/command/plugin_register_test.go index e2c3ce3e70..ed46a16caa 100644 --- a/command/plugin_register_test.go +++ b/command/plugin_register_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/testhelpers/corehelpers" "github.com/hashicorp/vault/sdk/helper/consts" - "github.com/mitchellh/cli" ) func testPluginRegisterCommand(tb testing.TB) (*cli.MockUi, *PluginRegisterCommand) { diff --git a/command/plugin_reload.go b/command/plugin_reload.go index 22cd91275d..57e32a57f1 100644 --- a/command/plugin_reload.go +++ b/command/plugin_reload.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_reload_status.go b/command/plugin_reload_status.go index 83c8f8a86a..c653955978 100644 --- a/command/plugin_reload_status.go +++ b/command/plugin_reload_status.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_reload_test.go b/command/plugin_reload_test.go index 7ae082ed84..f3af275eb4 100644 --- a/command/plugin_reload_test.go +++ b/command/plugin_reload_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/testhelpers/corehelpers" - "github.com/mitchellh/cli" ) func testPluginReloadCommand(tb testing.TB) (*cli.MockUi, *PluginReloadCommand) { diff --git a/command/plugin_runtime.go b/command/plugin_runtime.go index 38781a7248..ce15bb31fd 100644 --- a/command/plugin_runtime.go +++ b/command/plugin_runtime.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*PluginRuntimeCommand)(nil) diff --git a/command/plugin_runtime_deregister.go b/command/plugin_runtime_deregister.go index dfadc20a09..47b790f2cc 100644 --- a/command/plugin_runtime_deregister.go +++ b/command/plugin_runtime_deregister.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_runtime_deregister_test.go b/command/plugin_runtime_deregister_test.go index 5cd411d5f7..1569fceb3f 100644 --- a/command/plugin_runtime_deregister_test.go +++ b/command/plugin_runtime_deregister_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPluginRuntimeDeregisterCommand(tb testing.TB) (*cli.MockUi, *PluginRuntimeDeregisterCommand) { diff --git a/command/plugin_runtime_info.go b/command/plugin_runtime_info.go index b22af6c501..22c95a2335 100644 --- a/command/plugin_runtime_info.go +++ b/command/plugin_runtime_info.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_runtime_info_test.go b/command/plugin_runtime_info_test.go index cf1a5aee7c..40166b094b 100644 --- a/command/plugin_runtime_info_test.go +++ b/command/plugin_runtime_info_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPluginRuntimeInfoCommand(tb testing.TB) (*cli.MockUi, *PluginRuntimeInfoCommand) { diff --git a/command/plugin_runtime_list.go b/command/plugin_runtime_list.go index 9fca07da6d..64cca1805f 100644 --- a/command/plugin_runtime_list.go +++ b/command/plugin_runtime_list.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_runtime_list_test.go b/command/plugin_runtime_list_test.go index 50ba6a6112..cd67ece564 100644 --- a/command/plugin_runtime_list_test.go +++ b/command/plugin_runtime_list_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPluginRuntimeListCommand(tb testing.TB) (*cli.MockUi, *PluginRuntimeListCommand) { diff --git a/command/plugin_runtime_register.go b/command/plugin_runtime_register.go index d2bbaa6530..175be302f5 100644 --- a/command/plugin_runtime_register.go +++ b/command/plugin_runtime_register.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_runtime_register_test.go b/command/plugin_runtime_register_test.go index 74d520bf8a..3b28587cf6 100644 --- a/command/plugin_runtime_register_test.go +++ b/command/plugin_runtime_register_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/sdk/helper/consts" - "github.com/mitchellh/cli" ) func testPluginRuntimeRegisterCommand(tb testing.TB) (*cli.MockUi, *PluginRuntimeRegisterCommand) { diff --git a/command/policy.go b/command/policy.go index 64fe14a75e..5e5f61bb2d 100644 --- a/command/policy.go +++ b/command/policy.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*PolicyCommand)(nil) diff --git a/command/policy_delete.go b/command/policy_delete.go index c4ee61059b..d5c3b8aabc 100644 --- a/command/policy_delete.go +++ b/command/policy_delete.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/policy_delete_test.go b/command/policy_delete_test.go index 7c96d24157..6b3bd01e3f 100644 --- a/command/policy_delete_test.go +++ b/command/policy_delete_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPolicyDeleteCommand(tb testing.TB) (*cli.MockUi, *PolicyDeleteCommand) { diff --git a/command/policy_fmt.go b/command/policy_fmt.go index 219ce1f75b..ea3dd2ab99 100644 --- a/command/policy_fmt.go +++ b/command/policy_fmt.go @@ -8,10 +8,10 @@ import ( "io/ioutil" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/hcl/hcl/printer" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/vault" - "github.com/mitchellh/cli" homedir "github.com/mitchellh/go-homedir" "github.com/posener/complete" ) diff --git a/command/policy_fmt_test.go b/command/policy_fmt_test.go index 7830b2a034..41de53c9e6 100644 --- a/command/policy_fmt_test.go +++ b/command/policy_fmt_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPolicyFmtCommand(tb testing.TB) (*cli.MockUi, *PolicyFmtCommand) { diff --git a/command/policy_list.go b/command/policy_list.go index 3800b58462..147efb9716 100644 --- a/command/policy_list.go +++ b/command/policy_list.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/policy_list_test.go b/command/policy_list_test.go index 0626f3a1b6..c603d310fc 100644 --- a/command/policy_list_test.go +++ b/command/policy_list_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPolicyListCommand(tb testing.TB) (*cli.MockUi, *PolicyListCommand) { diff --git a/command/policy_read.go b/command/policy_read.go index d8b749ee78..dd7a698de6 100644 --- a/command/policy_read.go +++ b/command/policy_read.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/policy_read_test.go b/command/policy_read_test.go index 84ec9f9cf6..e18298e511 100644 --- a/command/policy_read_test.go +++ b/command/policy_read_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPolicyReadCommand(tb testing.TB) (*cli.MockUi, *PolicyReadCommand) { diff --git a/command/policy_write.go b/command/policy_write.go index d4b5256b0c..193c949688 100644 --- a/command/policy_write.go +++ b/command/policy_write.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/policy_write_test.go b/command/policy_write_test.go index 57ace717dd..64f67eb2a8 100644 --- a/command/policy_write_test.go +++ b/command/policy_write_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testPolicyWriteCommand(tb testing.TB) (*cli.MockUi, *PolicyWriteCommand) { diff --git a/command/print.go b/command/print.go index 72e653855c..d5e3b2a552 100644 --- a/command/print.go +++ b/command/print.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/print_token.go b/command/print_token.go index 904a41f240..9402e8a152 100644 --- a/command/print_token.go +++ b/command/print_token.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/proxy.go b/command/proxy.go index 28753128ef..89cc77d983 100644 --- a/command/proxy.go +++ b/command/proxy.go @@ -18,6 +18,7 @@ import ( "time" systemd "github.com/coreos/go-systemd/daemon" + "github.com/hashicorp/cli" ctconfig "github.com/hashicorp/consul-template/config" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" @@ -42,7 +43,6 @@ import ( "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/version" "github.com/kr/pretty" - "github.com/mitchellh/cli" "github.com/oklog/run" "github.com/posener/complete" "golang.org/x/text/cases" diff --git a/command/proxy_test.go b/command/proxy_test.go index c8feb3e53e..391bee40a0 100644 --- a/command/proxy_test.go +++ b/command/proxy_test.go @@ -17,6 +17,7 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/go-hclog" vaultjwt "github.com/hashicorp/vault-plugin-auth-jwt" logicalKv "github.com/hashicorp/vault-plugin-secrets-kv" @@ -30,7 +31,6 @@ import ( "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" - "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/command/read.go b/command/read.go index c205718f89..742e036763 100644 --- a/command/read.go +++ b/command/read.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/read_test.go b/command/read_test.go index 6f33a1ef2b..fe8961afb6 100644 --- a/command/read_test.go +++ b/command/read_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testReadCommand(tb testing.TB) (*cli.MockUi, *ReadCommand) { diff --git a/command/rotate.go b/command/rotate.go index 5ed97354c9..2a17e41f9b 100644 --- a/command/rotate.go +++ b/command/rotate.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/rotate_test.go b/command/rotate_test.go index b591b5f73e..927812934c 100644 --- a/command/rotate_test.go +++ b/command/rotate_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testOperatorRotateCommand(tb testing.TB) (*cli.MockUi, *OperatorRotateCommand) { diff --git a/command/secrets.go b/command/secrets.go index f3a6d90743..a205aae174 100644 --- a/command/secrets.go +++ b/command/secrets.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*SecretsCommand)(nil) diff --git a/command/secrets_disable.go b/command/secrets_disable.go index b99e3c7193..163af4a785 100644 --- a/command/secrets_disable.go +++ b/command/secrets_disable.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/secrets_disable_test.go b/command/secrets_disable_test.go index 40058ec2f0..2531071364 100644 --- a/command/secrets_disable_test.go +++ b/command/secrets_disable_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testSecretsDisableCommand(tb testing.TB) (*cli.MockUi, *SecretsDisableCommand) { diff --git a/command/secrets_enable.go b/command/secrets_enable.go index 2388234c5f..9e06392b2d 100644 --- a/command/secrets_enable.go +++ b/command/secrets_enable.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/secrets_enable_test.go b/command/secrets_enable_test.go index 488d25d369..10fd0c5c9c 100644 --- a/command/secrets_enable_test.go +++ b/command/secrets_enable_test.go @@ -13,10 +13,10 @@ import ( "github.com/go-test/deep" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/vault/helper/builtinplugins" "github.com/hashicorp/vault/sdk/helper/consts" - "github.com/mitchellh/cli" ) func testSecretsEnableCommand(tb testing.TB) (*cli.MockUi, *SecretsEnableCommand) { diff --git a/command/secrets_list.go b/command/secrets_list.go index 7ce6dde457..2819e2a1d3 100644 --- a/command/secrets_list.go +++ b/command/secrets_list.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/secrets_list_test.go b/command/secrets_list_test.go index 544e7196c8..dcc51eb018 100644 --- a/command/secrets_list_test.go +++ b/command/secrets_list_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testSecretsListCommand(tb testing.TB) (*cli.MockUi, *SecretsListCommand) { diff --git a/command/secrets_move.go b/command/secrets_move.go index c3d8d730a7..bd4062969a 100644 --- a/command/secrets_move.go +++ b/command/secrets_move.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/secrets_move_test.go b/command/secrets_move_test.go index 6e7a0d796e..ed7a5a5c62 100644 --- a/command/secrets_move_test.go +++ b/command/secrets_move_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testSecretsMoveCommand(tb testing.TB) (*cli.MockUi, *SecretsMoveCommand) { diff --git a/command/secrets_tune.go b/command/secrets_tune.go index eef9e577c2..7dcf3feb92 100644 --- a/command/secrets_tune.go +++ b/command/secrets_tune.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/secrets_tune_test.go b/command/secrets_tune_test.go index 8146dec924..5c1670db92 100644 --- a/command/secrets_tune_test.go +++ b/command/secrets_tune_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/go-test/deep" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/testhelpers/corehelpers" - "github.com/mitchellh/cli" ) func testSecretsTuneCommand(tb testing.TB) (*cli.MockUi, *SecretsTuneCommand) { diff --git a/command/server.go b/command/server.go index 93604ccb03..0b760bd866 100644 --- a/command/server.go +++ b/command/server.go @@ -27,6 +27,7 @@ import ( systemd "github.com/coreos/go-systemd/daemon" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/cli" "github.com/hashicorp/errwrap" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-kms-wrapping/entropy/v2" @@ -62,7 +63,6 @@ import ( "github.com/hashicorp/vault/vault/hcp_link" vaultseal "github.com/hashicorp/vault/vault/seal" "github.com/hashicorp/vault/version" - "github.com/mitchellh/cli" "github.com/mitchellh/go-testing-interface" "github.com/posener/complete" "github.com/sasha-s/go-deadlock" diff --git a/command/server/listener.go b/command/server/listener.go index 7e308a0ccb..c003a6289d 100644 --- a/command/server/listener.go +++ b/command/server/listener.go @@ -12,10 +12,10 @@ import ( // We must import sha512 so that it registers with the runtime so that // certificates that use it can be parsed. + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/reloadutil" "github.com/hashicorp/vault/helper/proxyutil" "github.com/hashicorp/vault/internalshared/configutil" - "github.com/mitchellh/cli" ) // ListenerFactory is the factory function to create a listener. diff --git a/command/server/listener_tcp.go b/command/server/listener_tcp.go index 11c145b3ee..6c121ec403 100644 --- a/command/server/listener_tcp.go +++ b/command/server/listener_tcp.go @@ -12,10 +12,10 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/reloadutil" "github.com/hashicorp/vault/internalshared/configutil" "github.com/hashicorp/vault/internalshared/listenerutil" - "github.com/mitchellh/cli" ) func tcpListenerFactory(l *configutil.Listener, _ io.Writer, ui cli.Ui) (net.Listener, map[string]string, reloadutil.ReloadFunc, error) { diff --git a/command/server/listener_tcp_test.go b/command/server/listener_tcp_test.go index fe96548317..42da6c0d21 100644 --- a/command/server/listener_tcp_test.go +++ b/command/server/listener_tcp_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/vault/internalshared/configutil" - "github.com/mitchellh/cli" "github.com/pires/go-proxyproto" ) diff --git a/command/server/listener_unix.go b/command/server/listener_unix.go index 0b70a04693..35306d1666 100644 --- a/command/server/listener_unix.go +++ b/command/server/listener_unix.go @@ -7,10 +7,10 @@ import ( "io" "net" + "github.com/hashicorp/cli" "github.com/hashicorp/go-secure-stdlib/reloadutil" "github.com/hashicorp/vault/internalshared/configutil" "github.com/hashicorp/vault/internalshared/listenerutil" - "github.com/mitchellh/cli" ) func unixListenerFactory(l *configutil.Listener, _ io.Writer, ui cli.Ui) (net.Listener, map[string]string, reloadutil.ReloadFunc, error) { diff --git a/command/server/listener_unix_test.go b/command/server/listener_unix_test.go index 9d156bbc13..72f21bb471 100644 --- a/command/server/listener_unix_test.go +++ b/command/server/listener_unix_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/internalshared/configutil" - "github.com/mitchellh/cli" ) func TestUnixListener(t *testing.T) { diff --git a/command/server_test.go b/command/server_test.go index 62e2a99e2a..e46d5bedba 100644 --- a/command/server_test.go +++ b/command/server_test.go @@ -22,6 +22,7 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/command/server" "github.com/hashicorp/vault/helper/testhelpers/corehelpers" "github.com/hashicorp/vault/internalshared/configutil" @@ -29,7 +30,6 @@ import ( physInmem "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal" - "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/command/ssh.go b/command/ssh.go index edc8b4cd66..cd39ad4578 100644 --- a/command/ssh.go +++ b/command/ssh.go @@ -14,9 +14,9 @@ import ( "strings" "syscall" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/ssh" - "github.com/mitchellh/cli" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/posener/complete" diff --git a/command/ssh_test.go b/command/ssh_test.go index 32f16f79e6..b6dfd563d2 100644 --- a/command/ssh_test.go +++ b/command/ssh_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testSSHCommand(tb testing.TB) (*cli.MockUi, *SSHCommand) { diff --git a/command/status.go b/command/status.go index 5a979e7c77..9f7c7010f8 100644 --- a/command/status.go +++ b/command/status.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/status_test.go b/command/status_test.go index b423edb684..47a2803d66 100644 --- a/command/status_test.go +++ b/command/status_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testStatusCommand(tb testing.TB) (*cli.MockUi, *StatusCommand) { diff --git a/command/token.go b/command/token.go index 5ccec004a8..eb430b48da 100644 --- a/command/token.go +++ b/command/token.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*TokenCommand)(nil) diff --git a/command/token/testing.go b/command/token/testing.go index acfc84338e..24dc3258e5 100644 --- a/command/token/testing.go +++ b/command/token/testing.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) // Test is a public function that can be used in other tests to diff --git a/command/token_capabilities.go b/command/token_capabilities.go index 246619011f..fc149b9611 100644 --- a/command/token_capabilities.go +++ b/command/token_capabilities.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/token_capabilities_test.go b/command/token_capabilities_test.go index 6dffae53f5..a3e5b9525a 100644 --- a/command/token_capabilities_test.go +++ b/command/token_capabilities_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testTokenCapabilitiesCommand(tb testing.TB) (*cli.MockUi, *TokenCapabilitiesCommand) { diff --git a/command/token_create.go b/command/token_create.go index 56e182b739..3e49bb2ca7 100644 --- a/command/token_create.go +++ b/command/token_create.go @@ -8,8 +8,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/token_create_test.go b/command/token_create_test.go index 9991afb362..3acd2dd147 100644 --- a/command/token_create_test.go +++ b/command/token_create_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testTokenCreateCommand(tb testing.TB) (*cli.MockUi, *TokenCreateCommand) { diff --git a/command/token_lookup.go b/command/token_lookup.go index 78bfd0f98f..afb622372b 100644 --- a/command/token_lookup.go +++ b/command/token_lookup.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/token_lookup_test.go b/command/token_lookup_test.go index db6807300e..6a351f781c 100644 --- a/command/token_lookup_test.go +++ b/command/token_lookup_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testTokenLookupCommand(tb testing.TB) (*cli.MockUi, *TokenLookupCommand) { diff --git a/command/token_renew.go b/command/token_renew.go index 488ff76364..c354b4e6a5 100644 --- a/command/token_renew.go +++ b/command/token_renew.go @@ -8,8 +8,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/token_renew_test.go b/command/token_renew_test.go index 70ec46e99e..4fc469995b 100644 --- a/command/token_renew_test.go +++ b/command/token_renew_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testTokenRenewCommand(tb testing.TB) (*cli.MockUi, *TokenRenewCommand) { diff --git a/command/token_revoke.go b/command/token_revoke.go index 0aa9d0abd8..c9f6a2b7f2 100644 --- a/command/token_revoke.go +++ b/command/token_revoke.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/token_revoke_test.go b/command/token_revoke_test.go index 70aa8a08c6..3cdf13d615 100644 --- a/command/token_revoke_test.go +++ b/command/token_revoke_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) func testTokenRevokeCommand(tb testing.TB) (*cli.MockUi, *TokenRevokeCommand) { diff --git a/command/transform.go b/command/transform.go index a85229bddb..46129cd32e 100644 --- a/command/transform.go +++ b/command/transform.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*TransformCommand)(nil) diff --git a/command/transform_import_key.go b/command/transform_import_key.go index e582abd28a..d01100acea 100644 --- a/command/transform_import_key.go +++ b/command/transform_import_key.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/transform_import_key_version.go b/command/transform_import_key_version.go index 38e677b30b..61a6db45b6 100644 --- a/command/transform_import_key_version.go +++ b/command/transform_import_key_version.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/transit.go b/command/transit.go index a74ff50588..9b988d7e3c 100644 --- a/command/transit.go +++ b/command/transit.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = (*TransitCommand)(nil) diff --git a/command/transit_import_key.go b/command/transit_import_key.go index d8dd60b074..350821b076 100644 --- a/command/transit_import_key.go +++ b/command/transit_import_key.go @@ -20,7 +20,7 @@ import ( "github.com/google/tink/go/kwp/subtle" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/transit_import_key_version.go b/command/transit_import_key_version.go index 364481fd36..cf248554f7 100644 --- a/command/transit_import_key_version.go +++ b/command/transit_import_key_version.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/unwrap.go b/command/unwrap.go index f852845cfb..a671071c15 100644 --- a/command/unwrap.go +++ b/command/unwrap.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/unwrap_test.go b/command/unwrap_test.go index 41b03095ab..518d32fb12 100644 --- a/command/unwrap_test.go +++ b/command/unwrap_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testUnwrapCommand(tb testing.TB) (*cli.MockUi, *UnwrapCommand) { diff --git a/command/util.go b/command/util.go index 0ace161914..717191025d 100644 --- a/command/util.go +++ b/command/util.go @@ -12,11 +12,11 @@ import ( "time" "github.com/fatih/color" + "github.com/hashicorp/cli" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/config" "github.com/hashicorp/vault/command/token" - "github.com/mitchellh/cli" ) // DefaultTokenHelper returns the token helper that is configured for Vault. diff --git a/command/version.go b/command/version.go index 1e3dce16a7..8b54511c09 100644 --- a/command/version.go +++ b/command/version.go @@ -6,8 +6,8 @@ package command import ( "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/version" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/version_history.go b/command/version_history.go index 8f7fe1318d..7326bffded 100644 --- a/command/version_history.go +++ b/command/version_history.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" "github.com/ryanuber/columnize" ) diff --git a/command/version_history_test.go b/command/version_history_test.go index b6467b8fcb..8d2e184451 100644 --- a/command/version_history_test.go +++ b/command/version_history_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/version" - "github.com/mitchellh/cli" ) func testVersionHistoryCommand(tb testing.TB) (*cli.MockUi, *VersionHistoryCommand) { diff --git a/command/version_test.go b/command/version_test.go index be40377c1c..abacfd3662 100644 --- a/command/version_test.go +++ b/command/version_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/version" - "github.com/mitchellh/cli" ) func testVersionCommand(tb testing.TB) (*cli.MockUi, *VersionCommand) { diff --git a/command/write.go b/command/write.go index cd3301b8f2..33ee3be0f2 100644 --- a/command/write.go +++ b/command/write.go @@ -9,8 +9,8 @@ import ( "os" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/write_test.go b/command/write_test.go index 24521311ba..2e7a32833f 100644 --- a/command/write_test.go +++ b/command/write_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" ) func testWriteCommand(tb testing.TB) (*cli.MockUi, *WriteCommand) { diff --git a/go.mod b/go.mod index 47b75c30ae..8cf6506e58 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/denisenkom/go-mssqldb v0.12.3 github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74 github.com/dustin/go-humanize v1.0.1 - github.com/fatih/color v1.15.0 + github.com/fatih/color v1.16.0 github.com/fatih/structs v1.1.0 github.com/favadi/protoc-go-inject-tag v1.4.0 github.com/gammazero/workerpool v1.1.3 @@ -78,6 +78,7 @@ require ( github.com/hashicorp-forge/bbolt v1.3.8-hc3 github.com/hashicorp/cap v0.3.4 github.com/hashicorp/cap/ldap v0.0.0-20230914221201-c4eecc7e31f7 + github.com/hashicorp/cli v1.1.6 github.com/hashicorp/consul-template v0.33.0 github.com/hashicorp/consul/api v1.23.0 github.com/hashicorp/errwrap v1.1.0 @@ -171,11 +172,10 @@ require ( github.com/kr/pretty v0.3.1 github.com/kr/text v0.2.0 github.com/mattn/go-colorable v0.1.13 - github.com/mattn/go-isatty v0.0.19 + github.com/mattn/go-isatty v0.0.20 github.com/mholt/archiver/v3 v3.5.1 github.com/michaelklishin/rabbit-hole/v2 v2.12.0 github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a - github.com/mitchellh/cli v1.1.5 github.com/mitchellh/copystructure v1.2.0 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-testing-interface v1.14.1 @@ -220,7 +220,7 @@ require ( golang.org/x/net v0.17.0 golang.org/x/oauth2 v0.11.0 golang.org/x/sync v0.3.0 - golang.org/x/sys v0.13.0 + golang.org/x/sys v0.14.0 golang.org/x/term v0.13.0 golang.org/x/text v0.13.0 golang.org/x/tools v0.10.0 diff --git a/go.sum b/go.sum index deed962957..b792c55844 100644 --- a/go.sum +++ b/go.sum @@ -1046,7 +1046,6 @@ github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= @@ -1620,8 +1619,8 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/favadi/protoc-go-inject-tag v1.4.0 h1:K3KXxbgRw5WT4f43LbglARGz/8jVsDOS7uMjG4oNvXY= @@ -2131,6 +2130,8 @@ github.com/hashicorp/cap v0.3.4 h1:RoqWYqr6LaDLuvnBCpod1sZtvuEhehIhu0GncmoHW40= github.com/hashicorp/cap v0.3.4/go.mod h1:dHTmyMIVbzT981XxRoci5G//dfWmd/HhuNiCH6J5+IA= github.com/hashicorp/cap/ldap v0.0.0-20230914221201-c4eecc7e31f7 h1:jgVdtp5YMn++PxnYhAFfrURfLf+nlqzBeddbvRG+tTg= github.com/hashicorp/cap/ldap v0.0.0-20230914221201-c4eecc7e31f7/go.mod h1:q+c9XV1VqloZFZMu+zdvfb0cm7UrvKbvtmTF5wX5Q9o= +github.com/hashicorp/cli v1.1.6 h1:CMOV+/LJfL1tXCOKrgAX0uRKnzjj/mpmqNXloRSy2K8= +github.com/hashicorp/cli v1.1.6/go.mod h1:MPon5QYlgjjo0BSoAiN0ESeT5fRzDjVRp+uioJ0piz4= github.com/hashicorp/consul-template v0.33.0 h1:UNyf7V/nFeh8edh5X6pP8f+9LZVn+DG9uNLLcTpLsFc= github.com/hashicorp/consul-template v0.33.0/go.mod h1:3RayddSLvOGQwdifbbe4doVwamgJU4QvxTtf5DNeclw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= @@ -2376,8 +2377,6 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -2643,8 +2642,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= @@ -2701,8 +2700,6 @@ github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/cli v1.1.5 h1:OxRIeJXpAMztws/XHlN2vu6imG5Dpq+j61AzAX5fLng= -github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2cLtRR4= github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= @@ -3446,10 +3443,8 @@ golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -3873,8 +3868,9 @@ golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/internalshared/configutil/telemetry.go b/internalshared/configutil/telemetry.go index e10812276f..964e03f0b9 100644 --- a/internalshared/configutil/telemetry.go +++ b/internalshared/configutil/telemetry.go @@ -18,11 +18,11 @@ import ( "github.com/armon/go-metrics/prometheus" stackdriver "github.com/google/go-metrics-stackdriver" stackdrivervault "github.com/google/go-metrics-stackdriver/vault" + "github.com/hashicorp/cli" "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/vault/helper/metricsutil" - "github.com/mitchellh/cli" "google.golang.org/api/option" ) diff --git a/internalshared/listenerutil/listener.go b/internalshared/listenerutil/listener.go index 76b80860e4..1f8afe7176 100644 --- a/internalshared/listenerutil/listener.go +++ b/internalshared/listenerutil/listener.go @@ -13,12 +13,12 @@ import ( osuser "os/user" "strconv" + "github.com/hashicorp/cli" "github.com/hashicorp/errwrap" "github.com/hashicorp/go-secure-stdlib/reloadutil" "github.com/hashicorp/go-secure-stdlib/tlsutil" "github.com/hashicorp/vault/internalshared/configutil" "github.com/jefferai/isbadcipher" - "github.com/mitchellh/cli" ) type Listener struct {