diff --git a/.semgrep/imports.yml b/.semgrep/imports.yml index 4c1bae943..e429d9313 100644 --- a/.semgrep/imports.yml +++ b/.semgrep/imports.yml @@ -10,6 +10,7 @@ rules: - pattern: '"github.com/hashicorp/consul/command/flags"' - pattern: '"github.com/hashicorp/consul/sdk"' - pattern: '"github.com/hashicorp/go-set"' + - pattern: '"github.com/mitchellh/cli"' - pattern: '"golang.org/x/exp/slices"' - pattern: '"golang.org/x/exp/maps"' - pattern: '"golang.org/x/exp/constraints"' diff --git a/command/acl.go b/command/acl.go index b900ec5bb..523f6639e 100644 --- a/command/acl.go +++ b/command/acl.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type ACLCommand struct { diff --git a/command/acl_auth_method.go b/command/acl_auth_method.go index 50ca27aea..013bd9afa 100644 --- a/command/acl_auth_method.go +++ b/command/acl_auth_method.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) // Ensure ACLAuthMethodCommand satisfies the cli.Command interface. diff --git a/command/acl_auth_method_create.go b/command/acl_auth_method_create.go index e41fec8fe..72a366b92 100644 --- a/command/acl_auth_method_create.go +++ b/command/acl_auth_method_create.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_auth_method_create_test.go b/command/acl_auth_method_create_test.go index a552fd4a3..b7a46808a 100644 --- a/command/acl_auth_method_create_test.go +++ b/command/acl_auth_method_create_test.go @@ -9,10 +9,10 @@ import ( "os" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_delete.go b/command/acl_auth_method_delete.go index 4abb44c26..c21dc5775 100644 --- a/command/acl_auth_method_delete.go +++ b/command/acl_auth_method_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/acl_auth_method_delete_test.go b/command/acl_auth_method_delete_test.go index 9cd32e706..147365188 100644 --- a/command/acl_auth_method_delete_test.go +++ b/command/acl_auth_method_delete_test.go @@ -7,11 +7,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_info.go b/command/acl_auth_method_info.go index ad6d1996e..fea820e39 100644 --- a/command/acl_auth_method_info.go +++ b/command/acl_auth_method_info.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/acl_auth_method_info_test.go b/command/acl_auth_method_info_test.go index 66e76a9e5..bc97c5850 100644 --- a/command/acl_auth_method_info_test.go +++ b/command/acl_auth_method_info_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_list.go b/command/acl_auth_method_list.go index 256e88f94..21e69327e 100644 --- a/command/acl_auth_method_list.go +++ b/command/acl_auth_method_list.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_auth_method_list_test.go b/command/acl_auth_method_list_test.go index 2afe91934..1c08b016c 100644 --- a/command/acl_auth_method_list_test.go +++ b/command/acl_auth_method_list_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_update.go b/command/acl_auth_method_update.go index 59d0ebe36..673e3f424 100644 --- a/command/acl_auth_method_update.go +++ b/command/acl_auth_method_update.go @@ -12,8 +12,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_auth_method_update_test.go b/command/acl_auth_method_update_test.go index 2d17a5848..2fc9ebd40 100644 --- a/command/acl_auth_method_update_test.go +++ b/command/acl_auth_method_update_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule.go b/command/acl_binding_rule.go index 5419352cc..1d1833f80 100644 --- a/command/acl_binding_rule.go +++ b/command/acl_binding_rule.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) // Ensure ACLBindingRuleCommand satisfies the cli.Command interface. diff --git a/command/acl_binding_rule_create.go b/command/acl_binding_rule_create.go index 263718057..9a730d797 100644 --- a/command/acl_binding_rule_create.go +++ b/command/acl_binding_rule_create.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_binding_rule_create_test.go b/command/acl_binding_rule_create_test.go index 6416506a0..3a32346e1 100644 --- a/command/acl_binding_rule_create_test.go +++ b/command/acl_binding_rule_create_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_delete.go b/command/acl_binding_rule_delete.go index 98d4e08ca..7a61f8d0b 100644 --- a/command/acl_binding_rule_delete.go +++ b/command/acl_binding_rule_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/acl_binding_rule_delete_test.go b/command/acl_binding_rule_delete_test.go index b88bd6268..ba1b0ca30 100644 --- a/command/acl_binding_rule_delete_test.go +++ b/command/acl_binding_rule_delete_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_info.go b/command/acl_binding_rule_info.go index 2f5305f89..52ce55084 100644 --- a/command/acl_binding_rule_info.go +++ b/command/acl_binding_rule_info.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/acl_binding_rule_info_test.go b/command/acl_binding_rule_info_test.go index 2b04b76d1..0d03836e8 100644 --- a/command/acl_binding_rule_info_test.go +++ b/command/acl_binding_rule_info_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_list.go b/command/acl_binding_rule_list.go index 5931786bb..6cd70795f 100644 --- a/command/acl_binding_rule_list.go +++ b/command/acl_binding_rule_list.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_binding_rule_list_test.go b/command/acl_binding_rule_list_test.go index 7b4733a64..9da9d2bf8 100644 --- a/command/acl_binding_rule_list_test.go +++ b/command/acl_binding_rule_list_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_update.go b/command/acl_binding_rule_update.go index 58a3ca761..598f78da2 100644 --- a/command/acl_binding_rule_update.go +++ b/command/acl_binding_rule_update.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_binding_rule_update_test.go b/command/acl_binding_rule_update_test.go index 7b0366ee4..0a51213ea 100644 --- a/command/acl_binding_rule_update_test.go +++ b/command/acl_binding_rule_update_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_bootstrap.go b/command/acl_bootstrap.go index 408d28c96..9d3af38fc 100644 --- a/command/acl_bootstrap.go +++ b/command/acl_bootstrap.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_bootstrap_test.go b/command/acl_bootstrap_test.go index 85edc5fd1..78c5fc566 100644 --- a/command/acl_bootstrap_test.go +++ b/command/acl_bootstrap_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy.go b/command/acl_policy.go index ca94a8048..b5ee4a3f5 100644 --- a/command/acl_policy.go +++ b/command/acl_policy.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type ACLPolicyCommand struct { diff --git a/command/acl_policy_apply_test.go b/command/acl_policy_apply_test.go index 38794c3a5..d5ad88c20 100644 --- a/command/acl_policy_apply_test.go +++ b/command/acl_policy_apply_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy_delete_test.go b/command/acl_policy_delete_test.go index 1b0592700..c35994574 100644 --- a/command/acl_policy_delete_test.go +++ b/command/acl_policy_delete_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy_info_test.go b/command/acl_policy_info_test.go index acdf2ec0e..ed9aba00d 100644 --- a/command/acl_policy_info_test.go +++ b/command/acl_policy_info_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy_list_test.go b/command/acl_policy_list_test.go index 69c308b69..b928eb8e8 100644 --- a/command/acl_policy_list_test.go +++ b/command/acl_policy_list_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_role.go b/command/acl_role.go index 5eb3d0e28..b203f03b3 100644 --- a/command/acl_role.go +++ b/command/acl_role.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) // Ensure ACLRoleCommand satisfies the cli.Command interface. diff --git a/command/acl_role_create.go b/command/acl_role_create.go index be4b8d8a2..bd4d11d7b 100644 --- a/command/acl_role_create.go +++ b/command/acl_role_create.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_role_create_test.go b/command/acl_role_create_test.go index 7221092c3..69652b621 100644 --- a/command/acl_role_create_test.go +++ b/command/acl_role_create_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_delete.go b/command/acl_role_delete.go index e99898dc3..9b1638231 100644 --- a/command/acl_role_delete.go +++ b/command/acl_role_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/acl_role_delete_test.go b/command/acl_role_delete_test.go index ea115807e..42f77ad2a 100644 --- a/command/acl_role_delete_test.go +++ b/command/acl_role_delete_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_info.go b/command/acl_role_info.go index a8740436a..d6aa4b57f 100644 --- a/command/acl_role_info.go +++ b/command/acl_role_info.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_role_info_test.go b/command/acl_role_info_test.go index ad8921a5c..733e34940 100644 --- a/command/acl_role_info_test.go +++ b/command/acl_role_info_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_list.go b/command/acl_role_list.go index 4f0a4b200..c4a653040 100644 --- a/command/acl_role_list.go +++ b/command/acl_role_list.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_role_list_test.go b/command/acl_role_list_test.go index 3513aeb4d..23c17523d 100644 --- a/command/acl_role_list_test.go +++ b/command/acl_role_list_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_update.go b/command/acl_role_update.go index 194d55485..08d895db6 100644 --- a/command/acl_role_update.go +++ b/command/acl_role_update.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/acl_role_update_test.go b/command/acl_role_update_test.go index 394c3414e..25c29bc6d 100644 --- a/command/acl_role_update_test.go +++ b/command/acl_role_update_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_token.go b/command/acl_token.go index 01b3dc5fd..4accc4e3d 100644 --- a/command/acl_token.go +++ b/command/acl_token.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type ACLTokenCommand struct { diff --git a/command/acl_token_create_test.go b/command/acl_token_create_test.go index 6afc140a1..a384f324d 100644 --- a/command/acl_token_create_test.go +++ b/command/acl_token_create_test.go @@ -7,10 +7,10 @@ import ( "encoding/json" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_delete_test.go b/command/acl_token_delete_test.go index aaa5052b2..29077e5f1 100644 --- a/command/acl_token_delete_test.go +++ b/command/acl_token_delete_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_info_test.go b/command/acl_token_info_test.go index eef8ddd82..9b21bc06e 100644 --- a/command/acl_token_info_test.go +++ b/command/acl_token_info_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_list_test.go b/command/acl_token_list_test.go index 8b87ad58f..d9f4a797e 100644 --- a/command/acl_token_list_test.go +++ b/command/acl_token_list_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_self_test.go b/command/acl_token_self_test.go index 96e492958..c3e1b3de5 100644 --- a/command/acl_token_self_test.go +++ b/command/acl_token_self_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_update_test.go b/command/acl_token_update_test.go index 28fb3831b..42ebdcdd5 100644 --- a/command/acl_token_update_test.go +++ b/command/acl_token_update_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/agent/command.go b/command/agent/command.go index 8184a067a..0f7e9613f 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -23,6 +23,7 @@ import ( "github.com/armon/go-metrics/circonus" "github.com/armon/go-metrics/datadog" "github.com/armon/go-metrics/prometheus" + "github.com/hashicorp/cli" checkpoint "github.com/hashicorp/go-checkpoint" discover "github.com/hashicorp/go-discover" hclog "github.com/hashicorp/go-hclog" @@ -36,7 +37,6 @@ import ( "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" "github.com/hashicorp/nomad/version" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/agent/command_test.go b/command/agent/command_test.go index 014f9a5d4..0c58e5c2f 100644 --- a/command/agent/command_test.go +++ b/command/agent/command_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/retry_join_test.go b/command/agent/retry_join_test.go index 20eac30a6..8c9fc5200 100644 --- a/command/agent/retry_join_test.go +++ b/command/agent/retry_join_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/go-netaddrs" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent_info_test.go b/command/agent_info_test.go index 61800428a..607b916fd 100644 --- a/command/agent_info_test.go +++ b/command/agent_info_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/agent_monitor.go b/command/agent_monitor.go index 2afa68422..e6b9ffcf8 100644 --- a/command/agent_monitor.go +++ b/command/agent_monitor.go @@ -13,8 +13,8 @@ import ( "syscall" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) type MonitorCommand struct { diff --git a/command/agent_monitor_test.go b/command/agent_monitor_test.go index a69ca3514..ecd8feeb3 100644 --- a/command/agent_monitor_test.go +++ b/command/agent_monitor_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/alloc.go b/command/alloc.go index 15cee7b9b..ebd18ada0 100644 --- a/command/alloc.go +++ b/command/alloc.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type AllocCommand struct { diff --git a/command/alloc_checks_test.go b/command/alloc_checks_test.go index 652bce0a3..ba07f6d29 100644 --- a/command/alloc_checks_test.go +++ b/command/alloc_checks_test.go @@ -7,11 +7,11 @@ import ( "encoding/json" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_exec_test.go b/command/alloc_exec_test.go index 3c730d65f..a270ffd56 100644 --- a/command/alloc_exec_test.go +++ b/command/alloc_exec_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_fs_test.go b/command/alloc_fs_test.go index 9e6ef96b7..a21959c9e 100644 --- a/command/alloc_fs_test.go +++ b/command/alloc_fs_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_logs_test.go b/command/alloc_logs_test.go index 5cee74972..8b866f240 100644 --- a/command/alloc_logs_test.go +++ b/command/alloc_logs_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_pause_test.go b/command/alloc_pause_test.go index 810a62e9e..3a6eea716 100644 --- a/command/alloc_pause_test.go +++ b/command/alloc_pause_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestAllocPauseCommand_Implements(t *testing.T) { diff --git a/command/alloc_restart_test.go b/command/alloc_restart_test.go index 0596f01e6..c098417a3 100644 --- a/command/alloc_restart_test.go +++ b/command/alloc_restart_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_signal_test.go b/command/alloc_signal_test.go index f27bb64dc..eb0f3877d 100644 --- a/command/alloc_signal_test.go +++ b/command/alloc_signal_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_status_test.go b/command/alloc_status_test.go index 6260b7963..600f074c3 100644 --- a/command/alloc_status_test.go +++ b/command/alloc_status_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_stop_test.go b/command/alloc_stop_test.go index a1f5e176c..9923227b1 100644 --- a/command/alloc_stop_test.go +++ b/command/alloc_stop_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/check_test.go b/command/check_test.go index a397c6b92..8e531ac5d 100644 --- a/command/check_test.go +++ b/command/check_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/commands.go b/command/commands.go index 89e0b35a1..a29e97ea7 100644 --- a/command/commands.go +++ b/command/commands.go @@ -7,10 +7,10 @@ import ( "fmt" "os" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/version" colorable "github.com/mattn/go-colorable" - "github.com/mitchellh/cli" ) const ( diff --git a/command/commands_ce.go b/command/commands_ce.go index 3a45a07e8..f8445f296 100644 --- a/command/commands_ce.go +++ b/command/commands_ce.go @@ -6,7 +6,7 @@ package command -import "github.com/mitchellh/cli" +import "github.com/hashicorp/cli" func EntCommands(metaPtr *Meta, agentUi cli.Ui) map[string]cli.CommandFactory { return map[string]cli.CommandFactory{} diff --git a/command/config.go b/command/config.go index cce4e0ec3..705a54e6f 100644 --- a/command/config.go +++ b/command/config.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type ConfigCommand struct { diff --git a/command/config_validate_test.go b/command/config_validate_test.go index 64c98eab0..3dc93e857 100644 --- a/command/config_validate_test.go +++ b/command/config_validate_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/deployment.go b/command/deployment.go index 45e83344f..203d10a30 100644 --- a/command/deployment.go +++ b/command/deployment.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type DeploymentCommand struct { diff --git a/command/deployment_fail_test.go b/command/deployment_fail_test.go index c6d3c7233..8559a6bd1 100644 --- a/command/deployment_fail_test.go +++ b/command/deployment_fail_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_list_test.go b/command/deployment_list_test.go index a14960689..dca404eba 100644 --- a/command/deployment_list_test.go +++ b/command/deployment_list_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestDeploymentListCommand_Implements(t *testing.T) { diff --git a/command/deployment_pause_test.go b/command/deployment_pause_test.go index f8356af7c..379bd65e9 100644 --- a/command/deployment_pause_test.go +++ b/command/deployment_pause_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_promote_test.go b/command/deployment_promote_test.go index 38aefcddb..4bdeeefba 100644 --- a/command/deployment_promote_test.go +++ b/command/deployment_promote_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_resume_test.go b/command/deployment_resume_test.go index ee4f97c19..188aeea00 100644 --- a/command/deployment_resume_test.go +++ b/command/deployment_resume_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_status_test.go b/command/deployment_status_test.go index 62e864282..6bc91eb77 100644 --- a/command/deployment_status_test.go +++ b/command/deployment_status_test.go @@ -6,9 +6,9 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_unblock_test.go b/command/deployment_unblock_test.go index 96430fc71..6ef27f6ec 100644 --- a/command/deployment_unblock_test.go +++ b/command/deployment_unblock_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/eval.go b/command/eval.go index d2e0edd18..993a5b4c0 100644 --- a/command/eval.go +++ b/command/eval.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type EvalCommand struct { diff --git a/command/eval_delete_test.go b/command/eval_delete_test.go index 9ada56f50..97e6cd7be 100644 --- a/command/eval_delete_test.go +++ b/command/eval_delete_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/eval_status_test.go b/command/eval_status_test.go index fa8f393c0..dc15cb3a1 100644 --- a/command/eval_status_test.go +++ b/command/eval_status_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/event.go b/command/event.go index 29033d97b..3aafcc043 100644 --- a/command/event.go +++ b/command/event.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) var _ cli.Command = &EventCommand{} diff --git a/command/event_test.go b/command/event_test.go index 6175e41e9..fa5975d8f 100644 --- a/command/event_test.go +++ b/command/event_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/fmt_test.go b/command/fmt_test.go index a2cf0f028..20bbf918c 100644 --- a/command/fmt_test.go +++ b/command/fmt_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/helper_devices.go b/command/helper_devices.go index 1a61d874a..4f6a0c432 100644 --- a/command/helper_devices.go +++ b/command/helper_devices.go @@ -7,8 +7,8 @@ import ( "fmt" "sort" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) func deviceQualifiedID(vendor, typ, name, id string) string { diff --git a/command/helpers.go b/command/helpers.go index d434117ee..d2d2a7d36 100644 --- a/command/helpers.go +++ b/command/helpers.go @@ -16,12 +16,12 @@ import ( "strings" "time" + "github.com/hashicorp/cli" gg "github.com/hashicorp/go-getter" "github.com/hashicorp/nomad/api" flaghelper "github.com/hashicorp/nomad/helper/flags" "github.com/hashicorp/nomad/jobspec2" "github.com/kr/text" - "github.com/mitchellh/cli" "github.com/moby/term" "github.com/posener/complete" "github.com/ryanuber/columnize" diff --git a/command/helpers_test.go b/command/helpers_test.go index bacd5a81b..c6b0c4dae 100644 --- a/command/helpers_test.go +++ b/command/helpers_test.go @@ -16,13 +16,13 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client/testutil" "github.com/hashicorp/nomad/helper/flatmap" "github.com/hashicorp/nomad/helper/pointer" "github.com/kr/pretty" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/job.go b/command/job.go index 8ad42b7a2..d19ff2447 100644 --- a/command/job.go +++ b/command/job.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type JobCommand struct { diff --git a/command/job_allocs_test.go b/command/job_allocs_test.go index 4f51eec6f..6ceee1f2d 100644 --- a/command/job_allocs_test.go +++ b/command/job_allocs_test.go @@ -6,12 +6,12 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_deployments_test.go b/command/job_deployments_test.go index ab1f43366..fdbf98c54 100644 --- a/command/job_deployments_test.go +++ b/command/job_deployments_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_dispatch_test.go b/command/job_dispatch_test.go index d5e65796a..30e8c95f9 100644 --- a/command/job_dispatch_test.go +++ b/command/job_dispatch_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_eval_test.go b/command/job_eval_test.go index fd081b9ee..93e56e58a 100644 --- a/command/job_eval_test.go +++ b/command/job_eval_test.go @@ -8,13 +8,13 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_history_test.go b/command/job_history_test.go index a30256f18..25fdc0e77 100644 --- a/command/job_history_test.go +++ b/command/job_history_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_init_test.go b/command/job_init_test.go index 556d66539..823fc48d0 100644 --- a/command/job_init_test.go +++ b/command/job_init_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/asset" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/job_inspect_test.go b/command/job_inspect_test.go index f09a0bee0..fdf3c645e 100644 --- a/command/job_inspect_test.go +++ b/command/job_inspect_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_periodic.go b/command/job_periodic.go index 10deacb69..1abf56ea4 100644 --- a/command/job_periodic.go +++ b/command/job_periodic.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type JobPeriodicCommand struct { diff --git a/command/job_periodic_force_test.go b/command/job_periodic_force_test.go index 730240ed4..e80a6e407 100644 --- a/command/job_periodic_force_test.go +++ b/command/job_periodic_force_test.go @@ -7,6 +7,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" @@ -14,7 +15,6 @@ import ( "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_plan_test.go b/command/job_plan_test.go index aafd17fd6..5d1b767fa 100644 --- a/command/job_plan_test.go +++ b/command/job_plan_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/job_promote_test.go b/command/job_promote_test.go index 299bb3704..b589aaad5 100644 --- a/command/job_promote_test.go +++ b/command/job_promote_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_restart_test.go b/command/job_restart_test.go index 7ab11abd9..d035d315e 100644 --- a/command/job_restart_test.go +++ b/command/job_restart_test.go @@ -18,13 +18,13 @@ import ( "time" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/hashicorp/cli" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/command/job_revert_test.go b/command/job_revert_test.go index a57179f35..0939ca02a 100644 --- a/command/job_revert_test.go +++ b/command/job_revert_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" structs "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_run_test.go b/command/job_run_test.go index 97505e05a..95414fbf8 100644 --- a/command/job_run_test.go +++ b/command/job_run_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/job_scale.go b/command/job_scale.go index 626f27c33..928763f58 100644 --- a/command/job_scale.go +++ b/command/job_scale.go @@ -10,9 +10,9 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/helper/pointer" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/job_scale_test.go b/command/job_scale_test.go index d65f743ed..ba15812d5 100644 --- a/command/job_scale_test.go +++ b/command/job_scale_test.go @@ -8,6 +8,7 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" @@ -15,7 +16,6 @@ import ( "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/job_scaling_events.go b/command/job_scaling_events.go index c9a5343b2..6e8967bd3 100644 --- a/command/job_scaling_events.go +++ b/command/job_scaling_events.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/job_scaling_events_test.go b/command/job_scaling_events_test.go index 673635128..c30b22da2 100644 --- a/command/job_scaling_events_test.go +++ b/command/job_scaling_events_test.go @@ -8,6 +8,7 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" @@ -15,7 +16,6 @@ import ( "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/job_status_test.go b/command/job_status_test.go index 90800a527..48eaa0748 100644 --- a/command/job_status_test.go +++ b/command/job_status_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) @@ -55,7 +55,7 @@ func TestJobStatusCommand_Run(t *testing.T) { } // Check for this awkward nil string, since a nil bytes.Buffer - // returns this purposely, and mitchellh/cli has a nil pointer + // returns this purposely, and hashicorp/cli has a nil pointer // if nothing was ever output. exp := "No running jobs" if out := strings.TrimSpace(ui.OutputWriter.String()); out != exp { diff --git a/command/job_stop_test.go b/command/job_stop_test.go index be39009b8..a340b9641 100644 --- a/command/job_stop_test.go +++ b/command/job_stop_test.go @@ -9,6 +9,7 @@ import ( "path/filepath" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" @@ -16,7 +17,6 @@ import ( "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_tag.go b/command/job_tag.go index 3dca8700b..b9a72945e 100644 --- a/command/job_tag.go +++ b/command/job_tag.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type JobTagCommand struct { diff --git a/command/job_tag_test.go b/command/job_tag_test.go index 8fb313d9b..6a465f5db 100644 --- a/command/job_tag_test.go +++ b/command/job_tag_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/job_validate_test.go b/command/job_validate_test.go index 52163f1d4..5a6253c7a 100644 --- a/command/job_validate_test.go +++ b/command/job_validate_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/license.go b/command/license.go index c26839754..fd96030a3 100644 --- a/command/license.go +++ b/command/license.go @@ -8,8 +8,8 @@ import ( "strings" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) var _ cli.Command = &LicenseCommand{} diff --git a/command/license_get_test.go b/command/license_get_test.go index fed0d4594..dfd13ea97 100644 --- a/command/license_get_test.go +++ b/command/license_get_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/login.go b/command/login.go index d61a7896d..a30eb22f5 100644 --- a/command/login.go +++ b/command/login.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/hashicorp/cap/util" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" "github.com/hashicorp/nomad/api" diff --git a/command/login_test.go b/command/login_test.go index 3aacb5e68..47815a8ba 100644 --- a/command/login_test.go +++ b/command/login_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/meta.go b/command/meta.go index 6e7f628c9..da641896a 100644 --- a/command/meta.go +++ b/command/meta.go @@ -10,10 +10,10 @@ import ( "reflect" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/helper/pointer" colorable "github.com/mattn/go-colorable" - "github.com/mitchellh/cli" "github.com/mitchellh/colorstring" "github.com/posener/complete" "golang.org/x/crypto/ssh/terminal" diff --git a/command/meta_test.go b/command/meta_test.go index dd07837dc..208dd15cb 100644 --- a/command/meta_test.go +++ b/command/meta_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/creack/pty" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/metrics_test.go b/command/metrics_test.go index a3d369a52..3df10897c 100644 --- a/command/metrics_test.go +++ b/command/metrics_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/monitor.go b/command/monitor.go index 9a8e994c7..662253741 100644 --- a/command/monitor.go +++ b/command/monitor.go @@ -10,8 +10,8 @@ import ( "sync" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) const ( diff --git a/command/monitor_test.go b/command/monitor_test.go index 1466b20b2..b6bf1eef7 100644 --- a/command/monitor_test.go +++ b/command/monitor_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/command/namespace.go b/command/namespace.go index a02c4e23f..4dca28f22 100644 --- a/command/namespace.go +++ b/command/namespace.go @@ -6,8 +6,8 @@ package command import ( "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api/contexts" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/namespace_apply_test.go b/command/namespace_apply_test.go index a93518f16..89a8c76d0 100644 --- a/command/namespace_apply_test.go +++ b/command/namespace_apply_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/namespace_delete_test.go b/command/namespace_delete_test.go index d0bc5a06a..a099fc9dc 100644 --- a/command/namespace_delete_test.go +++ b/command/namespace_delete_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/namespace_inspect_test.go b/command/namespace_inspect_test.go index f7554db7f..b83c9fd2f 100644 --- a/command/namespace_inspect_test.go +++ b/command/namespace_inspect_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/namespace_list_test.go b/command/namespace_list_test.go index d369aca06..e7b4f1e36 100644 --- a/command/namespace_list_test.go +++ b/command/namespace_list_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) var _ cli.Command = (*NamespaceListCommand)(nil) diff --git a/command/namespace_status_test.go b/command/namespace_status_test.go index a1264d48a..6680638b6 100644 --- a/command/namespace_status_test.go +++ b/command/namespace_status_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node.go b/command/node.go index 3498c8d7f..2d0bdbd1e 100644 --- a/command/node.go +++ b/command/node.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" ) type NodeCommand struct { diff --git a/command/node_config_test.go b/command/node_config_test.go index 2a7482dd8..471cf9fac 100644 --- a/command/node_config_test.go +++ b/command/node_config_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" - "github.com/mitchellh/cli" ) func TestClientConfigCommand_Implements(t *testing.T) { diff --git a/command/node_drain_test.go b/command/node_drain_test.go index 4e5a1bafc..880b42535 100644 --- a/command/node_drain_test.go +++ b/command/node_drain_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node_eligibility_test.go b/command/node_eligibility_test.go index 95de5dece..8ed7215e7 100644 --- a/command/node_eligibility_test.go +++ b/command/node_eligibility_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node_meta.go b/command/node_meta.go index e4987a591..24fab0c03 100644 --- a/command/node_meta.go +++ b/command/node_meta.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type NodeMetaCommand struct { diff --git a/command/node_pool.go b/command/node_pool.go index 66782ecd4..b4721863f 100644 --- a/command/node_pool.go +++ b/command/node_pool.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/node_pool_apply_test.go b/command/node_pool_apply_test.go index e8045dfd6..fbd9307e8 100644 --- a/command/node_pool_apply_test.go +++ b/command/node_pool_apply_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_delete_test.go b/command/node_pool_delete_test.go index 996f6986a..759c55860 100644 --- a/command/node_pool_delete_test.go +++ b/command/node_pool_delete_test.go @@ -6,9 +6,9 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_info_test.go b/command/node_pool_info_test.go index f14ddc597..186b5c5d9 100644 --- a/command/node_pool_info_test.go +++ b/command/node_pool_info_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_init_test.go b/command/node_pool_init_test.go index 790436442..90e7a3b3d 100644 --- a/command/node_pool_init_test.go +++ b/command/node_pool_init_test.go @@ -8,7 +8,7 @@ import ( "path" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/shoenig/test/must" "github.com/hashicorp/nomad/ci" diff --git a/command/node_pool_jobs_test.go b/command/node_pool_jobs_test.go index a6dd93597..90ec781e5 100644 --- a/command/node_pool_jobs_test.go +++ b/command/node_pool_jobs_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/pointer" - "github.com/mitchellh/cli" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_list_test.go b/command/node_pool_list_test.go index 8872dd482..cdea0f45b 100644 --- a/command/node_pool_list_test.go +++ b/command/node_pool_list_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_nodes_test.go b/command/node_pool_nodes_test.go index e2c5fdc0c..f9cc20c1e 100644 --- a/command/node_pool_nodes_test.go +++ b/command/node_pool_nodes_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_test.go b/command/node_pool_test.go index e589be2ed..4217dfd53 100644 --- a/command/node_pool_test.go +++ b/command/node_pool_test.go @@ -7,10 +7,10 @@ import ( "regexp" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node_status_test.go b/command/node_status_test.go index cfddd03f4..2bfa259ea 100644 --- a/command/node_status_test.go +++ b/command/node_status_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/operator.go b/command/operator.go index 96e7408d3..4b615287d 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" ) type OperatorCommand struct { diff --git a/command/operator_api_test.go b/command/operator_api_test.go index 5f30b2572..bc25a234b 100644 --- a/command/operator_api_test.go +++ b/command/operator_api_test.go @@ -15,9 +15,9 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_autopilot.go b/command/operator_autopilot.go index 170e493b0..522e3d24d 100644 --- a/command/operator_autopilot.go +++ b/command/operator_autopilot.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type OperatorAutopilotCommand struct { diff --git a/command/operator_autopilot_get_test.go b/command/operator_autopilot_get_test.go index 304c56ff4..485738c1e 100644 --- a/command/operator_autopilot_get_test.go +++ b/command/operator_autopilot_get_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestOperator_Autopilot_GetConfig_Implements(t *testing.T) { diff --git a/command/operator_autopilot_health_test.go b/command/operator_autopilot_health_test.go index 4c0a38d7c..a09f73ac8 100644 --- a/command/operator_autopilot_health_test.go +++ b/command/operator_autopilot_health_test.go @@ -7,9 +7,9 @@ import ( "encoding/json" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_autopilot_set_test.go b/command/operator_autopilot_set_test.go index abd04a1ce..cc75a4c29 100644 --- a/command/operator_autopilot_set_test.go +++ b/command/operator_autopilot_set_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_autopilot_test.go b/command/operator_autopilot_test.go index ac9121735..02edc1932 100644 --- a/command/operator_autopilot_test.go +++ b/command/operator_autopilot_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestOperator_Autopilot_Implements(t *testing.T) { diff --git a/command/operator_client_state_test.go b/command/operator_client_state_test.go index 6a992fcb6..2220d33cc 100644 --- a/command/operator_client_state_test.go +++ b/command/operator_client_state_test.go @@ -6,11 +6,11 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/client/state" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_debug_test.go b/command/operator_debug_test.go index 8be0c468f..05b0131f8 100644 --- a/command/operator_debug_test.go +++ b/command/operator_debug_test.go @@ -15,6 +15,7 @@ import ( "testing" "time" + "github.com/hashicorp/cli" consulapi "github.com/hashicorp/consul/api" consultest "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/nomad/api" @@ -25,7 +26,6 @@ import ( "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/nomad/state" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/command/operator_gossip.go b/command/operator_gossip.go index a5009fcce..b589d0a72 100644 --- a/command/operator_gossip.go +++ b/command/operator_gossip.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type OperatorGossipCommand struct { diff --git a/command/operator_gossip_keyring.go b/command/operator_gossip_keyring.go index df23bbee1..29c388003 100644 --- a/command/operator_gossip_keyring.go +++ b/command/operator_gossip_keyring.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/operator_gossip_keyring_install.go b/command/operator_gossip_keyring_install.go index 91c86b964..533b08cc4 100644 --- a/command/operator_gossip_keyring_install.go +++ b/command/operator_gossip_keyring_install.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_gossip_keyring_list.go b/command/operator_gossip_keyring_list.go index 69c804842..8ea32a3be 100644 --- a/command/operator_gossip_keyring_list.go +++ b/command/operator_gossip_keyring_list.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_gossip_keyring_remove.go b/command/operator_gossip_keyring_remove.go index c346b47ac..9852e160d 100644 --- a/command/operator_gossip_keyring_remove.go +++ b/command/operator_gossip_keyring_remove.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_gossip_keyring_test.go b/command/operator_gossip_keyring_test.go index 748fef912..e27a090f5 100644 --- a/command/operator_gossip_keyring_test.go +++ b/command/operator_gossip_keyring_test.go @@ -7,8 +7,8 @@ import ( "encoding/base64" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_gossip_keyring_use.go b/command/operator_gossip_keyring_use.go index afb24de35..987826370 100644 --- a/command/operator_gossip_keyring_use.go +++ b/command/operator_gossip_keyring_use.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.go b/command/operator_raft.go index b26bc0c23..898bdca25 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" ) type OperatorRaftCommand struct { diff --git a/command/operator_raft_list_test.go b/command/operator_raft_list_test.go index e65052e18..1fc173dc4 100644 --- a/command/operator_raft_list_test.go +++ b/command/operator_raft_list_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestOperator_Raft_ListPeers_Implements(t *testing.T) { diff --git a/command/operator_raft_remove_test.go b/command/operator_raft_remove_test.go index 5ac287e05..1278c0504 100644 --- a/command/operator_raft_remove_test.go +++ b/command/operator_raft_remove_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_raft_test.go b/command/operator_raft_test.go index 46f4a9e85..76aa3f840 100644 --- a/command/operator_raft_test.go +++ b/command/operator_raft_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestOperator_Raft_Implements(t *testing.T) { diff --git a/command/operator_root.go b/command/operator_root.go index de8b04257..a7e02ed2a 100644 --- a/command/operator_root.go +++ b/command/operator_root.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type OperatorRootCommand struct { diff --git a/command/operator_root_keyring.go b/command/operator_root_keyring.go index b92e1a577..35722aac0 100644 --- a/command/operator_root_keyring.go +++ b/command/operator_root_keyring.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" "github.com/hashicorp/nomad/api" diff --git a/command/operator_scheduler.go b/command/operator_scheduler.go index fe91070a2..aae15e2a2 100644 --- a/command/operator_scheduler.go +++ b/command/operator_scheduler.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) // Ensure OperatorSchedulerCommand satisfies the cli.Command interface. diff --git a/command/operator_scheduler_get_config.go b/command/operator_scheduler_get_config.go index 0147c1640..ee38f15ed 100644 --- a/command/operator_scheduler_get_config.go +++ b/command/operator_scheduler_get_config.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_scheduler_get_config_test.go b/command/operator_scheduler_get_config_test.go index f1c73d753..4794c6b0e 100644 --- a/command/operator_scheduler_get_config_test.go +++ b/command/operator_scheduler_get_config_test.go @@ -7,9 +7,9 @@ import ( "encoding/json" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_scheduler_set_config.go b/command/operator_scheduler_set_config.go index 62413966e..718b94840 100644 --- a/command/operator_scheduler_set_config.go +++ b/command/operator_scheduler_set_config.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" flagHelper "github.com/hashicorp/nomad/helper/flags" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/operator_scheduler_set_config_test.go b/command/operator_scheduler_set_config_test.go index 533b4f71f..fd13e2564 100644 --- a/command/operator_scheduler_set_config_test.go +++ b/command/operator_scheduler_set_config_test.go @@ -7,9 +7,9 @@ import ( "strconv" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_snapshot.go b/command/operator_snapshot.go index f381d9719..167b47d40 100644 --- a/command/operator_snapshot.go +++ b/command/operator_snapshot.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type OperatorSnapshotCommand struct { diff --git a/command/operator_snapshot_inspect_test.go b/command/operator_snapshot_inspect_test.go index 203f441db..02e09f3f6 100644 --- a/command/operator_snapshot_inspect_test.go +++ b/command/operator_snapshot_inspect_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_snapshot_restore_test.go b/command/operator_snapshot_restore_test.go index 434d788bc..9a324ebab 100644 --- a/command/operator_snapshot_restore_test.go +++ b/command/operator_snapshot_restore_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_snapshot_save_test.go b/command/operator_snapshot_save_test.go index 55b5e5691..a8613be26 100644 --- a/command/operator_snapshot_save_test.go +++ b/command/operator_snapshot_save_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/snapshot" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/operator_test.go b/command/operator_test.go index 577fbb7f4..e5d4a56dc 100644 --- a/command/operator_test.go +++ b/command/operator_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestOperator_Implements(t *testing.T) { diff --git a/command/plugin.go b/command/plugin.go index 8dc5b3a60..1b2391dec 100644 --- a/command/plugin.go +++ b/command/plugin.go @@ -3,7 +3,7 @@ package command -import "github.com/mitchellh/cli" +import "github.com/hashicorp/cli" type PluginCommand struct { Meta diff --git a/command/plugin_status_test.go b/command/plugin_status_test.go index 85c3b2a3c..eb0b36124 100644 --- a/command/plugin_status_test.go +++ b/command/plugin_status_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/go-memdb" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/state" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/quota.go b/command/quota.go index d66ba8511..c1b69d544 100644 --- a/command/quota.go +++ b/command/quota.go @@ -6,8 +6,8 @@ package command import ( "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api/contexts" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/quota_apply_test.go b/command/quota_apply_test.go index 035e6f903..c7955f27c 100644 --- a/command/quota_apply_test.go +++ b/command/quota_apply_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestQuotaApplyCommand_Implements(t *testing.T) { diff --git a/command/quota_delete_test.go b/command/quota_delete_test.go index c084853fd..1f087b8fd 100644 --- a/command/quota_delete_test.go +++ b/command/quota_delete_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/helper/uuid" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/quota_init_test.go b/command/quota_init_test.go index 3a6d3869f..c83f7ba2d 100644 --- a/command/quota_init_test.go +++ b/command/quota_init_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/quota_inspect_test.go b/command/quota_inspect_test.go index 264fe903b..c67605b45 100644 --- a/command/quota_inspect_test.go +++ b/command/quota_inspect_test.go @@ -10,9 +10,9 @@ import ( "encoding/json" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/quota_list_test.go b/command/quota_list_test.go index 729febf9d..8c9ced67a 100644 --- a/command/quota_list_test.go +++ b/command/quota_list_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/quota_status_test.go b/command/quota_status_test.go index ff3843ef8..704b76895 100644 --- a/command/quota_status_test.go +++ b/command/quota_status_test.go @@ -10,9 +10,9 @@ import ( "encoding/json" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/recommendation.go b/command/recommendation.go index e878ade8c..42e00914b 100644 --- a/command/recommendation.go +++ b/command/recommendation.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) // Ensure RecommendationCommand satisfies the cli.Command interface. diff --git a/command/recommendation_apply.go b/command/recommendation_apply.go index 85b473d0d..d24d65ecb 100644 --- a/command/recommendation_apply.go +++ b/command/recommendation_apply.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/recommendation_apply_test.go b/command/recommendation_apply_test.go index 360c1e8eb..4f00800b9 100644 --- a/command/recommendation_apply_test.go +++ b/command/recommendation_apply_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/recommendation_dismiss.go b/command/recommendation_dismiss.go index 656ee9097..6e2f000f4 100644 --- a/command/recommendation_dismiss.go +++ b/command/recommendation_dismiss.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" "github.com/hashicorp/nomad/api/contexts" diff --git a/command/recommendation_dismiss_test.go b/command/recommendation_dismiss_test.go index 86e8877eb..766047f80 100644 --- a/command/recommendation_dismiss_test.go +++ b/command/recommendation_dismiss_test.go @@ -7,11 +7,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/recommendation_info.go b/command/recommendation_info.go index 124ab25de..6b29d20cc 100644 --- a/command/recommendation_info.go +++ b/command/recommendation_info.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/recommendation_info_test.go b/command/recommendation_info_test.go index 757842c9b..18d268bdc 100644 --- a/command/recommendation_info_test.go +++ b/command/recommendation_info_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/recommendation_list.go b/command/recommendation_list.go index b56317187..4659b13e2 100644 --- a/command/recommendation_list.go +++ b/command/recommendation_list.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/recommendation_list_test.go b/command/recommendation_list_test.go index 9701b7e0e..e752610a8 100644 --- a/command/recommendation_list_test.go +++ b/command/recommendation_list_test.go @@ -7,10 +7,10 @@ import ( "sort" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/scaling.go b/command/scaling.go index f50c23890..325ca6603 100644 --- a/command/scaling.go +++ b/command/scaling.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) // Ensure ScalingCommand satisfies the cli.Command interface. diff --git a/command/scaling_policy.go b/command/scaling_policy.go index beda356b0..35999579b 100644 --- a/command/scaling_policy.go +++ b/command/scaling_policy.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) // Ensure ScalingPolicyCommand satisfies the cli.Command interface. diff --git a/command/scaling_policy_info.go b/command/scaling_policy_info.go index d8b62251f..0003e9c1e 100644 --- a/command/scaling_policy_info.go +++ b/command/scaling_policy_info.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" "github.com/hashicorp/nomad/api" diff --git a/command/scaling_policy_info_test.go b/command/scaling_policy_info_test.go index 2150911d2..44d76a0ff 100644 --- a/command/scaling_policy_info_test.go +++ b/command/scaling_policy_info_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" ) func TestScalingPolicyInfoCommand_Run(t *testing.T) { diff --git a/command/scaling_policy_list.go b/command/scaling_policy_list.go index c65eb9ac0..e1a95a94d 100644 --- a/command/scaling_policy_list.go +++ b/command/scaling_policy_list.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/scaling_policy_list_test.go b/command/scaling_policy_list_test.go index c5304e5cd..0d50c1f48 100644 --- a/command/scaling_policy_list_test.go +++ b/command/scaling_policy_list_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/pointer" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/sentinel.go b/command/sentinel.go index 0064ec932..9b0629a05 100644 --- a/command/sentinel.go +++ b/command/sentinel.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type SentinelCommand struct { diff --git a/command/sentinel_apply_test.go b/command/sentinel_apply_test.go index 32b53107d..3e37074fe 100644 --- a/command/sentinel_apply_test.go +++ b/command/sentinel_apply_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSentinelApplyCommand_Implements(t *testing.T) { diff --git a/command/sentinel_delete_test.go b/command/sentinel_delete_test.go index f8180108a..83285865f 100644 --- a/command/sentinel_delete_test.go +++ b/command/sentinel_delete_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSentinelDeleteCommand_Implements(t *testing.T) { diff --git a/command/sentinel_list_test.go b/command/sentinel_list_test.go index 07539f9d1..5d8e027d0 100644 --- a/command/sentinel_list_test.go +++ b/command/sentinel_list_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSentinelListCommand_Implements(t *testing.T) { diff --git a/command/sentinel_read_test.go b/command/sentinel_read_test.go index 22b7fbb05..8f20a84b8 100644 --- a/command/sentinel_read_test.go +++ b/command/sentinel_read_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSentinelReadCommand_Implements(t *testing.T) { diff --git a/command/server.go b/command/server.go index 96a1097d9..3171946cb 100644 --- a/command/server.go +++ b/command/server.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type ServerCommand struct { diff --git a/command/server_force_leave_test.go b/command/server_force_leave_test.go index 264b04f66..0755d561e 100644 --- a/command/server_force_leave_test.go +++ b/command/server_force_leave_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestServerForceLeaveCommand_Implements(t *testing.T) { diff --git a/command/server_join_test.go b/command/server_join_test.go index 586122b0a..9c1d13bed 100644 --- a/command/server_join_test.go +++ b/command/server_join_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestServerJoinCommand_Implements(t *testing.T) { diff --git a/command/server_members_test.go b/command/server_members_test.go index d5c03868b..9788a13dd 100644 --- a/command/server_members_test.go +++ b/command/server_members_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/service.go b/command/service.go index cef63d36a..8f27b9f00 100644 --- a/command/service.go +++ b/command/service.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type ServiceCommand struct { diff --git a/command/service_delete_test.go b/command/service_delete_test.go index 47d5d089e..9c535529c 100644 --- a/command/service_delete_test.go +++ b/command/service_delete_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/service_info.go b/command/service_info.go index a91126499..1519eeda6 100644 --- a/command/service_info.go +++ b/command/service_info.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/service_info_test.go b/command/service_info_test.go index edbc2eef8..82532d674 100644 --- a/command/service_info_test.go +++ b/command/service_info_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/service_list.go b/command/service_list.go index 9c3cb7ed5..fd375c22b 100644 --- a/command/service_list.go +++ b/command/service_list.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/service_list_test.go b/command/service_list_test.go index 9d8292d8d..7a9d6616f 100644 --- a/command/service_list_test.go +++ b/command/service_list_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/setup.go b/command/setup.go index e32c9b951..2bb8076d6 100644 --- a/command/setup.go +++ b/command/setup.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type SetupCommand struct { diff --git a/command/setup_consul.go b/command/setup_consul.go index 7b162e6b7..061b38574 100644 --- a/command/setup_consul.go +++ b/command/setup_consul.go @@ -11,8 +11,8 @@ import ( "slices" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/consul/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/setup_vault.go b/command/setup_vault.go index ffa5e21c3..2424f04b6 100644 --- a/command/setup_vault.go +++ b/command/setup_vault.go @@ -13,8 +13,8 @@ import ( "strings" "github.com/dustin/go-humanize/english" + "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/setup_vault_test.go b/command/setup_vault_test.go index 9f561ee6f..36adf8494 100644 --- a/command/setup_vault_test.go +++ b/command/setup_vault_test.go @@ -7,11 +7,11 @@ import ( "fmt" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/helper/pointer" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/status.go b/command/status.go index d91f75a2b..4c175d616 100644 --- a/command/status.go +++ b/command/status.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api/contexts" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/status_test.go b/command/status_test.go index cce94977b..31b91c8d7 100644 --- a/command/status_test.go +++ b/command/status_test.go @@ -8,12 +8,12 @@ import ( "regexp" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/system.go b/command/system.go index e403479b9..b02ea386d 100644 --- a/command/system.go +++ b/command/system.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type SystemCommand struct { diff --git a/command/system_gc_test.go b/command/system_gc_test.go index a7977046c..b0deadf7c 100644 --- a/command/system_gc_test.go +++ b/command/system_gc_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSystemGCCommand_Implements(t *testing.T) { diff --git a/command/system_reconcile.go b/command/system_reconcile.go index 11fde5cef..2b0801b20 100644 --- a/command/system_reconcile.go +++ b/command/system_reconcile.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type SystemReconcileCommand struct { diff --git a/command/system_reconcile_summaries_test.go b/command/system_reconcile_summaries_test.go index 9e6aef9fb..91a588f9c 100644 --- a/command/system_reconcile_summaries_test.go +++ b/command/system_reconcile_summaries_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSystemReconcileSummariesCommand_Implements(t *testing.T) { diff --git a/command/system_reconcile_test.go b/command/system_reconcile_test.go index e40d0bf2a..3dcd74058 100644 --- a/command/system_reconcile_test.go +++ b/command/system_reconcile_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSystemReconcileCommand_Implements(t *testing.T) { diff --git a/command/system_test.go b/command/system_test.go index b2120c83e..d9f6cbde6 100644 --- a/command/system_test.go +++ b/command/system_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestSystemCommand_Implements(t *testing.T) { diff --git a/command/tls.go b/command/tls.go index 2aef065a0..f7162fb07 100644 --- a/command/tls.go +++ b/command/tls.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type TLSCommand struct { diff --git a/command/tls_ca.go b/command/tls_ca.go index c46aecb47..d875bfda6 100644 --- a/command/tls_ca.go +++ b/command/tls_ca.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/tls_ca_create_test.go b/command/tls_ca_create_test.go index 30f70c0a9..2f352a243 100644 --- a/command/tls_ca_create_test.go +++ b/command/tls_ca_create_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/tls_cert.go b/command/tls_cert.go index e3dfe157e..f8d9ac397 100644 --- a/command/tls_cert.go +++ b/command/tls_cert.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/tls_cert_create_test.go b/command/tls_cert_create_test.go index b48c1fc00..75d6f659b 100644 --- a/command/tls_cert_create_test.go +++ b/command/tls_cert_create_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/testutil" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/ui/log_ui.go b/command/ui/log_ui.go index 031eebae4..eee5533a6 100644 --- a/command/ui/log_ui.go +++ b/command/ui/log_ui.go @@ -9,7 +9,7 @@ import ( "io" "github.com/fatih/color" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) // LogUI is an implementation of the cli.Ui interface which can be used for diff --git a/command/ui/log_ui_test.go b/command/ui/log_ui_test.go index 1918fe071..68a411cd2 100644 --- a/command/ui/log_ui_test.go +++ b/command/ui/log_ui_test.go @@ -8,7 +8,7 @@ import ( "io" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/shoenig/test/must" ) diff --git a/command/ui/writer_ui.go b/command/ui/writer_ui.go index ce2ed1f03..7a3e1655f 100644 --- a/command/ui/writer_ui.go +++ b/command/ui/writer_ui.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) // WriterUI is an implementation of the cli.Ui interface which can be used for diff --git a/command/ui/writer_ui_test.go b/command/ui/writer_ui_test.go index 341649a37..676e5abd0 100644 --- a/command/ui/writer_ui_test.go +++ b/command/ui/writer_ui_test.go @@ -9,8 +9,8 @@ import ( "io" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/ui_test.go b/command/ui_test.go index 144342fcc..4bcc411ce 100644 --- a/command/ui_test.go +++ b/command/ui_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/shoenig/test/must" ) diff --git a/command/var.go b/command/var.go index 4c7c3b43c..714741a55 100644 --- a/command/var.go +++ b/command/var.go @@ -15,9 +15,9 @@ import ( "text/template" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - "github.com/mitchellh/cli" "github.com/mitchellh/colorstring" "github.com/mitchellh/mapstructure" "github.com/posener/complete" diff --git a/command/var_get.go b/command/var_get.go index d5a223d42..c101cf48f 100644 --- a/command/var_get.go +++ b/command/var_get.go @@ -9,8 +9,8 @@ import ( "os" "strings" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/var_get_test.go b/command/var_get_test.go index 16d33de02..ffc201d42 100644 --- a/command/var_get_test.go +++ b/command/var_get_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/var_init_test.go b/command/var_init_test.go index 7d835ab62..6a16cccfe 100644 --- a/command/var_init_test.go +++ b/command/var_init_test.go @@ -8,8 +8,8 @@ import ( "path" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/var_list_test.go b/command/var_list_test.go index 3194cea46..ae7032914 100644 --- a/command/var_list_test.go +++ b/command/var_list_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/var_lock_test.go b/command/var_lock_test.go index 87e1ea060..db51ce7de 100644 --- a/command/var_lock_test.go +++ b/command/var_lock_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/var_purge.go b/command/var_purge.go index 609b3c355..5b0539f2b 100644 --- a/command/var_purge.go +++ b/command/var_purge.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" "github.com/posener/complete" ) diff --git a/command/var_purge_test.go b/command/var_purge_test.go index 94727c51d..0308bb7a9 100644 --- a/command/var_purge_test.go +++ b/command/var_purge_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/var_put.go b/command/var_put.go index e98604c78..c54a89344 100644 --- a/command/var_put.go +++ b/command/var_put.go @@ -14,13 +14,13 @@ import ( "slices" "strings" + "github.com/hashicorp/cli" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/helper" - "github.com/mitchellh/cli" "github.com/mitchellh/mapstructure" "github.com/posener/complete" ) diff --git a/command/var_put_test.go b/command/var_put_test.go index a6fd6cd3b..bf2c54ecf 100644 --- a/command/var_put_test.go +++ b/command/var_put_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/version.go b/command/version.go index 595fd9fde..e06c73660 100644 --- a/command/version.go +++ b/command/version.go @@ -4,8 +4,8 @@ package command import ( + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/version" - "github.com/mitchellh/cli" ) // VersionCommand is a Command implementation prints the version. diff --git a/command/version_test.go b/command/version_test.go index 723a8375a..deae9b076 100644 --- a/command/version_test.go +++ b/command/version_test.go @@ -6,8 +6,8 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" ) func TestVersionCommand_implements(t *testing.T) { diff --git a/command/volume.go b/command/volume.go index da8f1fcf0..7d5896df9 100644 --- a/command/volume.go +++ b/command/volume.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type VolumeCommand struct { diff --git a/command/volume_create_host_test.go b/command/volume_create_host_test.go index 4ef92dc02..00e795483 100644 --- a/command/volume_create_host_test.go +++ b/command/volume_create_host_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/hcl" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/command/agent" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/volume_delete_host_test.go b/command/volume_delete_host_test.go index 353063c34..5edd72bb7 100644 --- a/command/volume_delete_host_test.go +++ b/command/volume_delete_host_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/volume_register_host_test.go b/command/volume_register_host_test.go index 0ce337701..9ed9d5c96 100644 --- a/command/volume_register_host_test.go +++ b/command/volume_register_host_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/shoenig/test/must" ) diff --git a/command/volume_snapshot.go b/command/volume_snapshot.go index 6b46176d9..a89049eea 100644 --- a/command/volume_snapshot.go +++ b/command/volume_snapshot.go @@ -6,7 +6,7 @@ package command import ( "strings" - "github.com/mitchellh/cli" + "github.com/hashicorp/cli" ) type VolumeSnapshotCommand struct { diff --git a/command/volume_status_csi_test.go b/command/volume_status_csi_test.go index 0fde4610f..c5ba2d335 100644 --- a/command/volume_status_csi_test.go +++ b/command/volume_status_csi_test.go @@ -6,10 +6,10 @@ package command import ( "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/volume_status_host_test.go b/command/volume_status_host_test.go index c51e93109..2da56e903 100644 --- a/command/volume_status_host_test.go +++ b/command/volume_status_host_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/ci" - "github.com/mitchellh/cli" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/go.mod b/go.mod index 2a7bcb132..39dbd6b7d 100644 --- a/go.mod +++ b/go.mod @@ -43,6 +43,7 @@ require ( github.com/gosuri/uilive v0.0.4 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/hashicorp/cap v0.6.0 + github.com/hashicorp/cli v1.1.6 github.com/hashicorp/consul-template v0.39.0 github.com/hashicorp/consul/api v1.30.0 github.com/hashicorp/consul/sdk v0.16.1 @@ -94,7 +95,6 @@ require ( github.com/kr/text v0.2.0 github.com/mattn/go-colorable v0.1.13 github.com/miekg/dns v1.1.62 - github.com/mitchellh/cli v1.1.5 github.com/mitchellh/colorstring v0.0.0-20150917214807-8631ce90f286 github.com/mitchellh/copystructure v1.2.0 github.com/mitchellh/go-glint v0.0.0-20210722152315-6515ceb4a127 @@ -248,6 +248,7 @@ require ( github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.12 // indirect + github.com/mitchellh/cli v1.1.5 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect diff --git a/go.sum b/go.sum index 952484c39..e4925ea94 100644 --- a/go.sum +++ b/go.sum @@ -620,6 +620,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/cap v0.6.0 h1:uOSdbtXu8zsbRyjwpiTy6QiuX3+5paAbNkYlop7QexM= github.com/hashicorp/cap v0.6.0/go.mod h1:DwzHkoG6pxSARiqwvAgxmCPUpTTCCw2wVuPrIFOzpe0= +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.39.0 h1:Yp2iqdVw3pYW4RbNKPNF/dNpJWEasnAhUTC+wDPtDYM= github.com/hashicorp/consul-template v0.39.0/go.mod h1:eZmtllcY+RK0y/DPXdCuiMWr3m9OPlzBwsmBv1jbCxI= github.com/hashicorp/consul/api v1.30.0 h1:ArHVMMILb1nQv8vZSGIwwQd2gtc+oSQZ6CalyiyH2XQ= diff --git a/main.go b/main.go index 075dc977d..01aa38418 100644 --- a/main.go +++ b/main.go @@ -23,9 +23,9 @@ import ( _ "github.com/hashicorp/nomad/drivers/shared/executor" // Don't move any other code imports above the import block above! + "github.com/hashicorp/cli" "github.com/hashicorp/nomad/command" "github.com/hashicorp/nomad/version" - "github.com/mitchellh/cli" ) var ( diff --git a/plugins/shared/cmd/launcher/command/device.go b/plugins/shared/cmd/launcher/command/device.go index 1d204158a..7458ec32e 100644 --- a/plugins/shared/cmd/launcher/command/device.go +++ b/plugins/shared/cmd/launcher/command/device.go @@ -12,6 +12,7 @@ import ( "strings" "time" + "github.com/hashicorp/cli" hclog "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" plugin "github.com/hashicorp/go-plugin" @@ -23,7 +24,6 @@ import ( "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device" "github.com/kr/pretty" - "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty/msgpack" ) diff --git a/plugins/shared/cmd/launcher/command/meta.go b/plugins/shared/cmd/launcher/command/meta.go index 2ac1b4266..c0a374151 100644 --- a/plugins/shared/cmd/launcher/command/meta.go +++ b/plugins/shared/cmd/launcher/command/meta.go @@ -7,8 +7,8 @@ import ( "flag" "strings" + "github.com/hashicorp/cli" hclog "github.com/hashicorp/go-hclog" - "github.com/mitchellh/cli" ) type Meta struct { diff --git a/plugins/shared/cmd/launcher/main.go b/plugins/shared/cmd/launcher/main.go index f6ed65f11..4361ef359 100644 --- a/plugins/shared/cmd/launcher/main.go +++ b/plugins/shared/cmd/launcher/main.go @@ -6,9 +6,9 @@ package main import ( "os" + "github.com/hashicorp/cli" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/plugins/shared/cmd/launcher/command" - "github.com/mitchellh/cli" ) const (