Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: Switch from mitchellh/cli to hashicorp/cli #19321

Merged
merged 8 commits into from
Dec 19, 2024
Merged

deps: Switch from mitchellh/cli to hashicorp/cli #19321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef2e993
Add rule to semgrep
angrycub Dec 6, 2023
15e1b5d
Update go.mod
angrycub Jan 3, 2024
013a390
github.com/mitchellh/cli -> github.com/hashicorp/cli
angrycub Jan 3, 2024
cc29d36
Merge branch 'main' into deps/switch_to_hashicorp_cli
angrycub Jan 4, 2024
dfa4082
Merge branch 'main' into deps/switch_to_hashicorp_cli
jrasell Dec 19, 2024
e4ab038
cli: remove final traces of mitchel/cli
jrasell Dec 19, 2024
2cf2085
Merge branch 'main' into deps/switch_to_hashicorp_cli
jrasell Dec 19, 2024
a3baa0c
Remove lib from newly added commands in main
jrasell Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .semgrep/imports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
Expand Down
2 changes: 1 addition & 1 deletion command/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package command
import (
"strings"

"github.com/mitchellh/cli"
"github.com/hashicorp/cli"
)

type ACLCommand struct {
Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"time"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/mitchellh/cli"
"github.com/hashicorp/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/mitchellh/cli"
"github.com/hashicorp/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"
"time"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_auth_method_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/mitchellh/cli"
"github.com/hashicorp/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/mitchellh/cli"
"github.com/hashicorp/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_binding_rule_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"time"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package command
import (
"strings"

"github.com/mitchellh/cli"
"github.com/hashicorp/cli"
)

type ACLPolicyCommand struct {
Expand Down
2 changes: 1 addition & 1 deletion command/acl_policy_apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_policy_delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_policy_info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_policy_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion command/acl_role_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/cli"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/posener/complete"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_role_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion command/acl_role_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/mitchellh/cli"
"github.com/hashicorp/cli"
"github.com/posener/complete"
)

Expand Down
Loading
Loading