Skip to content

Commit f7260c7

Browse files
timoreimanntimoreimann
committed
Move v3 to v4 and adjust links
1 parent 7ccafe9 commit f7260c7

35 files changed

+18
-27
lines changed

‎cmd/csi-sanity/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
25+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
2626
)
2727

2828
const (

‎cmd/mock-driver/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strings"
2626
"syscall"
2727

28-
"github.com/kubernetes-csi/csi-test/v3/driver"
29-
"github.com/kubernetes-csi/csi-test/v3/mock/service"
28+
"github.com/kubernetes-csi/csi-test/v4/driver"
29+
"github.com/kubernetes-csi/csi-test/v4/mock/service"
3030
"gopkg.in/yaml.v2"
3131
)
3232

‎driver/mock.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package driver
1919
import (
2020
"net"
2121

22-
"github.com/kubernetes-csi/csi-test/v3/utils"
22+
"github.com/kubernetes-csi/csi-test/v4/utils"
2323
"google.golang.org/grpc"
2424
)
2525

‎go.mod

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kubernetes-csi/csi-test/v3
1+
module github.com/kubernetes-csi/csi-test/v4
22

33
go 1.12
44

@@ -7,15 +7,11 @@ require (
77
github.com/golang/mock v1.3.1
88
github.com/golang/protobuf v1.3.2
99
github.com/google/uuid v1.1.1
10-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
1110
github.com/onsi/ginkgo v1.10.3
1211
github.com/onsi/gomega v1.7.1
1312
github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff
1413
github.com/sirupsen/logrus v1.4.2
1514
golang.org/x/net v0.0.0-20191112182307-2180aed22343
16-
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056 // indirect
17-
golang.org/x/text v0.3.2 // indirect
18-
google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de // indirect
1915
google.golang.org/grpc v1.25.1
2016
gopkg.in/sourcemap.v1 v1.0.5 // indirect
2117
gopkg.in/yaml.v2 v2.2.5

‎go.sum

+3-9
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
2323
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2424
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
2525
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
26+
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
2627
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
27-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
28-
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
2928
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
3029
github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
3130
github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -60,14 +59,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
6059
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6160
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6261
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
62+
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
6363
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
64-
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056 h1:dHtDnRWQtSx0Hjq9kvKFpBh9uPPKfQN70NZZmvssGwk=
65-
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6664
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
6765
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
68-
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
69-
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
70-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
7166
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
7267
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
7368
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -76,9 +71,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
7671
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
7772
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
7873
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
74+
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
7975
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
80-
google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de h1:dFEMUWudT9iV1JMk6i6NwbfIw2V/2VDFyDYCZFypRxE=
81-
google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
8276
google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
8377
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
8478
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=

‎hack/_apitest/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package apitest
33
import (
44
"testing"
55

6-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
6+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
77
)
88

99
func TestMyDriver(t *testing.T) {

‎hack/_apitest2/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path"
77
"testing"
88

9-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
9+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
1010
)
1111

1212
// TestMyDriverWithCustomTargetPaths verifies that CreateTargetDir and

‎hack/_embedded/embedded_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package embedded
33
import (
44
"testing"
55

6-
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
6+
"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
77
. "github.com/onsi/ginkgo"
88
. "github.com/onsi/gomega"
99
)

‎mock/service/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync/atomic"
1010

1111
"github.com/container-storage-interface/spec/lib/go/csi"
12-
"github.com/kubernetes-csi/csi-test/v3/mock/cache"
12+
"github.com/kubernetes-csi/csi-test/v4/mock/cache"
1313
"golang.org/x/net/context"
1414
"google.golang.org/grpc/codes"
1515

‎pkg/sanity/sanity.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"strings"
2727
"time"
2828

29-
"github.com/kubernetes-csi/csi-test/v3/utils"
29+
"github.com/kubernetes-csi/csi-test/v4/utils"
3030
yaml "gopkg.in/yaml.v2"
3131

3232
"google.golang.org/grpc"

‎test/co_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/container-storage-interface/spec/lib/go/csi"
2525
"github.com/golang/mock/gomock"
2626
"github.com/golang/protobuf/proto"
27-
mock_driver "github.com/kubernetes-csi/csi-test/v3/driver"
28-
mock_utils "github.com/kubernetes-csi/csi-test/v3/utils"
27+
mock_driver "github.com/kubernetes-csi/csi-test/v4/driver"
28+
mock_utils "github.com/kubernetes-csi/csi-test/v4/utils"
2929
)
3030

3131
func TestPluginInfoResponse(t *testing.T) {

‎test/driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323

2424
"github.com/container-storage-interface/spec/lib/go/csi"
25-
"github.com/kubernetes-csi/csi-test/v3/utils"
25+
"github.com/kubernetes-csi/csi-test/v4/utils"
2626
"google.golang.org/grpc"
2727
"google.golang.org/grpc/reflection"
2828
)

‎v3/pkg/sanity/cleanup.go

-1
This file was deleted.

‎v3/README.md renamed to ‎v4/README.md

File renamed without changes.

‎v3/driver/driver-controller.go renamed to ‎v4/driver/driver-controller.go

File renamed without changes.

‎v3/driver/driver-node.go renamed to ‎v4/driver/driver-node.go

File renamed without changes.

‎v3/driver/driver.go renamed to ‎v4/driver/driver.go

File renamed without changes.

‎v3/driver/driver.mock.go renamed to ‎v4/driver/driver.mock.go

File renamed without changes.

‎v3/driver/mock.go renamed to ‎v4/driver/mock.go

File renamed without changes.

‎v3/mock/cache/SnapshotCache.go renamed to ‎v4/mock/cache/SnapshotCache.go

File renamed without changes.

‎v3/mock/service/controller.go renamed to ‎v4/mock/service/controller.go

File renamed without changes.

‎v3/mock/service/hooks-const.go renamed to ‎v4/mock/service/hooks-const.go

File renamed without changes.

‎v3/mock/service/identity.go renamed to ‎v4/mock/service/identity.go

File renamed without changes.

‎v3/mock/service/node.go renamed to ‎v4/mock/service/node.go

File renamed without changes.

‎v3/mock/service/service.go renamed to ‎v4/mock/service/service.go

File renamed without changes.

‎v3/pkg/sanity/controller.go renamed to ‎v4/pkg/sanity/controller.go

File renamed without changes.

‎v3/pkg/sanity/identity.go renamed to ‎v4/pkg/sanity/identity.go

File renamed without changes.

‎v4/pkg/sanity/logger.go

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../pkg/sanity/logger.go

‎v3/pkg/sanity/node.go renamed to ‎v4/pkg/sanity/node.go

File renamed without changes.

‎v4/pkg/sanity/resources.go

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../pkg/sanity/resources.go

‎v3/pkg/sanity/sanity.go renamed to ‎v4/pkg/sanity/sanity.go

File renamed without changes.

‎v3/pkg/sanity/tests.go renamed to ‎v4/pkg/sanity/tests.go

File renamed without changes.

‎v3/pkg/sanity/util.go renamed to ‎v4/pkg/sanity/util.go

File renamed without changes.

‎v3/utils/grpcutil.go renamed to ‎v4/utils/grpcutil.go

File renamed without changes.

‎v3/utils/safegoroutinetester.go renamed to ‎v4/utils/safegoroutinetester.go

File renamed without changes.

0 commit comments

Comments
 (0)