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

Jump to bottom

Fix module path to have the major version to comply with go modules specification. #10640

Merged
merged 1 commit into from
May 2, 2019
Merged

Fix module path to have the major version to comply with go modules specification. #10640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 13 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: go
go_import_path: go.etcd.io/etcd
go_import_path: go.etcd.io/etcd/v3

sudo: required

Expand All @@ -14,6 +14,8 @@ notifications:
on_failure: never

env:
global:
- GO111MODULE=on
matrix:
- TARGET=linux-amd64-fmt
- TARGET=linux-amd64-integration-1-cpu
Expand Down Expand Up @@ -65,45 +67,45 @@ matrix:
before_install:
- if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi

install:
- go get -t -d ./...
install: true


script:
- echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
- >
case "${TARGET}" in
linux-amd64-fmt)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test"
;;
linux-amd64-integration-1-cpu)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' ./test"
;;
linux-amd64-integration-2-cpu)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' ./test"
;;
linux-amd64-integration-4-cpu)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' ./test"
;;
linux-amd64-functional)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test"
;;
linux-amd64-unit)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 PASSES='unit' ./test"
;;
all-build)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=amd64 PASSES='build' ./test \
&& GOARCH=386 PASSES='build' ./test \
Expand All @@ -123,7 +125,7 @@ script:
GOARCH=amd64 PASSES='fmt unit' ./test
;;
linux-386-unit)
docker run --rm \
docker run --rm -e GO111MODULE \
--volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
/bin/bash -c "GOARCH=386 PASSES='unit' ./test"
;;
Expand Down
6 changes: 3 additions & 3 deletions auth/range_perm_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package auth

import (
"go.etcd.io/etcd/auth/authpb"
"go.etcd.io/etcd/mvcc/backend"
"go.etcd.io/etcd/pkg/adt"
"go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/v3/mvcc/backend"
"go.etcd.io/etcd/v3/pkg/adt"

"go.uber.org/zap"
)
Expand Down
4 changes: 2 additions & 2 deletions auth/range_perm_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package auth
import (
"testing"

"go.etcd.io/etcd/auth/authpb"
"go.etcd.io/etcd/pkg/adt"
"go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/v3/pkg/adt"

"go.uber.org/zap"
)
Expand Down
8 changes: 4 additions & 4 deletions auth/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"sync"
"sync/atomic"

"go.etcd.io/etcd/auth/authpb"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/backend"
"go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/v3/mvcc/backend"

"github.com/coreos/pkg/capnslog"
"go.uber.org/zap"
Expand Down
8 changes: 4 additions & 4 deletions auth/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"testing"
"time"

"go.etcd.io/etcd/auth/authpb"
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/mvcc/backend"
"go.etcd.io/etcd/v3/auth/authpb"
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/v3/mvcc/backend"

"go.uber.org/zap"
"golang.org/x/crypto/bcrypt"
Expand Down
2 changes: 1 addition & 1 deletion build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# set some environment variables
ORG_PATH="go.etcd.io"
REPO_PATH="${ORG_PATH}/etcd"
REPO_PATH="${ORG_PATH}/etcd/v3"

GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound")
if [[ -n "$FAILPOINTS" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"sync"
"time"

"go.etcd.io/etcd/version"
"go.etcd.io/etcd/v3/version"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"testing"
"time"

"go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/version"
"go.etcd.io/etcd/v3/pkg/testutil"
"go.etcd.io/etcd/v3/version"
)

type actionAssertingHTTPClient struct {
Expand Down
2 changes: 1 addition & 1 deletion client/discover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package client

import (
"go.etcd.io/etcd/pkg/srv"
"go.etcd.io/etcd/v3/pkg/srv"
)

// Discoverer is an interface that wraps the Discover method.
Expand Down
2 changes: 1 addition & 1 deletion client/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Create a Config and exchange it for a Client:
"net/http"
"context"

"go.etcd.io/etcd/client"
"go.etcd.io/etcd/v3/client"
)

cfg := client.Config{
Expand Down
2 changes: 1 addition & 1 deletion client/example_keys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"log"
"sort"

"go.etcd.io/etcd/client"
"go.etcd.io/etcd/v3/client"
)

func ExampleKeysAPI_directory() {
Expand Down
6 changes: 3 additions & 3 deletions client/integration/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"sync/atomic"
"testing"

"go.etcd.io/etcd/client"
"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/v3/client"
"go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/v3/pkg/testutil"
)

// TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection.
Expand Down
2 changes: 1 addition & 1 deletion client/integration/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"testing"

"go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/v3/pkg/testutil"
)

func TestMain(m *testing.M) {
Expand Down
2 changes: 1 addition & 1 deletion client/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"encoding/json"
"errors"
"fmt"
"go.etcd.io/etcd/pkg/pathutil"
"go.etcd.io/etcd/v3/pkg/pathutil"
"net/http"
"net/url"
"strconv"
Expand Down
6 changes: 3 additions & 3 deletions client/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"testing"
"time"

"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/pkg/transport"
"go.etcd.io/etcd/v3/integration"
"go.etcd.io/etcd/v3/pkg/testutil"
"go.etcd.io/etcd/v3/pkg/transport"
)

var exampleEndpoints []string
Expand Down
2 changes: 1 addition & 1 deletion client/members.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/url"
"path"

"go.etcd.io/etcd/pkg/types"
"go.etcd.io/etcd/v3/pkg/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion client/members_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"reflect"
"testing"

"go.etcd.io/etcd/pkg/types"
"go.etcd.io/etcd/v3/pkg/types"
)

func TestMembersAPIActionList(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions clientv3/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"strings"

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

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

"go.etcd.io/etcd/clientv3/balancer/picker"
"go.etcd.io/etcd/v3/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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"testing"
"time"

"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.etcd.io/etcd/v3/clientv3/balancer/picker"
"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/v3/pkg/mock/mockserver"

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

import (
"go.etcd.io/etcd/clientv3/balancer/picker"
"go.etcd.io/etcd/v3/clientv3/balancer/picker"

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

pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/testutil"
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/v3/pkg/testutil"

"google.golang.org/grpc"
)
Expand Down
10 changes: 5 additions & 5 deletions clientv3/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"time"

"github.com/google/uuid"
"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"
"go.etcd.io/etcd/pkg/logutil"
"go.etcd.io/etcd/v3/clientv3/balancer"
"go.etcd.io/etcd/v3/clientv3/balancer/picker"
"go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint"
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/v3/pkg/logutil"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
4 changes: 2 additions & 2 deletions clientv3/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"testing"
"time"

"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/v3/etcdserver/api/v3rpc/rpctypes"
"go.etcd.io/etcd/v3/pkg/testutil"

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

"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/clientv3util"
"go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/v3/clientv3/clientv3util"
)

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

import (
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/v3/clientv3"
)

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

pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/types"
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
"go.etcd.io/etcd/v3/pkg/types"

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

import (
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
)

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

"go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
)

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

import (
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
pb "go.etcd.io/etcd/v3/etcdserver/etcdserverpb"
)

type CompareTarget int
Expand Down
Loading