Merge pull request #7 from akutz/feature/csi-0.2.0

Updated for GoCSI 0.4.0 / CSI 0.2.0

.travis.yml

@@ -3,3 +3,12 @@ sudo: false
 language: go
 go_import_path: github.com/thecodeteam/csi-scaleio
 go: 1.9.2
+
+env:
+  global:
+    - X_CSI_SCALEIO_NO_PROBE_ON_START=true
+
+install: true
+script:
+  - go install .
+  - go test -v ./service

Gopkg.toml

@@ -1,30 +1,13 @@
 # Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
 # for detailed Gopkg.toml documentation.
+#
+# Refer to https://github.com/toml-lang/toml for detailed TOML docs.
 
-[[constraint]]
-  name = "github.com/sirupsen/logrus"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/thecodeteam/gocsi"
-  version = "0.3.1"
-
-[[constraint]]
-  name = "github.com/thecodeteam/gofsutil"
-  version = "0.1.0"
-
-[[constraint]]
-  name = "github.com/thecodeteam/goscaleio"
-  branch = "master"
-
-[[constraint]]
-  name = "google.golang.org/grpc"
-  version = "1.7.3"
-
-[[constraint]]
-  name = "github.com/container-storage-interface/spec"
-  version = "0.1.0"
+[prune]
+  non-go = true
+  go-tests = true
+  unused-packages = true
 
 [[constraint]]
-  name = "github.com/akutz/memconn"
-  branch = "master"
+  name = "github.com/rexray/gocsi"
+  version = "0.4.0"

README.md

@@ -54,11 +54,11 @@ any of the standard exit signals.
 The CSI specification uses the gRPC protocol for plug-in communication.
 The easiest way to interact with a CSI plugin is via the Container
 Storage Client (`csc`) program provided via the
-[GoCSI](https://github.com/thecodeteam/gocsi) project:
+[GoCSI](https://github.com/rexray/gocsi) project:
 
 ```bash
-$ go get github.com/thecodeteam/gocsi
-$ go install github.com/thecodeteam/gocsi/csc
+$ go get github.com/rexray/gocsi
+$ go install github.com/rexray/gocsi/csc
 ```
 
 Then, have `csc` use the same `CSI_ENDPOINT`, and you can issue commands
@@ -100,7 +100,7 @@ $ ./csc -v 0.1.0 c create --cap 1,mount,xfs --params storagepool=pd1pool1 myvol
 ## Configuration
 The CSI-ScaleIO SP is built using the GoCSI CSP package. Please
 see its
-[configuration section](https://github.com/thecodeteam/gocsi#configuration)
+[configuration section](https://github.com/rexray/gocsi#configuration)
 for a complete list of the environment variables that may be used to
 configure this SP.
 

main.go

@@ -5,7 +5,7 @@ package main
 import (
 	"context"
 
-	"github.com/thecodeteam/gocsi"
+	"github.com/rexray/gocsi"
 
 	"github.com/thecodeteam/csi-scaleio/provider"
 	"github.com/thecodeteam/csi-scaleio/service"

plugin.go

@@ -14,9 +14,6 @@ import (
 //                              Go Plug-in                                    //
 ////////////////////////////////////////////////////////////////////////////////
 
-// SupportedVersions is a space-delimited list of supported CSI versions.
-var SupportedVersions = service.SupportedVersions
-
 // ServiceProviders is an exported symbol that provides a host program
 // with a map of the service provider names and constructors.
 var ServiceProviders = map[string]func() interface{}{

provider/provider.go

@@ -1,7 +1,7 @@
 package provider
 
 import (
-	"github.com/thecodeteam/gocsi"
+	"github.com/rexray/gocsi"
 
 	"github.com/thecodeteam/csi-scaleio/service"
 )
@@ -28,15 +28,9 @@ func New() gocsi.StoragePluginProvider {
 			gocsi.EnvVarRequireNodeID + "=true",
 
 			// Treat the following fields as required:
-			//    * ControllerPublishVolumeResponse.PublishVolumeInfo
-			//    * NodePublishVolumeRequest.PublishVolumeInfo
+			//    * ControllerPublishVolumeResponse.PublishInfo
+			//    * NodePublishVolumeRequest.PublishInfo
 			gocsi.EnvVarRequirePubVolInfo + "=false",
-
-			// Provide the list of versions supported by this SP. The
-			// specified versions will be:
-			//     * Returned by GetSupportedVersions
-			//     * Used to validate the Version field of incoming RPCs
-			gocsi.EnvVarSupportedVersions + "=" + service.SupportedVersions,
 		},
 	}
 }