Bump CSI Sanity to latest version and implement the IDGenerator interface for better VolumeID errors

Author: davidz627

Gopkg.lock

@@ -47,7 +47,7 @@
 
 [[constraint]]
   name = "github.com/kubernetes-csi/csi-test"
-  version = "v2.0.1"
+  version = "2.2.0"
 
 [[constraint]]
   branch = "master"

Gopkg.toml

@@ -144,3 +144,7 @@ func GetDeviceName(volKey *meta.Key) (string, error) {
 func CreateNodeID(project, zone, name string) string {
 	return fmt.Sprintf(nodeIDFmt, project, zone, name)
 }
+
+func CreateZonalVolumeID(project, zone, name string) string {
+	return fmt.Sprintf(volIDZonalFmt, project, zone, name)
+}

pkg/common/utils.go

@@ -375,7 +375,7 @@ func (cloud *FakeCloudProvider) ResizeDisk(ctx context.Context, volKey *meta.Key
 
 	disk.setSizeGb(common.BytesToGb(requestBytes))
 
-	return requestBytes, nil
+	return common.BytesToGb(requestBytes), nil
 
 }
 

pkg/gce-cloud-provider/compute/fake-gce.go

@@ -224,6 +224,8 @@ func (gceCS *GCEControllerServer) DeleteVolume(ctx context.Context, req *csi.Del
 
 	volKey, err := common.VolumeIDToKey(volumeID)
 	if err != nil {
+		// Cannot find volume associated with this ID because VolumeID is not in
+		// correct format, this is a success according to the Spec
 		klog.Warningf("Treating volume as deleted because volume id %s is invalid: %v", volumeID, err)
 		return &csi.DeleteVolumeResponse{}, nil
 	}

pkg/gce-pd-csi-driver/controller.go

@@ -20,8 +20,11 @@ import (
 	"path"
 	"testing"
 
+	"github.com/google/uuid"
+
 	sanity "github.com/kubernetes-csi/csi-test/pkg/sanity"
 	compute "google.golang.org/api/compute/v1"
+	common "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
 	metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
 	driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
@@ -82,6 +85,37 @@ func TestSanity(t *testing.T) {
 		TargetPath:  mountPath,
 		StagingPath: stagePath,
 		Address:     endpoint,
+		IDGen:       newPDIDGenerator(project, zone),
 	}
 	sanity.Test(t, config)
 }
+
+type pdIDGenerator struct {
+	project string
+	zone    string
+}
+
+var _ sanity.IDGenerator = &pdIDGenerator{}
+
+func newPDIDGenerator(project, zone string) *pdIDGenerator {
+	return &pdIDGenerator{
+		project: project,
+		zone:    zone,
+	}
+}
+
+func (p pdIDGenerator) GenerateUniqueValidVolumeID() string {
+	return common.CreateZonalVolumeID(p.project, p.zone, uuid.New().String()[:10])
+}
+
+func (p pdIDGenerator) GenerateInvalidVolumeID() string {
+	return "fake-volid"
+}
+
+func (p pdIDGenerator) GenerateUniqueValidNodeID() string {
+	return common.CreateNodeID(p.project, p.zone, uuid.New().String()[:10])
+}
+
+func (p pdIDGenerator) GenerateInvalidNodeID() string {
+	return "fake-nodeid"
+}