Skip to content

Commit 434b4d8

Browse files
committed
fix
1 parent 899322e commit 434b4d8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/blob/controllerserver.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
763763
sourceVolumeID = req.GetVolumeContentSource().GetVolume().GetVolumeId()
764764

765765
}
766-
resourceGroupName, srcAccountName, srcContainerName, _, _, err := GetContainerInfo(sourceVolumeID) //nolint:dogsled
766+
srcResourceGroupName, srcAccountName, srcContainerName, _, srcSubscriptionID, err := GetContainerInfo(sourceVolumeID) //nolint:dogsled
767767
if err != nil {
768768
return status.Error(codes.NotFound, err.Error())
769769
}
@@ -777,8 +777,8 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
777777
if srcAccountName != dstAccountName && dstAccountSasToken != "" {
778778
srcAccountOptions := &azure.AccountOptions{
779779
Name: srcAccountName,
780-
ResourceGroup: accountOptions.ResourceGroup,
781-
SubscriptionID: accountOptions.SubscriptionID,
780+
ResourceGroup: srcResourceGroupName,
781+
SubscriptionID: srcSubscriptionID,
782782
GetLatestAccountKey: accountOptions.GetLatestAccountKey,
783783
}
784784
if srcAccountSasToken, _, err = d.getAzcopyAuth(ctx, srcAccountName, "", storageEndpointSuffix, srcAccountOptions, nil, "", secretNamespace); err != nil {
@@ -809,7 +809,7 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
809809
}
810810
copyErr := util.WaitUntilTimeout(time.Duration(d.waitForAzCopyTimeoutMinutes)*time.Minute, execFunc, timeoutFunc)
811811
if copyErr != nil {
812-
klog.Warningf("CopyBlobContainer(%s, %s, %s) failed with error: %v", resourceGroupName, dstAccountName, dstContainerName, copyErr)
812+
klog.Warningf("CopyBlobContainer(%s, %s, %s) failed with error: %v", accountOptions.ResourceGroup, dstAccountName, dstContainerName, copyErr)
813813
} else {
814814
klog.V(2).Infof("copied blob container %s to %s successfully", srcContainerName, dstContainerName)
815815
}

0 commit comments

Comments
 (0)