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'
```
release-3.5
Piotr Tabor 2020-10-20 11:04:59 +02:00
parent df48e499ea
commit 09679d29ad
13 changed files with 15 additions and 15 deletions

View File

@ -21,7 +21,7 @@ import (
"time"
"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"
)

View File

@ -21,7 +21,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
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"
)

View File

@ -20,7 +20,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
spb "go.etcd.io/etcd/api/v3/mvccpb"
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 }

View File

@ -22,7 +22,7 @@ import (
"strconv"
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/v3/etcdctl/snapshot"
"go.etcd.io/etcd/etcdctl/v3/snapshot"
)
type jsonPrinter struct {

View File

@ -21,8 +21,8 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
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/v3/etcdctl/snapshot"
)
type simplePrinter struct {

View File

@ -18,7 +18,7 @@ import (
"os"
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"
)

View File

@ -20,7 +20,7 @@ import (
"path/filepath"
"strings"
"go.etcd.io/etcd/v3/etcdctl/snapshot"
"go.etcd.io/etcd/etcdctl/v3/snapshot"
"github.com/spf13/cobra"
"go.uber.org/zap"

View File

@ -18,7 +18,7 @@ package ctlv3
import (
"time"
"go.etcd.io/etcd/v3/etcdctl/ctlv3/command"
"go.etcd.io/etcd/etcdctl/v3/ctlv3/command"
"github.com/spf13/cobra"
)

View File

@ -19,8 +19,8 @@ import (
"fmt"
"os"
"go.etcd.io/etcd/v3/etcdctl/ctlv2"
"go.etcd.io/etcd/v3/etcdctl/ctlv3"
"go.etcd.io/etcd/etcdctl/v3/ctlv2"
"go.etcd.io/etcd/etcdctl/v3/ctlv3"
)
const (

View File

@ -110,8 +110,8 @@ function modules() {
go.etcd.io/etcd/raft/v3
go.etcd.io/etcd/client/v2
go.etcd.io/etcd/client/v3
go.etcd.io/etcd/etcdctl/v3
go.etcd.io/etcd/v3
go.etcd.io/etcd/etcdctl/v3
go.etcd.io/etcd/tests/v3"
}
@ -132,8 +132,8 @@ function run_for_modules {
run_for_module "raft" "$@" "${pkg}" || return "$?"
run_for_module "client/v2" "$@" "${pkg}" || return "$?"
run_for_module "client/v3" "$@" "${pkg}" || return "$?"
run_for_module "etcdctl" "$@" "${pkg}" || return "$?"
run_for_module "." "$@" "${pkg}" || return "$?"
run_for_module "etcdctl" "$@" "${pkg}" || return "$?"
run_for_module "tests" "$@" "${pkg}" || return "$?"
else
run_for_module "${USERMOD}" "$@" "${pkg}" || return "$?"

View File

@ -25,9 +25,9 @@ import (
"testing"
"time"
"go.etcd.io/etcd/etcdctl/v3/snapshot"
"go.etcd.io/etcd/pkg/v3/expect"
"go.etcd.io/etcd/pkg/v3/testutil"
"go.etcd.io/etcd/v3/etcdctl/snapshot"
)
func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) }

View File

@ -24,9 +24,9 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"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/transport"
"go.etcd.io/etcd/v3/etcdctl/snapshot"
"github.com/dustin/go-humanize"
"go.uber.org/zap"

View File

@ -26,9 +26,9 @@ import (
"time"
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/etcdctl/v3/snapshot"
"go.etcd.io/etcd/pkg/v3/testutil"
"go.etcd.io/etcd/v3/embed"
"go.etcd.io/etcd/v3/etcdctl/snapshot"
"go.uber.org/zap"
)