Skip to content

Commit 96cce20

Browse files
philipsphilips
committed
go.mod: use go.etcd.io/etcd/v3 versioning
This change makes the etcd package compatible with the existing Go ecosystem for module versioning. Used this tool to update package imports: https://github.com/KSubedi/gomove
1 parent 262c939 commit 96cce20

File tree

558 files changed

+1475
-1434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

558 files changed

+1475
-1434
lines changed

‎Documentation/learning/lock/client/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"bytes"
2727
"encoding/json"
2828
"fmt"
29-
"go.etcd.io/etcd/clientv3"
30-
"go.etcd.io/etcd/clientv3/concurrency"
29+
"go.etcd.io/etcd/v3/clientv3"
30+
"go.etcd.io/etcd/v3/clientv3/concurrency"
3131
"io/ioutil"
3232
"net/http"
3333
"os"

‎auth/range_perm_cache.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package auth
1616

1717
import (
18-
"go.etcd.io/etcd/auth/authpb"
19-
"go.etcd.io/etcd/mvcc/backend"
20-
"go.etcd.io/etcd/pkg/adt"
18+
"go.etcd.io/etcd/v3/auth/authpb"
19+
"go.etcd.io/etcd/v3/mvcc/backend"
20+
"go.etcd.io/etcd/v3/pkg/adt"
2121

2222
"go.uber.org/zap"
2323
)

‎auth/range_perm_cache_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package auth
1717
import (
1818
"testing"
1919

20-
"go.etcd.io/etcd/auth/authpb"
21-
"go.etcd.io/etcd/pkg/adt"
20+
"go.etcd.io/etcd/v3/auth/authpb"
21+
"go.etcd.io/etcd/v3/pkg/adt"
2222

2323
"go.uber.org/zap"
2424
)

‎auth/store.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
"sync"
2525
"sync/atomic"
2626

27-
"go.etcd.io/etcd/auth/authpb"
28-
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
29-
"go.etcd.io/etcd/etcdserver/cindex"
30-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
31-
"go.etcd.io/etcd/mvcc/backend"
27+
"go.etcd.io/etcd/v3/auth/authpb"
28+
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
29+
"go.etcd.io/etcd/v3/etcdserver/cindex"
30+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
31+
"go.etcd.io/etcd/v3/mvcc/backend"
3232

3333
"go.uber.org/zap"
3434
"golang.org/x/crypto/bcrypt"

‎auth/store_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"testing"
2525
"time"
2626

27-
"go.etcd.io/etcd/auth/authpb"
28-
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
29-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
30-
"go.etcd.io/etcd/mvcc/backend"
27+
"go.etcd.io/etcd/v3/auth/authpb"
28+
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
29+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
30+
"go.etcd.io/etcd/v3/mvcc/backend"
3131

3232
"go.uber.org/zap"
3333
"golang.org/x/crypto/bcrypt"

‎client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sync"
3030
"time"
3131

32-
"go.etcd.io/etcd/version"
32+
"go.etcd.io/etcd/v3/version"
3333
)
3434

3535
var (

‎client/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"testing"
3030
"time"
3131

32-
"go.etcd.io/etcd/pkg/testutil"
33-
"go.etcd.io/etcd/version"
32+
"go.etcd.io/etcd/v3/pkg/testutil"
33+
"go.etcd.io/etcd/v3/version"
3434
)
3535

3636
type actionAssertingHTTPClient struct {

‎client/discover.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package client
1616

1717
import (
18-
"go.etcd.io/etcd/pkg/srv"
18+
"go.etcd.io/etcd/v3/pkg/srv"
1919
)
2020

2121
// Discoverer is an interface that wraps the Discover method.

‎client/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Create a Config and exchange it for a Client:
2121
"net/http"
2222
"context"
2323
24-
"go.etcd.io/etcd/client"
24+
"go.etcd.io/etcd/v3/client"
2525
)
2626
2727
cfg := client.Config{

‎client/example_keys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"log"
2121
"sort"
2222

23-
"go.etcd.io/etcd/client"
23+
"go.etcd.io/etcd/v3/client"
2424
)
2525

2626
func ExampleKeysAPI_directory() {

‎client/integration/client_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"sync/atomic"
2525
"testing"
2626

27-
"go.etcd.io/etcd/client"
28-
"go.etcd.io/etcd/integration"
29-
"go.etcd.io/etcd/pkg/testutil"
27+
"go.etcd.io/etcd/v3/client"
28+
"go.etcd.io/etcd/v3/integration"
29+
"go.etcd.io/etcd/v3/pkg/testutil"
3030
)
3131

