fix: delete snapshot should not delete file share

andyzhangx · andyzhangx · commit b7f063076779 · 2025-05-13T03:11:39.000Z
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -1086,7 +1086,9 @@ func (d *Driver) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequ
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "failed to get snapshot client for subID(%s): %v", subsID, err)
 		}
-		deleteErr = fileshareClient.Delete(ctx, rgName, accountName, fileShareName, nil)
+		deleteErr = fileshareClient.Delete(ctx, rgName, accountName, fileShareName, &armstorage.FileSharesClientDeleteOptions{
+			XMSSnapshot: to.Ptr(snapshot),
+		})
 	}
 
 	if deleteErr != nil {

Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,9 @@ func (d Driver) DeleteSnapshot(ctx context.Context, req csi.DeleteSnapshotRequ`
`1086`	`1086`	`if err != nil {`
`1087`	`1087`	`return nil, status.Errorf(codes.Internal, "failed to get snapshot client for subID(%s): %v", subsID, err)`
`1088`	`1088`	`}`
`1089`		`- deleteErr = fileshareClient.Delete(ctx, rgName, accountName, fileShareName, nil)`
	`1089`	`+ deleteErr = fileshareClient.Delete(ctx, rgName, accountName, fileShareName, &armstorage.FileSharesClientDeleteOptions{`
	`1090`	`+ XMSSnapshot: to.Ptr(snapshot),`
	`1091`	`+ })`
`1090`	`1092`	`}`
`1091`	`1093`
`1092`	`1094`	`if deleteErr != nil {`