Skip to content

Commit ab8a1fd

Browse files
committed
fix volume cloning sas token logged
1 parent 3d0478b commit ab8a1fd

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

pkg/blob/controllerserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
772772
}
773773
timeoutFunc := func() error {
774774
_, percent, _ := d.azcopy.GetAzcopyJob(dstContainerName, authAzcopyEnv)
775-
return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcPath, dstContainerName, percent)
775+
return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcContainerName, dstContainerName, percent)
776776
}
777777
copyErr := util.WaitUntilTimeout(time.Duration(d.waitForAzCopyTimeoutMinutes)*time.Minute, execFunc, timeoutFunc)
778778
if copyErr != nil {

pkg/blob/controllerserver_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -819,12 +819,6 @@ func TestCreateVolume(t *testing.T) {
819819

820820
m := util.NewMockEXEC(ctrl)
821821

822-
clientFactoryMock := mock_azclient.NewMockClientFactory(ctrl)
823-
blobClientMock := mock_blobcontainerclient.NewMockInterface(ctrl)
824-
blobClientMock.EXPECT().CreateContainer(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil)
825-
clientFactoryMock.EXPECT().GetBlobContainerClientForSub(gomock.Any()).Return(blobClientMock, nil)
826-
d.clientFactory = clientFactoryMock
827-
828822
listStr := "no error"
829823
m.EXPECT().RunCommand(gomock.Any(), gomock.Any()).Return(listStr, nil)
830824
d.azcopy.ExecCmd = m

0 commit comments

Comments
 (0)