If passed an empty volume name, VolumeExists should return false and …

…not error (#1458)

storage_drivers/ontap/api/ontap_rest.go

@@ -487,6 +487,9 @@ func (c RestClient) getAllVolumesByPatternStyleAndState(
 
 // checkVolumeExistsByNameAndStyle tests for the existence of a volume of the style and name specified
 func (c RestClient) checkVolumeExistsByNameAndStyle(ctx context.Context, volumeName, style string) (bool, error) {
+	if volumeName == "" {
+		return false, nil
+	}
 	volume, err := c.getVolumeByNameAndStyle(ctx, volumeName, style)
 	if err != nil {
 		return false, err

storage_drivers/ontap/api/ontap_rest_test.go

@@ -4192,3 +4192,15 @@ func TestOntapRest_JobScheduleExists(t *testing.T) {
 		})
 	}
 }
+
+func TestOntapRest_VolumeExists(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(mockResourceNotFound))
+	defer server.Close()
+
+	rs := newRestClient(server.Listener.Addr().String(), server.Client())
+	assert.NotNil(t, rs)
+
+	volumeExists, err := rs.VolumeExists(ctx, "")
+	assert.NoError(t, err, "could not check if the volume exists")
+	assert.False(t, volumeExists)
+}

storage_drivers/ontap/api/ontap_zapi.go

@@ -1379,6 +1379,10 @@ func (c Client) VolumeSetQosPolicyGroupName(
 
 // VolumeExists tests for the existence of a Flexvol
 func (c Client) VolumeExists(ctx context.Context, name string) (bool, error) {
+	if name == "" {
+		return false, nil
+	}
+
 	response, err := azgo.NewVolumeSizeRequest().
 		SetVolume(name).
 		ExecuteUsing(c.zr)

storage_drivers/ontap/api/ontap_zapi_test.go

@@ -20,3 +20,13 @@ func TestGetError(t *testing.T) {
 
 	assert.Equal(t, "unexpected nil ZAPI result", e.(azgo.ZapiError).Reason(), "Strings not equal")
 }
+
+func TestVolumeExists_EmptyVolumeName(t *testing.T) {
+	ctx := context.Background()
+
+	zapiClient := Client{}
+	volumeExists, err := zapiClient.VolumeExists(ctx, "")
+
+	assert.NoError(t, err, "VolumeExists should not have errored with a missing volume name")
+	assert.False(t, volumeExists)
+}