fix: ModifyVolume interface parameter check

fix
kubernetes-sigs · Dec 16, 2024 · a6ccc45 · a6ccc45
1 parent 01cab64
commit a6ccc45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pkg/azuredisk/controllerserver.go b/pkg/azuredisk/controllerserver.go
@@ -70,11 +70,14 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		klog.Errorf("invalid create volume req: %v", req)
 		return nil, err
 	}
-	params := req.GetParameters()
-	diskParams, err := azureutils.ParseDiskParameters(params)
+	diskParams, err := azureutils.ParseDiskParameters(req.GetParameters())
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "Failed parsing disk parameters: %v", err)
 	}
+	if _, err = azureutils.ParseDiskParameters(req.GetMutableParameters()); err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "Failed parsing disk mutable parameters: %v", err)
+	}
+
 	name := req.GetName()
 	if len(name) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "CreateVolume Name must be provided")
@@ -400,7 +403,7 @@ func (d *Driver) ControllerModifyVolume(ctx context.Context, req *csi.Controller
 
 	diskName, err := azureutils.GetDiskName(diskURI)
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "%v", err)
+		return nil, status.Errorf(codes.NotFound, "%v", err)
 	}
 
 	if _, err := d.checkDiskExists(ctx, diskURI); err != nil {

diff --git a/pkg/azuredisk/controllerserver_test.go b/pkg/azuredisk/controllerserver_test.go
@@ -666,15 +666,15 @@ func TestControllerModifyVolume(t *testing.T) {
 				VolumeId: "123",
 			},
 			expectedResp:    nil,
-			expectedErrCode: codes.Internal,
+			expectedErrCode: codes.NotFound,
 		},
 		{
 			desc: "fail with wrong disk name",
 			req: &csi.ControllerModifyVolumeRequest{
 				VolumeId: "/subscriptions/123",
 			},
 			expectedResp:    nil,
-			expectedErrCode: codes.Internal,
+			expectedErrCode: codes.NotFound,
 		},
 		{
 			desc: "fail with wrong sku name",

diff --git a/pkg/azuredisk/controllerserver_v2.go b/pkg/azuredisk/controllerserver_v2.go
@@ -312,7 +312,7 @@ func (d *DriverV2) ControllerModifyVolume(ctx context.Context, req *csi.Controll
 
 	diskName, err := azureutils.GetDiskName(diskURI)
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "%v", err)
+		return nil, status.Errorf(codes.NotFound, "%v", err)
 	}
 
 	if _, err := d.checkDiskExists(ctx, diskURI); err != nil {