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.

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

Fix go module requirements for semantic versioning #232

Merged
merged 4 commits into from
Nov 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/csi-sanity/sanity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/mock-driver/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion driver/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kubernetes-csi/csi-test
module github.com/kubernetes-csi/csi-test/v3

go 1.12

Expand Down
2 changes: 1 addition & 1 deletion mock/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sanity/sanity.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions test/co_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
18 changes: 18 additions & 0 deletions v3/README.md
Original file line number Diff line number Diff line change
@@ -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
```
1 change: 1 addition & 0 deletions v3/driver/driver-controller.go
1 change: 1 addition & 0 deletions v3/driver/driver-node.go
1 change: 1 addition & 0 deletions v3/driver/driver.go
1 change: 1 addition & 0 deletions v3/driver/driver.mock.go
1 change: 1 addition & 0 deletions v3/driver/mock.go
1 change: 1 addition & 0 deletions v3/mock/cache/SnapshotCache.go
1 change: 1 addition & 0 deletions v3/mock/service/controller.go
1 change: 1 addition & 0 deletions v3/mock/service/identity.go
1 change: 1 addition & 0 deletions v3/mock/service/node.go
1 change: 1 addition & 0 deletions v3/mock/service/service.go
1 change: 1 addition & 0 deletions v3/pkg/sanity/cleanup.go
1 change: 1 addition & 0 deletions v3/pkg/sanity/controller.go
1 change: 1 addition & 0 deletions v3/pkg/sanity/identity.go
1 change: 1 addition & 0 deletions v3/pkg/sanity/node.go
1 change: 1 addition & 0 deletions v3/pkg/sanity/sanity.go
1 change: 1 addition & 0 deletions v3/pkg/sanity/tests.go
1 change: 1 addition & 0 deletions v3/pkg/sanity/util.go
1 change: 1 addition & 0 deletions v3/utils/grpcutil.go
1 change: 1 addition & 0 deletions v3/utils/safegoroutinetester.go