3232
// TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection.

‎client/integration/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"testing"
1010

11-
"go.etcd.io/etcd/pkg/testutil"
11+
"go.etcd.io/etcd/v3/pkg/testutil"
1212
)
1313

1414
func TestMain(m *testing.M) {

‎client/keys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"encoding/json"
2020
"errors"
2121
"fmt"
22-
"go.etcd.io/etcd/pkg/pathutil"
22+
"go.etcd.io/etcd/v3/pkg/pathutil"
2323
"net/http"
2424
"net/url"
2525
"strconv"

‎client/main_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"testing"
2424
"time"
2525

26-
"go.etcd.io/etcd/integration"
27-
"go.etcd.io/etcd/pkg/testutil"
28-
"go.etcd.io/etcd/pkg/transport"
26+
"go.etcd.io/etcd/v3/integration"
27+
"go.etcd.io/etcd/v3/pkg/testutil"
28+
"go.etcd.io/etcd/v3/pkg/transport"
2929
)
3030

3131
var exampleEndpoints []string

‎client/members.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"net/url"
2424
"path"
2525

26-
"go.etcd.io/etcd/pkg/types"
26+
"go.etcd.io/etcd/v3/pkg/types"
2727
)
2828

2929
var (

‎client/members_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"reflect"
2424
"testing"
2525

26-
"go.etcd.io/etcd/pkg/types"
26+
"go.etcd.io/etcd/v3/pkg/types"
2727
)
2828

2929
func TestMembersAPIActionList(t *testing.T) {

‎clientv3/auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"fmt"
2020
"strings"
2121

22-
"go.etcd.io/etcd/auth/authpb"
23-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
22+
"go.etcd.io/etcd/v3/auth/authpb"
23+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
2424
"google.golang.org/grpc"
2525
)
2626

‎clientv3/balancer/balancer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"sync"
2121
"time"
2222

23-
"go.etcd.io/etcd/clientv3/balancer/connectivity"
24-
"go.etcd.io/etcd/clientv3/balancer/picker"
23+
"go.etcd.io/etcd/v3/clientv3/balancer/connectivity"
24+
"go.etcd.io/etcd/v3/clientv3/balancer/picker"
2525

2626
"go.uber.org/zap"
2727
"google.golang.org/grpc/balancer"

‎clientv3/balancer/balancer_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"testing"
2222
"time"
2323

24-
"go.etcd.io/etcd/clientv3/balancer/picker"
25-
"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint"
26-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
27-
"go.etcd.io/etcd/pkg/mock/mockserver"
24+
"go.etcd.io/etcd/v3/clientv3/balancer/picker"
25+
"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
26+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
27+
"go.etcd.io/etcd/v3/pkg/mock/mockserver"
2828

2929
"go.uber.org/zap"
3030
"google.golang.org/grpc"

‎clientv3/client.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import (
2626
"time"
2727

2828
"github.com/google/uuid"
29-
"go.etcd.io/etcd/clientv3/balancer"
30-
"go.etcd.io/etcd/clientv3/balancer/picker"
31-
"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint"
32-
"go.etcd.io/etcd/clientv3/credentials"
33-
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
34-
"go.etcd.io/etcd/pkg/logutil"
29+
"go.etcd.io/etcd/v3/clientv3/balancer"
30+
"go.etcd.io/etcd/v3/clientv3/balancer/picker"
31+
"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
32+
"go.etcd.io/etcd/v3/clientv3/credentials"
33+
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
34+
"go.etcd.io/etcd/v3/pkg/logutil"
3535
"go.uber.org/zap"
3636
"google.golang.org/grpc"
3737
"google.golang.org/grpc/codes"

‎clientv3/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24-
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
25-
"go.etcd.io/etcd/pkg/testutil"
24+
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
25+
"go.etcd.io/etcd/v3/pkg/testutil"
2626

2727
"google.golang.org/grpc"
2828
)

‎clientv3/clientv3util/example_key_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"log"
2020

21-
"go.etcd.io/etcd/clientv3"
22-
"go.etcd.io/etcd/clientv3/clientv3util"
21+
"go.etcd.io/etcd/v3/clientv3"
22+
"go.etcd.io/etcd/v3/clientv3/clientv3util"
2323
)
2424

