Merge pull request #232 from StratoAG/fix-semver

Fix go module requirements for semantic versioning
kubernetes-csi · Nov 4, 2019 · 60f3a8d · 60f3a8d
2 parents ec1441c + 4c648a1
commit 60f3a8d
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 10 deletions.
diff --git a/cmd/csi-sanity/sanity_test.go b/cmd/csi-sanity/sanity_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/kubernetes-csi/csi-test/pkg/sanity"
+	"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
 )
 
 const (

diff --git a/cmd/mock-driver/main.go b/cmd/mock-driver/main.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/kubernetes-csi/csi-test/driver"
-	"github.com/kubernetes-csi/csi-test/mock/service"
+	"github.com/kubernetes-csi/csi-test/v3/driver"
+	"github.com/kubernetes-csi/csi-test/v3/mock/service"
 )
 
 func main() {

diff --git a/driver/mock.go b/driver/mock.go
@@ -19,7 +19,7 @@ package driver
 import (
 	"net"
 
-	"github.com/kubernetes-csi/csi-test/utils"
+	"github.com/kubernetes-csi/csi-test/v3/utils"
 	"google.golang.org/grpc"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/kubernetes-csi/csi-test
+module github.com/kubernetes-csi/csi-test/v3
 
 go 1.12
 

diff --git a/mock/service/service.go b/mock/service/service.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"github.com/kubernetes-csi/csi-test/mock/cache"
+	"github.com/kubernetes-csi/csi-test/v3/mock/cache"
 	"golang.org/x/net/context"
 
 	"github.com/golang/protobuf/ptypes"

diff --git a/pkg/sanity/sanity.go b/pkg/sanity/sanity.go
@@ -27,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubernetes-csi/csi-test/utils"
+	"github.com/kubernetes-csi/csi-test/v3/utils"
 	yaml "gopkg.in/yaml.v2"
 
 	"google.golang.org/grpc"

diff --git a/test/co_test.go b/test/co_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/mock/gomock"
 	"github.com/golang/protobuf/proto"
-	mock_driver "github.com/kubernetes-csi/csi-test/driver"
-	mock_utils "github.com/kubernetes-csi/csi-test/utils"
+	mock_driver "github.com/kubernetes-csi/csi-test/v3/driver"
+	mock_utils "github.com/kubernetes-csi/csi-test/v3/utils"
 )
 
 func TestPluginInfoResponse(t *testing.T) {

diff --git a/test/driver_test.go b/test/driver_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"github.com/kubernetes-csi/csi-test/utils"
+	"github.com/kubernetes-csi/csi-test/v3/utils"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )

diff --git a/v3/README.md b/v3/README.md
@@ -0,0 +1,18 @@
+This directory mirrors the source code via symlinks.
+This makes it possible to vendor v3.x releases of
+csi-test with `dep` versions that do not support
+semantic imports. Support for that is currently
+[pending in dep](https://github.com/golang/dep/pull/1963).
+
+If users of dep have enabled pruning, they must disable if
+for csi-test in their Gopk.toml, like this:
+
+```toml
+[prune]
+  go-tests = true
+  unused-packages = true
+
+  [[prune.project]]
+    name = "github.com/kubernetes-csi/csi-test"
+    unused-packages = false
+```
diff --git a/v3/driver/driver-controller.go b/v3/driver/driver-controller.go
@@ -0,0 +1 @@
+../../driver/driver-controller.go
diff --git a/v3/driver/driver-node.go b/v3/driver/driver-node.go
@@ -0,0 +1 @@
+../../driver/driver-node.go
diff --git a/v3/driver/driver.go b/v3/driver/driver.go
@@ -0,0 +1 @@
+../../driver/driver.go
diff --git a/v3/driver/driver.mock.go b/v3/driver/driver.mock.go
@@ -0,0 +1 @@
+../../driver/driver.mock.go
diff --git a/v3/driver/mock.go b/v3/driver/mock.go
@@ -0,0 +1 @@
+../../driver/mock.go
diff --git a/v3/mock/cache/SnapshotCache.go b/v3/mock/cache/SnapshotCache.go
@@ -0,0 +1 @@
+../../../mock/cache/SnapshotCache.go
diff --git a/v3/mock/service/controller.go b/v3/mock/service/controller.go
@@ -0,0 +1 @@
+../../../mock/service/controller.go
diff --git a/v3/mock/service/identity.go b/v3/mock/service/identity.go
@@ -0,0 +1 @@
+../../../mock/service/identity.go
diff --git a/v3/mock/service/node.go b/v3/mock/service/node.go
@@ -0,0 +1 @@
+../../../mock/service/node.go
diff --git a/v3/mock/service/service.go b/v3/mock/service/service.go
@@ -0,0 +1 @@
+../../../mock/service/service.go
diff --git a/v3/pkg/sanity/cleanup.go b/v3/pkg/sanity/cleanup.go
@@ -0,0 +1 @@
+../../../pkg/sanity/cleanup.go
diff --git a/v3/pkg/sanity/controller.go b/v3/pkg/sanity/controller.go
@@ -0,0 +1 @@
+../../../pkg/sanity/controller.go
diff --git a/v3/pkg/sanity/identity.go b/v3/pkg/sanity/identity.go
@@ -0,0 +1 @@
+../../../pkg/sanity/identity.go
diff --git a/v3/pkg/sanity/node.go b/v3/pkg/sanity/node.go
@@ -0,0 +1 @@
+../../../pkg/sanity/node.go
diff --git a/v3/pkg/sanity/sanity.go b/v3/pkg/sanity/sanity.go
@@ -0,0 +1 @@
+../../../pkg/sanity/sanity.go
diff --git a/v3/pkg/sanity/tests.go b/v3/pkg/sanity/tests.go
@@ -0,0 +1 @@
+../../../pkg/sanity/tests.go
diff --git a/v3/pkg/sanity/util.go b/v3/pkg/sanity/util.go
@@ -0,0 +1 @@
+../../../pkg/sanity/util.go
diff --git a/v3/utils/grpcutil.go b/v3/utils/grpcutil.go
@@ -0,0 +1 @@
+../../utils/grpcutil.go
diff --git a/v3/utils/safegoroutinetester.go b/v3/utils/safegoroutinetester.go
@@ -0,0 +1 @@
+../../utils/safegoroutinetester.go