Skip to content

Commit

Permalink
clientv3: update Go import paths to "go.etcd.io"
Browse files Browse the repository at this point in the history
Signed-off-by: Gyuho Lee <[email protected]>
  • Loading branch information
gyuho committed Aug 29, 2018
1 parent fced933 commit 2ac0438
Show file tree
Hide file tree
Showing 84 changed files with 212 additions and 212 deletions.
4 changes: 2 additions & 2 deletions clientv3/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"strings"

"github.com/coreos/etcd/auth/authpb"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/auth/authpb"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion clientv3/balancer/balancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"sync"
"time"

"github.com/coreos/etcd/clientv3/balancer/picker"
"go.etcd.io/etcd/clientv3/balancer/picker"

"go.uber.org/zap"
"google.golang.org/grpc/balancer"
Expand Down
8 changes: 4 additions & 4 deletions clientv3/balancer/balancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"testing"
"time"

"github.com/coreos/etcd/clientv3/balancer/picker"
"github.com/coreos/etcd/clientv3/balancer/resolver/endpoint"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/mock/mockserver"
"go.etcd.io/etcd/clientv3/balancer/picker"
"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/mock/mockserver"

"go.uber.org/zap"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion clientv3/balancer/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package balancer

import (
"github.com/coreos/etcd/clientv3/balancer/picker"
"go.etcd.io/etcd/clientv3/balancer/picker"

"go.uber.org/zap"
)
Expand Down
6 changes: 3 additions & 3 deletions clientv3/balancer/grpc1.7-health_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"
"time"

pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/testutil"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/testutil"

"google.golang.org/grpc"
)
Expand Down Expand Up @@ -191,7 +191,7 @@ func TestOldHealthBalancerGraylist(t *testing.T) {

// TestBalancerDoNotBlockOnClose ensures that balancer and grpc don't deadlock each other
// due to rapid open/close conn. The deadlock causes balancer.Close() to block forever.
// See issue: https://github.com/coreos/etcd/issues/7283 for more detail.
// See issue: https://go.etcd.io/etcd/issues/7283 for more detail.
func TestOldHealthBalancerDoNotBlockOnClose(t *testing.T) {
defer testutil.AfterTest(t)

Expand Down
8 changes: 4 additions & 4 deletions clientv3/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"sync"
"time"

"github.com/coreos/etcd/clientv3/balancer"
"github.com/coreos/etcd/clientv3/balancer/picker"
"github.com/coreos/etcd/clientv3/balancer/resolver/endpoint"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/clientv3/balancer"
"go.etcd.io/etcd/clientv3/balancer/picker"
"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils"
"go.uber.org/zap"

Expand Down
4 changes: 2 additions & 2 deletions clientv3/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"testing"
"time"

"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/coreos/etcd/pkg/testutil"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/pkg/testutil"

"google.golang.org/grpc"
)
Expand Down
4 changes: 2 additions & 2 deletions clientv3/clientv3util/example_key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"log"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/clientv3util"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/clientv3util"
)

func ExampleKeyMissing() {
Expand Down
2 changes: 1 addition & 1 deletion clientv3/clientv3util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package clientv3util

import (
"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"
)

// KeyExists returns a comparison operation that evaluates to true iff the given
Expand Down
4 changes: 2 additions & 2 deletions clientv3/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package clientv3
import (
"context"

pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/types"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/types"

"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion clientv3/compact_op.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package clientv3

import (
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
)

// CompactOp represents a compact operation.
Expand Down
2 changes: 1 addition & 1 deletion clientv3/compact_op_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/coreos/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/etcdserver/etcdserverpb"
)

func TestCompactOp(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion clientv3/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package clientv3

import (
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
)

type CompareTarget int
Expand Down
6 changes: 3 additions & 3 deletions clientv3/concurrency/election.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"errors"
"fmt"

v3 "github.com/coreos/etcd/clientv3"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/mvcc/mvccpb"
v3 "go.etcd.io/etcd/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/mvccpb"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions clientv3/concurrency/example_election_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"sync"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/concurrency"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
)

func ExampleElection_Campaign() {
Expand Down
4 changes: 2 additions & 2 deletions clientv3/concurrency/example_mutex_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"log"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/concurrency"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
)

func ExampleMutex_Lock() {
Expand Down
4 changes: 2 additions & 2 deletions clientv3/concurrency/example_stm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"math/rand"
"sync"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/concurrency"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
)

// ExampleSTM_apply shows how to use STM with a transactional
Expand Down
6 changes: 3 additions & 3 deletions clientv3/concurrency/key.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"context"
"fmt"

v3 "github.com/coreos/etcd/clientv3"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/mvcc/mvccpb"
v3 "go.etcd.io/etcd/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/mvccpb"
)

