Update csi sanity caller to fix small errors, check for snapshot existence before creating volume

Author: davidz627

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

@@ -24,6 +24,7 @@ import (
 	"github.com/golang/protobuf/ptypes"
 
 	"context"
+
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	compute "google.golang.org/api/compute/v1"
@@ -163,6 +164,14 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		if content.GetSnapshot() != nil {
 			// TODO(#161): Add support for Volume Source (cloning) introduced in CSI v1.0.0
 			snapshotId = content.GetSnapshot().GetSnapshotId()
+
+			// Verify that snapshot exists
+			sl, err := gceCS.getSnapshotById(ctx, snapshotId)
+			if err != nil {
+				return nil, status.Errorf(codes.Internal, "CreateVolume failed to get snapshot %s: %v", snapshotId, err)
+			} else if len(sl.Entries) == 0 {
+				return nil, status.Errorf(codes.NotFound, "CreateVolume source snapshot %s does not exist", snapshotId)
+			}
 		}
 	}
 
@@ -171,7 +180,7 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 	switch replicationType {
 	case replicationTypeNone:
 		if len(zones) != 1 {
-			return nil, status.Errorf(codes.Internal, fmt.Sprintf("CreateVolume failed to get a single zone for creating zonal disk, instead got: %v", zones))
+			return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume failed to get a single zone for creating zonal disk, instead got: %v", zones))
 		}
 		disk, err = createSingleZoneDisk(ctx, gceCS.CloudProvider, name, zones, diskType, capacityRange, capBytes, snapshotId, diskEncryptionKmsKey)
 		if err != nil {

test/sanity/sanity_test.go

@@ -15,6 +15,9 @@ limitations under the License.
 package sanitytest
 
 import (
+	"fmt"
+	"os"
+	"path"
 	"testing"
 
 	sanity "github.com/kubernetes-csi/csi-test/pkg/sanity"
@@ -31,9 +34,10 @@ func TestSanity(t *testing.T) {
 	project := "test-project"
 	zone := "test-zone"
 	vendorVersion := "test-version"
-	endpoint := "unix:/tmp/csi.sock"
-	mountPath := "/tmp/csi/mount"
-	stagePath := "/tmp/csi/stage"
+	tmpDir := "/tmp/csi"
+	endpoint := fmt.Sprintf("unix:%s/csi.sock", tmpDir)
+	mountPath := path.Join(tmpDir, "mount")
+	stagePath := path.Join(tmpDir, "stage")
 	// Set up driver and env
 	gceDriver := driver.GetGCEDriver()
 
@@ -57,6 +61,18 @@ func TestSanity(t *testing.T) {
 	}
 	cloudProvider.InsertInstance(instance, "test-location", "test-name")
 
+	err = os.MkdirAll(tmpDir, 0755)
+	if err != nil {
+		t.Fatalf("Failed to create sanity temp working dir %s: %v", tmpDir, err)
+	}
+
+	defer func() {
+		// Clean up tmp dir
+		if err = os.RemoveAll(tmpDir); err != nil {
+			t.Fatalf("Failed to clean up sanity temp working dir %s: %v", tmpDir, err)
+		}
+	}()
+
 	go func() {
 		gceDriver.Run(endpoint)
 	}()