fix build

ydb-platform · May 16, 2024 · 7e6bb3b · 7e6bb3b
1 parent 7e3a8c0
commit 7e6bb3b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/cloud/disk_manager/internal/pkg/dataplane/url/qcow2/tests/qcow2_test.go b/cloud/disk_manager/internal/pkg/dataplane/url/qcow2/tests/qcow2_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/common"
 	common_testing "github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/common/testing"
 	"github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/qcow2"
-	"github.com/ydb-platform/nbs/cloud/tasks/errors"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -41,17 +40,9 @@ func getQCOW2Reader(
 	reader common.Reader,
 ) common.ImageMapReader {
 
-	qcow2Reader := qcow2.NewImageMapReader(reader)
-
-	for {
-		err := qcow2Reader.ReadHeader(ctx)
-		if !errors.CanRetry(err) {
-			require.NoError(t, err)
-			break
-		}
-	}
-
-	return qcow2Reader
+	imageMapReader, err := qcow2.NewImageMapReader(ctx, reader)
+	require.NoError(t, err)
+	return imageMapReader
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cloud/disk_manager/internal/pkg/dataplane/url/vhd/tests/vhd_test.go b/cloud/disk_manager/internal/pkg/dataplane/url/vhd/tests/vhd_test.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/common"
 	common_testing "github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/common/testing"
 	"github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/vhd"
@@ -30,7 +31,9 @@ func getVHDReader(
 	reader common.Reader,
 ) common.ImageMapReader {
 
-	return vhd.NewImageMapReader(reader)
+	imageMapReader, err := vhd.NewImageMapReader(ctx, reader)
+	require.NoError(t, err)
+	return imageMapReader
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cloud/disk_manager/internal/pkg/dataplane/url/vmdk/tests/vmdk_test.go b/cloud/disk_manager/internal/pkg/dataplane/url/vmdk/tests/vmdk_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/common"
 	common_testing "github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/common/testing"
 	"github.com/ydb-platform/nbs/cloud/disk_manager/internal/pkg/dataplane/url/vmdk"
-	"github.com/ydb-platform/nbs/cloud/tasks/errors"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -41,17 +40,9 @@ func getVMDKReader(
 	reader common.Reader,
 ) common.ImageMapReader {
 
-	vmdkReader := vmdk.NewImageMapReader(reader)
-
-	for {
-		err := vmdkReader.ReadHeader(ctx)
-		if !errors.CanRetry(err) {
-			require.NoError(t, err)
-			break
-		}
-	}
-
-	return vmdkReader
+	imageMapReader, err := vmdk.NewImageMapReader(ctx, reader)
+	require.NoError(t, err)
+	return imageMapReader
 }
 
 ////////////////////////////////////////////////////////////////////////////////