sanity test

Author: phuhung273

pkg/cloud/fakes.go

@@ -114,8 +114,14 @@ func (c *FakeCloudProvider) ResizeFileSystem(ctx context.Context, fileSystemId s
 }
 
 func (c *FakeCloudProvider) DeleteFileSystem(ctx context.Context, parameters map[string]string) error {
+	// parameters["FileSystemId"] in Sanity test is JSON string, eg: "\"fs-1234\""
+	// While actual id is "fs-1234"
+	// For backward compatibility, we can remove both the JSON string and the unquote string
+	unquoteId := strings.Trim(parameters["FileSystemId"], "\"")
 	delete(c.fileSystems, parameters["FileSystemId"])
+	delete(c.fileSystems, unquoteId)
 	delete(c.fileSystemsParameters, parameters["FileSystemId"])
+	delete(c.fileSystemsParameters, unquoteId)
 	return nil
 }
 
@@ -168,8 +174,14 @@ func (c *FakeCloudProvider) CreateVolume(ctx context.Context, parameters map[str
 }
 
 func (c *FakeCloudProvider) DeleteVolume(ctx context.Context, parameters map[string]string) (err error) {
+	// parameters["VolumeId"] in Sanity test is JSON string, eg: "\"fsvol-1234\""
+	// While actual id is "fsvol-1234"
+	// For backward compatibility, we can remove both the JSON string and the unquote string
+	unquoteId := strings.Trim(parameters["VolumeId"], "\"")
 	delete(c.volumes, parameters["VolumeId"])
+	delete(c.volumes, unquoteId)
 	delete(c.volumesParameters, parameters["VolumeId"])
+	delete(c.volumesParameters, unquoteId)
 	return nil
 }
 

pkg/driver/controller.go

@@ -364,18 +364,20 @@ func (d *controllerService) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 	describeRetry := func() error {
 		if splitVolumeId[0] == cloud.FilesystemPrefix {
 			_, err = d.cloud.DescribeFileSystem(ctx, volumeID)
-		}
-		if splitVolumeId[0] == cloud.VolumePrefix {
+		} else if splitVolumeId[0] == cloud.VolumePrefix {
 			_, err = d.cloud.DescribeVolume(ctx, volumeID)
+		} else {
+			// Invalid volume ID, return not found immediately
+			return nil
 		}
 
 		if err != nil {
 			if err == cloud.ErrNotFound {
 				return nil
 			}
-			return status.Error(codes.Internal, err.Error())
+			return err
 		}
-		return status.Errorf(codes.Internal, "Volume ID %q still exists", volumeID)
+		return fmt.Errorf("volume ID %q still exists", volumeID)
 	}
 
 	err = backoff.RetryNotify(describeRetry, d.backoff, notifyRetryError)

pkg/driver/controller_test.go

@@ -32,7 +32,8 @@ import (
 )
 
 const (
-	backoffMaxRetries = 10
+	backoffMaxRetries       = 10
+	exceedBackoffMaxRetries = backoffMaxRetries + 1
 )
 
 func defaultControllerService(mockCloud *mocks.MockCloud) controllerService {
@@ -1089,7 +1090,7 @@ func TestDeleteVolume(t *testing.T) {
 				mockCloud.EXPECT().GetDeleteParameters(gomock.Eq(ctx), gomock.Any()).Return(volumeParameters, nil)
 				mockCloud.EXPECT().DeleteFileSystem(gomock.Eq(ctx), gomock.Any()).Return(nil)
 
-				for i := 0; i < backoffMaxRetries+1; i++ {
+				for i := 0; i < exceedBackoffMaxRetries; i++ {
 					mockCloud.EXPECT().DescribeFileSystem(gomock.Eq(ctx), gomock.Any()).Return(&cloud.FileSystem{}, nil)
 				}
 
@@ -1199,7 +1200,7 @@ func TestDeleteVolume(t *testing.T) {
 				mockCloud.EXPECT().GetDeleteParameters(gomock.Eq(ctx), gomock.Any()).Return(volumeParameters, nil)
 				mockCloud.EXPECT().DeleteVolume(gomock.Eq(ctx), gomock.Any()).Return(nil)
 
-				for i := 0; i < backoffMaxRetries+1; i++ {
+				for i := 0; i < exceedBackoffMaxRetries; i++ {
 					mockCloud.EXPECT().DescribeVolume(gomock.Eq(ctx), gomock.Any()).Return(&cloud.Volume{}, nil)
 				}
 

pkg/driver/fakes.go

@@ -16,6 +16,7 @@ limitations under the License.
 package driver
 
 import (
+	"github.com/cenkalti/backoff/v4"
 	"github.com/kubernetes-sigs/aws-fsx-openzfs-csi-driver/pkg/cloud"
 	"github.com/kubernetes-sigs/aws-fsx-openzfs-csi-driver/pkg/driver/internal"
 	"k8s.io/mount-utils"
@@ -42,6 +43,10 @@ func NewFakeDriver(endpoint string) *Driver {
 			cloud:         cloud.NewFakeCloudProvider(),
 			inFlight:      internal.NewInFlight(),
 			driverOptions: &driverOptions,
+			backoff: backoff.WithMaxRetries(
+				backoff.NewExponentialBackOff(),
+				3,
+			),
 		},
 		nodeService: nodeService{
 			metadata: &cloud.Metadata{