2525
func ExampleKeyMissing() {

‎clientv3/clientv3util/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package clientv3util
1717

1818
import (
19-
"go.etcd.io/etcd/clientv3"
19+
"go.etcd.io/etcd/v3/clientv3"
2020
)
2121

2222
// KeyExists returns a comparison operation that evaluates to true iff the given

‎clientv3/cluster.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package clientv3
1717
import (
1818
"context"
1919

20-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
21-
"go.etcd.io/etcd/pkg/types"
20+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
21+
"go.etcd.io/etcd/v3/pkg/types"
2222

2323
"google.golang.org/grpc"
2424
)

‎clientv3/compact_op.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package clientv3
1616

1717
import (
18-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
18+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
1919
)
2020

2121
// CompactOp represents a compact operation.

‎clientv3/compact_op_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"reflect"
1919
"testing"
2020

21-
"go.etcd.io/etcd/etcdserver/etcdserverpb"
21+
"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
2222
)
2323

2424
func TestCompactOp(t *testing.T) {

‎clientv3/compare.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package clientv3
1616

1717
import (
18-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
18+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
1919
)
2020

2121
type CompareTarget int

‎clientv3/concurrency/election.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"errors"
2020
"fmt"
2121

22-
v3 "go.etcd.io/etcd/clientv3"
23-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
24-
"go.etcd.io/etcd/mvcc/mvccpb"
22+
v3 "go.etcd.io/etcd/v3/clientv3"
23+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
24+
"go.etcd.io/etcd/v3/mvcc/mvccpb"
2525
)
2626

2727
var (

‎clientv3/concurrency/election_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24-
"go.etcd.io/etcd/clientv3"
25-
"go.etcd.io/etcd/clientv3/concurrency"
24+
"go.etcd.io/etcd/v3/clientv3"
25+
"go.etcd.io/etcd/v3/clientv3/concurrency"
2626
)
2727

2828
func TestResumeElection(t *testing.T) {

‎clientv3/concurrency/example_election_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"sync"
2222
"time"
2323

24-
"go.etcd.io/etcd/clientv3"
25-
"go.etcd.io/etcd/clientv3/concurrency"
24+
"go.etcd.io/etcd/v3/clientv3"
25+
"go.etcd.io/etcd/v3/clientv3/concurrency"
2626
)
2727

2828
func ExampleElection_Campaign() {

‎clientv3/concurrency/example_mutex_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"fmt"
2020
"log"
2121

22-
"go.etcd.io/etcd/clientv3"
23-
"go.etcd.io/etcd/clientv3/concurrency"
22+
"go.etcd.io/etcd/v3/clientv3"
23+
"go.etcd.io/etcd/v3/clientv3/concurrency"
2424
)
2525

2626
func ExampleMutex_TryLock() {

‎clientv3/concurrency/example_stm_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"math/rand"
2222
"sync"
2323

24-
"go.etcd.io/etcd/clientv3"
25-
"go.etcd.io/etcd/clientv3/concurrency"
24+
"go.etcd.io/etcd/v3/clientv3"
25+
"go.etcd.io/etcd/v3/clientv3/concurrency"
2626
)
2727

2828
// ExampleSTM_apply shows how to use STM with a transactional

‎clientv3/concurrency/key.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"context"
1919
"fmt"
2020

21-
v3 "go.etcd.io/etcd/clientv3"
22-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
23-
"go.etcd.io/etcd/mvcc/mvccpb"
21+
v3 "go.etcd.io/etcd/v3/clientv3"
22+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
23+
"go.etcd.io/etcd/v3/mvcc/mvccpb"
2424
)
2525

2626
func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error {

‎clientv3/concurrency/main_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"testing"
2121
"time"
2222

23-
"go.etcd.io/etcd/integration"
24-
"go.etcd.io/etcd/pkg/testutil"
23+
"go.etcd.io/etcd/v3/integration"
24+
"go.etcd.io/etcd/v3/pkg/testutil"
2525
)
2626

2727
var endpoints []string

‎clientv3/concurrency/mutex.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"sync"
2222

23-
v3 "go.etcd.io/etcd/clientv3"
24-
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
23+
v3 "go.etcd.io/etcd/v3/clientv3"
24+
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
2525
)
2626

2727
// ErrLocked is returned by TryLock when Mutex is already locked by another session.

0 commit comments

Comments
 (0)