mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
etcdctl: Rename of imports after making etcdctl a module.
``` find -name '*.go' | xargs sed -i --follow-symlinks 's|etcd/v3/etcdctl|etcd/etcdctl/v3|g' ```
This commit is contained in:
parent
df48e499ea
commit
09679d29ad
@ -21,7 +21,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/api/v3/version"
|
"go.etcd.io/etcd/api/v3/version"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/ctlv2/command"
|
"go.etcd.io/etcd/etcdctl/v3/ctlv2/command"
|
||||||
|
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
||||||
v3 "go.etcd.io/etcd/client/v3"
|
v3 "go.etcd.io/etcd/client/v3"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
|
|
||||||
"github.com/dustin/go-humanize"
|
"github.com/dustin/go-humanize"
|
||||||
)
|
)
|
||||||
|
@ -20,7 +20,7 @@ import (
|
|||||||
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
||||||
spb "go.etcd.io/etcd/api/v3/mvccpb"
|
spb "go.etcd.io/etcd/api/v3/mvccpb"
|
||||||
v3 "go.etcd.io/etcd/client/v3"
|
v3 "go.etcd.io/etcd/client/v3"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
)
|
)
|
||||||
|
|
||||||
type fieldsPrinter struct{ printer }
|
type fieldsPrinter struct{ printer }
|
||||||
|
@ -22,7 +22,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"go.etcd.io/etcd/client/v3"
|
"go.etcd.io/etcd/client/v3"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
)
|
)
|
||||||
|
|
||||||
type jsonPrinter struct {
|
type jsonPrinter struct {
|
||||||
|
@ -21,8 +21,8 @@ import (
|
|||||||
|
|
||||||
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
||||||
v3 "go.etcd.io/etcd/client/v3"
|
v3 "go.etcd.io/etcd/client/v3"
|
||||||
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
"go.etcd.io/etcd/pkg/v3/types"
|
"go.etcd.io/etcd/pkg/v3/types"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type simplePrinter struct {
|
type simplePrinter struct {
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
v3 "go.etcd.io/etcd/client/v3"
|
v3 "go.etcd.io/etcd/client/v3"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
|
|
||||||
"github.com/olekukonko/tablewriter"
|
"github.com/olekukonko/tablewriter"
|
||||||
)
|
)
|
||||||
|
@ -20,7 +20,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
@ -18,7 +18,7 @@ package ctlv3
|
|||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/etcdctl/ctlv3/command"
|
"go.etcd.io/etcd/etcdctl/v3/ctlv3/command"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
@ -19,8 +19,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/etcdctl/ctlv2"
|
"go.etcd.io/etcd/etcdctl/v3/ctlv2"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/ctlv3"
|
"go.etcd.io/etcd/etcdctl/v3/ctlv3"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -110,8 +110,8 @@ function modules() {
|
|||||||
go.etcd.io/etcd/raft/v3
|
go.etcd.io/etcd/raft/v3
|
||||||
go.etcd.io/etcd/client/v2
|
go.etcd.io/etcd/client/v2
|
||||||
go.etcd.io/etcd/client/v3
|
go.etcd.io/etcd/client/v3
|
||||||
go.etcd.io/etcd/etcdctl/v3
|
|
||||||
go.etcd.io/etcd/v3
|
go.etcd.io/etcd/v3
|
||||||
|
go.etcd.io/etcd/etcdctl/v3
|
||||||
go.etcd.io/etcd/tests/v3"
|
go.etcd.io/etcd/tests/v3"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -132,8 +132,8 @@ function run_for_modules {
|
|||||||
run_for_module "raft" "$@" "${pkg}" || return "$?"
|
run_for_module "raft" "$@" "${pkg}" || return "$?"
|
||||||
run_for_module "client/v2" "$@" "${pkg}" || return "$?"
|
run_for_module "client/v2" "$@" "${pkg}" || return "$?"
|
||||||
run_for_module "client/v3" "$@" "${pkg}" || return "$?"
|
run_for_module "client/v3" "$@" "${pkg}" || return "$?"
|
||||||
run_for_module "etcdctl" "$@" "${pkg}" || return "$?"
|
|
||||||
run_for_module "." "$@" "${pkg}" || return "$?"
|
run_for_module "." "$@" "${pkg}" || return "$?"
|
||||||
|
run_for_module "etcdctl" "$@" "${pkg}" || return "$?"
|
||||||
run_for_module "tests" "$@" "${pkg}" || return "$?"
|
run_for_module "tests" "$@" "${pkg}" || return "$?"
|
||||||
else
|
else
|
||||||
run_for_module "${USERMOD}" "$@" "${pkg}" || return "$?"
|
run_for_module "${USERMOD}" "$@" "${pkg}" || return "$?"
|
||||||
|
@ -25,9 +25,9 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
"go.etcd.io/etcd/pkg/v3/expect"
|
"go.etcd.io/etcd/pkg/v3/expect"
|
||||||
"go.etcd.io/etcd/pkg/v3/testutil"
|
"go.etcd.io/etcd/pkg/v3/testutil"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) }
|
func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) }
|
||||||
|
@ -24,9 +24,9 @@ import (
|
|||||||
|
|
||||||
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
||||||
"go.etcd.io/etcd/client/v3"
|
"go.etcd.io/etcd/client/v3"
|
||||||
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
"go.etcd.io/etcd/pkg/v3/logutil"
|
"go.etcd.io/etcd/pkg/v3/logutil"
|
||||||
"go.etcd.io/etcd/pkg/v3/transport"
|
"go.etcd.io/etcd/pkg/v3/transport"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
|
||||||
|
|
||||||
"github.com/dustin/go-humanize"
|
"github.com/dustin/go-humanize"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
@ -26,9 +26,9 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/client/v3"
|
"go.etcd.io/etcd/client/v3"
|
||||||
|
"go.etcd.io/etcd/etcdctl/v3/snapshot"
|
||||||
"go.etcd.io/etcd/pkg/v3/testutil"
|
"go.etcd.io/etcd/pkg/v3/testutil"
|
||||||
"go.etcd.io/etcd/v3/embed"
|
"go.etcd.io/etcd/v3/embed"
|
||||||
"go.etcd.io/etcd/v3/etcdctl/snapshot"
|
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user