func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error {
Expand Down
4 changes: 2 additions & 2 deletions clientv3/concurrency/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"
"time"

"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/testutil"
"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/pkg/testutil"
)

var endpoints []string
Expand Down
4 changes: 2 additions & 2 deletions clientv3/concurrency/mutex.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"sync"

v3 "github.com/coreos/etcd/clientv3"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
v3 "go.etcd.io/etcd/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
)

// Mutex implements the sync Locker interface with etcd
Expand Down
2 changes: 1 addition & 1 deletion clientv3/concurrency/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"time"

v3 "github.com/coreos/etcd/clientv3"
v3 "go.etcd.io/etcd/clientv3"
)

const defaultSessionTTL = 60
Expand Down
2 changes: 1 addition & 1 deletion clientv3/concurrency/stm.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"math"

v3 "github.com/coreos/etcd/clientv3"
v3 "go.etcd.io/etcd/clientv3"
)

// STM is an interface for software transactional memory.
Expand Down
2 changes: 1 addition & 1 deletion clientv3/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
//
// 1. context error: canceled or deadline exceeded.
// 2. gRPC status error: e.g. when clock drifts in server-side before client's context deadline exceeded.
// 3. gRPC error: see https://github.com/coreos/etcd/blob/master/etcdserver/api/v3rpc/rpctypes/error.go
// 3. gRPC error: see https://go.etcd.io/etcd/blob/master/etcdserver/api/v3rpc/rpctypes/error.go
//
// Here is the example code to handle client errors:
//
Expand Down
2 changes: 1 addition & 1 deletion clientv3/example_auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"log"

"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"
)

func ExampleAuth() {
Expand Down
2 changes: 1 addition & 1 deletion clientv3/example_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"log"

"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"
)

func ExampleCluster_memberList() {
Expand Down
4 changes: 2 additions & 2 deletions clientv3/example_kv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"log"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
)

func ExampleKV_put() {
Expand Down
2 changes: 1 addition & 1 deletion clientv3/example_lease_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"log"

"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"
)

func ExampleLease_grant() {
Expand Down
2 changes: 1 addition & 1 deletion clientv3/example_maintenence_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"log"

"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"
)

func ExampleMaintenance_status() {
Expand Down
2 changes: 1 addition & 1 deletion clientv3/example_metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/http"
"strings"

"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"

grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down
4 changes: 2 additions & 2 deletions clientv3/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"os"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/pkg/transport"

"google.golang.org/grpc/grpclog"
)
Expand Down
2 changes: 1 addition & 1 deletion clientv3/example_watch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"log"

"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"
)

func ExampleWatcher_watch() {
Expand Down
8 changes: 4 additions & 4 deletions clientv3/integration/black_hole_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"testing"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/testutil"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/pkg/testutil"
"google.golang.org/grpc"
)

Expand Down
6 changes: 3 additions & 3 deletions clientv3/integration/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"reflect"
"testing"

"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types"
"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/pkg/types"
)

func TestMemberList(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions clientv3/integration/dial_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"testing"
"time"

"github.com/coreos/etcd/clientv3"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/transport"
"go.etcd.io/etcd/clientv3"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/pkg/transport"
"google.golang.org/grpc"
)

Expand Down
10 changes: 5 additions & 5 deletions clientv3/integration/kv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"testing"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/coreos/etcd/integration"
"github.com/coreos/etcd/mvcc/mvccpb"
"github.com/coreos/etcd/pkg/testutil"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/pkg/testutil"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
Loading

1 comment on commit 2ac0438

@khenaidoo
Copy link

@khenaidoo khenaidoo commented on 2ac0438 Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change may be creating the following an error:

image

Please sign in to comment.