fix: delete volume with empty rg issue

andyzhangx · andyzhangx · commit 96c25d7c11fd · 2020-09-15T14:57:30.000Z
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -276,6 +276,10 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 		return &csi.DeleteVolumeResponse{}, nil
 	}
 
+	if resourceGroupName == "" {
+		resourceGroupName = d.cloud.ResourceGroup
+	}
+
 	if err := d.DeleteFileShare(resourceGroupName, accountName, fileShareName, req.GetSecrets()); err != nil {
 		return nil, status.Errorf(codes.Internal, "DeleteFileShare %s under account(%s) rg(%s) failed with error: %v", fileShareName, accountName, resourceGroupName, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,10 @@ func (d Driver) DeleteVolume(ctx context.Context, req csi.DeleteVolumeRequest)`
`276`	`276`	`return &csi.DeleteVolumeResponse{}, nil`
`277`	`277`	`}`
`278`	`278`
	`279`	`+ if resourceGroupName == "" {`
	`280`	`+ resourceGroupName = d.cloud.ResourceGroup`
	`281`	`+ }`
	`282`	`+`
`279`	`283`	`if err := d.DeleteFileShare(resourceGroupName, accountName, fileShareName, req.GetSecrets()); err != nil {`
`280`	`284`	`return nil, status.Errorf(codes.Internal, "DeleteFileShare %s under account(%s) rg(%s) failed with error: %v", fileShareName, accountName, resourceGroupName, err)`
`281`	`285`	`}`