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

chore: replace github.com/mitchellh/cli with github.com/hashicorp/cli #770

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore: replace github.com/mitchellh/cli with github.com/hashicorp/cli #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9caff5a
chore: replace github.com/mitchellh/cli with github.com/hashicorp/cli
hazzik Mar 10, 2025
c1d8906
fix: run go mod tidy
hazzik Mar 10, 2025
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
2 changes: 1 addition & 1 deletion cmd/serf/command/agent/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
"syscall"
"time"

"github.com/hashicorp/cli"
"github.com/hashicorp/go-metrics/compat"
gsyslog "github.com/hashicorp/go-syslog"
"github.com/hashicorp/logutils"
"github.com/hashicorp/memberlist"
"github.com/hashicorp/serf/serf"
"github.com/mitchellh/cli"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/agent/command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"testing"
"time"

"github.com/hashicorp/cli"
"github.com/hashicorp/serf/client"
"github.com/hashicorp/serf/testutil"
"github.com/mitchellh/cli"
)

func TestCommandRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

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

// EventCommand is a Command implementation that queries a running
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

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

func TestEventCommandRun_noEvent(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/force_leave.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

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

// ForceLeaveCommand is a Command implementation that tells a running Serf
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/force_leave_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

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

func TestForceLeaveCommandRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sort"
"strings"

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

// InfoCommand is a Command implementation that queries a running
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"testing"

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

func TestInfoCommandRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

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

// JoinCommand is a Command implementation that tells a running Serf
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/join_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"testing"

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

func TestJoinCommandRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/keygen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"strings"

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

// KeygenCommand is a Command implementation that generates an encryption
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/keygen_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"encoding/base64"
"testing"

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

func TestKeygenCommand(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

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

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

"github.com/hashicorp/cli"
"github.com/hashicorp/memberlist"
"github.com/hashicorp/serf/client"
"github.com/hashicorp/serf/cmd/serf/command/agent"
"github.com/hashicorp/serf/serf"
"github.com/hashicorp/serf/testutil"
"github.com/mitchellh/cli"
)

func testKeysCommandAgent(t *testing.T, ip net.IP) *agent.Agent {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/leave.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

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

// LeaveCommand is a Command implementation that instructs
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/leave_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"testing"

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

func TestLeaveCommandRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/members.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net"
"strings"

"github.com/hashicorp/cli"
"github.com/hashicorp/serf/cmd/serf/command/agent"
"github.com/mitchellh/cli"
"github.com/ryanuber/columnize"
)

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

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

func TestMembersCommandRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"
"sync"

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

// MonitorCommand is a Command implementation that queries a running
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"strings"
"time"

"github.com/hashicorp/cli"
"github.com/hashicorp/serf/client"
"github.com/hashicorp/serf/cmd/serf/command/agent"
"github.com/mitchellh/cli"
)

// QueryCommand is a Command implementation that is used to trigger a new
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"testing"

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

func TestQueryCommandRun_noName(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/reachability.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"strings"
"time"

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

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

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

func TestReachabilityCommand_Run(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/rtt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

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

// RTTCommand is a Command implementation that allows users to query the
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/rtt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"testing"

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

func TestRTTCommand_Implements(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/cli"
"github.com/hashicorp/serf/cmd/serf/command/agent"
"github.com/mitchellh/cli"
)

// TagsCommand is an interface to dynamically add or otherwise modify a
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/tags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"testing"

"github.com/hashicorp/cli"
"github.com/hashicorp/serf/client"
"github.com/hashicorp/serf/testutil"
"github.com/mitchellh/cli"
)

func TestTagsCommandRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/command/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package command
import (
"fmt"

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

// VersionCommand is a Command implementation prints the version.
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"os"
"os/signal"

"github.com/hashicorp/cli"
"github.com/hashicorp/serf/cmd/serf/command"
"github.com/hashicorp/serf/cmd/serf/command/agent"
"github.com/hashicorp/serf/version"
"github.com/mitchellh/cli"
)

// Commands is the mapping of all the available Serf commands.
Expand Down
2 changes: 1 addition & 1 deletion cmd/serf/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"log"
"os"

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

func main() {
Expand Down
15 changes: 8 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ go 1.19

require (
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
github.com/hashicorp/cli v1.1.7
github.com/hashicorp/go-metrics v0.5.4
github.com/hashicorp/go-msgpack/v2 v2.1.2
github.com/hashicorp/go-syslog v1.0.0
github.com/hashicorp/logutils v1.0.0
github.com/hashicorp/mdns v1.0.5
github.com/hashicorp/memberlist v0.5.2
github.com/mitchellh/cli v1.1.5
github.com/mitchellh/mapstructure v1.5.0
github.com/ryanuber/columnize v2.1.2+incompatible
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -31,10 +31,10 @@ require (
github.com/hashicorp/go-sockaddr v1.0.5 // indirect
github.com/hashicorp/go-uuid v1.0.1 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/miekg/dns v1.1.56 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
Expand All @@ -47,4 +47,5 @@ require (
golang.org/x/net v0.35.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/tools v0.14.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading