Revert "fix: only copy volume to different account if storageAccount is specified"

This reverts commit a8ab407.

Author: acortelyou

pkg/blob/controllerserver.go

@@ -440,7 +440,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "failed to getAzcopyAuth on account(%s) rg(%s), error: %v", accountOptions.Name, accountOptions.ResourceGroup, err)
 		}
-		if err := d.copyVolume(req, accountSASToken, authAzcopyEnv, account, validContainerName, storageEndpointSuffix); err != nil {
+		if err := d.copyVolume(req, accountSASToken, authAzcopyEnv, accountName, validContainerName, storageEndpointSuffix); err != nil {
 			return nil, err
 		}
 	} else {
@@ -755,7 +755,7 @@ func (d *Driver) DeleteBlobContainer(ctx context.Context, subsID, resourceGroupN
 	})
 }
 
-// CopyBlobContainer copies a blob container, if dstAccountName is empty, then copy in the same account
+// CopyBlobContainer copies a blob container
 func (d *Driver) copyBlobContainer(req *csi.CreateVolumeRequest, accountSasToken string, authAzcopyEnv []string, dstAccountName, dstContainerName, storageEndpointSuffix string) error {
 	var sourceVolumeID string
 	if req.GetVolumeContentSource() != nil && req.GetVolumeContentSource().GetVolume() != nil {
@@ -766,11 +766,8 @@ func (d *Driver) copyBlobContainer(req *csi.CreateVolumeRequest, accountSasToken
 	if err != nil {
 		return status.Error(codes.NotFound, err.Error())
 	}
-	if dstAccountName == "" {
-		dstAccountName = srcAccountName
-	}
-	if srcAccountName == "" || srcContainerName == "" || dstContainerName == "" {
-		return fmt.Errorf("One or more of srcAccountName(%s), srcContainerName(%s), dstContainerName(%s) are empty", srcAccountName, srcContainerName, dstContainerName)
+	if srcAccountName == "" || srcContainerName == "" || dstAccountName == "" || dstContainerName == "" {
+		return fmt.Errorf("One or more of srcAccountName(%s), srcContainerName(%s), dstAccountName(%s), dstContainerName(%s) are empty", srcAccountName, srcContainerName, dstAccountName, dstContainerName)
 	}
 
 	srcPath := fmt.Sprintf("https://%s.blob.%s/%s", srcAccountName, storageEndpointSuffix, srcContainerName)

pkg/blob/controllerserver_test.go

@@ -1625,7 +1625,7 @@ func TestCopyVolume(t *testing.T) {
 					VolumeContentSource: &volumecontensource,
 				}
 
-				expectedErr := fmt.Errorf("One or more of srcAccountName(srcAccount), srcContainerName(), dstContainerName(dstContainer) are empty")
+				expectedErr := fmt.Errorf("One or more of srcAccountName(srcAccount), srcContainerName(), dstAccountName(dstAccount), dstContainerName(dstContainer) are empty")
 				err := d.copyVolume(req, "", nil, "dstAccount", "dstContainer", "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
@@ -1655,7 +1655,7 @@ func TestCopyVolume(t *testing.T) {
 					VolumeContentSource: &volumecontensource,
 				}
 
-				expectedErr := fmt.Errorf("One or more of srcAccountName(unit-test), srcContainerName(), dstContainerName(dstContainer) are empty")
+				expectedErr := fmt.Errorf("One or more of srcAccountName(unit-test), srcContainerName(), dstAccountName(dstAccount), dstContainerName(dstContainer) are empty")
 				err := d.copyVolume(req, "", nil, "dstAccount", "dstContainer", "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
@@ -1685,7 +1685,7 @@ func TestCopyVolume(t *testing.T) {
 					VolumeContentSource: &volumecontensource,
 				}
 
-				expectedErr := fmt.Errorf("One or more of srcAccountName(f5713de20cde511e8ba4900), srcContainerName(fileshare), dstContainerName() are empty")
+				expectedErr := fmt.Errorf("One or more of srcAccountName(f5713de20cde511e8ba4900), srcContainerName(fileshare), dstAccountName(), dstContainerName() are empty")
 				err := d.copyVolume(req, "", nil, "", "", "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)