@@ -763,7 +763,7 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
763
763
sourceVolumeID = req .GetVolumeContentSource ().GetVolume ().GetVolumeId ()
764
764
765
765
}
766
- resourceGroupName , srcAccountName , srcContainerName , _ , _ , err := GetContainerInfo (sourceVolumeID ) //nolint:dogsled
766
+ srcResourceGroupName , srcAccountName , srcContainerName , _ , srcSubscriptionID , err := GetContainerInfo (sourceVolumeID ) //nolint:dogsled
767
767
if err != nil {
768
768
return status .Error (codes .NotFound , err .Error ())
769
769
}
@@ -777,8 +777,8 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
777
777
if srcAccountName != dstAccountName && dstAccountSasToken != "" {
778
778
srcAccountOptions := & azure.AccountOptions {
779
779
Name : srcAccountName ,
780
- ResourceGroup : accountOptions . ResourceGroup ,
781
- SubscriptionID : accountOptions . SubscriptionID ,
780
+ ResourceGroup : srcResourceGroupName ,
781
+ SubscriptionID : srcSubscriptionID ,
782
782
GetLatestAccountKey : accountOptions .GetLatestAccountKey ,
783
783
}
784
784
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
809
809
}
810
810
copyErr := util .WaitUntilTimeout (time .Duration (d .waitForAzCopyTimeoutMinutes )* time .Minute , execFunc , timeoutFunc )
811
811
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 )
813
813
} else {
814
814
klog .V (2 ).Infof ("copied blob container %s to %s successfully" , srcContainerName , dstContainerName )
815
815
}
0 commit comments