[Disk Manager] fix

cloud/disk_manager/internal/pkg/resources/images.go

@@ -311,28 +311,26 @@ func (s *storageYDB) createImage(
 	image ImageMeta,
 ) (ImageMeta, error) {
 
-	var emptyImageMeta ImageMeta
-
 	tx, err := session.BeginRWTransaction(ctx)
 	if err != nil {
-		return emptyImageMeta, err
+		return ImageMeta{}, err
 	}
 
 	defer tx.Rollback(ctx)
 
 	// HACK: see NBS-974 for details.
 	snapshotExists, err := s.snapshotExists(ctx, tx, image.ID)
 	if err != nil {
-		return emptyImageMeta, err
+		return ImageMeta{}, err
 	}
 
 	if snapshotExists {
 		err = tx.Commit(ctx)
 		if err != nil {
-			return emptyImageMeta, err
+			return ImageMeta{}, err
 		}
 
-		return emptyImageMeta, errors.NewNonCancellableErrorf(
+		return ImageMeta{}, errors.NewNonCancellableErrorf(
 			"image with id %v can't be created, because snapshot with id %v already exists",
 			image.ID,
 			image.ID,
@@ -341,7 +339,7 @@ func (s *storageYDB) createImage(
 
 	createRequest, err := proto.Marshal(image.CreateRequest)
 	if err != nil {
-		return emptyImageMeta, errors.NewNonRetriableErrorf(
+		return ImageMeta{}, errors.NewNonRetriableErrorf(
 			"failed to marshal create request for image with id %v: %w",
 			image.ID,
 			err,
@@ -360,27 +358,27 @@ func (s *storageYDB) createImage(
 		persistence.ValueParam("$id", persistence.UTF8Value(image.ID)),
 	)
 	if err != nil {
-		return emptyImageMeta, err
+		return ImageMeta{}, err
 	}
 
 	defer res.Close()
 
 	states, err := scanImageStates(ctx, res)
 	if err != nil {
-		return emptyImageMeta, err
+		return ImageMeta{}, err
 	}
 
 	if len(states) != 0 {
 		err = tx.Commit(ctx)
 		if err != nil {
-			return emptyImageMeta, err
+			return ImageMeta{}, err
 		}
 
 		state := states[0]
 
 		if state.status >= imageStatusDeleting {
 			logging.Info(ctx, "can't create already deleting/deleted image with id %v", image.ID)
-			return emptyImageMeta, errors.NewSilentNonRetriableErrorf(
+			return ImageMeta{}, errors.NewSilentNonRetriableErrorf(
 				"can't create already deleting/deleted image with id %v",
 				image.ID,
 			)
@@ -394,7 +392,7 @@ func (s *storageYDB) createImage(
 			return *state.toImageMeta(), nil
 		}
 
-		return emptyImageMeta, errors.NewNonCancellableErrorf(
+		return ImageMeta{}, errors.NewNonCancellableErrorf(
 			"image with different params already exists, old=%v, new=%v",
 			state,
 			image,
@@ -425,7 +423,7 @@ func (s *storageYDB) createImage(
 		case nil:
 			state.encryptionKeyHash = nil
 		default:
-			return emptyImageMeta, errors.NewNonRetriableErrorf(
+			return ImageMeta{}, errors.NewNonRetriableErrorf(
 				"unknown key %s",
 				key,
 			)
@@ -447,12 +445,12 @@ func (s *storageYDB) createImage(
 		persistence.ValueParam("$states", persistence.ListValue(state.structValue())),
 	)
 	if err != nil {
-		return emptyImageMeta, err
+		return ImageMeta{}, err
 	}
 
 	err = tx.Commit(ctx)
 	if err != nil {
-		return emptyImageMeta, err
+		return ImageMeta{}, err
 	}
 
 	return *state.toImageMeta(), nil

cloud/disk_manager/internal/pkg/resources/snapshots.go

@@ -298,27 +298,25 @@ func (s *storageYDB) createSnapshot(
 	snapshot SnapshotMeta,
 ) (SnapshotMeta, error) {
 
-	var emptySnapshotMeta SnapshotMeta
-
 	tx, err := session.BeginRWTransaction(ctx)
 	if err != nil {
-		return emptySnapshotMeta, err
+		return SnapshotMeta{}, err
 	}
 	defer tx.Rollback(ctx)
 
 	// HACK: see NBS-974 for details.
 	imageExists, err := s.imageExists(ctx, tx, snapshot.ID)
 	if err != nil {
-		return emptySnapshotMeta, err
+		return SnapshotMeta{}, err
 	}
 
 	if imageExists {
 		err = tx.Commit(ctx)
 		if err != nil {
-			return emptySnapshotMeta, err
+			return SnapshotMeta{}, err
 		}
 
-		return emptySnapshotMeta, errors.NewNonCancellableErrorf(
+		return SnapshotMeta{}, errors.NewNonCancellableErrorf(
 			"snapshot with id %v can't be created, because image with id %v already exists",
 			snapshot.ID,
 			snapshot.ID,
@@ -327,7 +325,7 @@ func (s *storageYDB) createSnapshot(
 
 	createRequest, err := proto.Marshal(snapshot.CreateRequest)
 	if err != nil {
-		return emptySnapshotMeta, errors.NewNonRetriableErrorf(
+		return SnapshotMeta{}, errors.NewNonRetriableErrorf(
 			"failed to marshal create request for snapshot with id %v: %w",
 			snapshot.ID,
 			err,
@@ -346,26 +344,26 @@ func (s *storageYDB) createSnapshot(
 		persistence.ValueParam("$id", persistence.UTF8Value(snapshot.ID)),
 	)
 	if err != nil {
-		return emptySnapshotMeta, err
+		return SnapshotMeta{}, err
 	}
 	defer res.Close()
 
 	states, err := scanSnapshotStates(ctx, res)
 	if err != nil {
-		return emptySnapshotMeta, err
+		return SnapshotMeta{}, err
 	}
 
 	if len(states) != 0 {
 		err = tx.Commit(ctx)
 		if err != nil {
-			return emptySnapshotMeta, err
+			return SnapshotMeta{}, err
 		}
 
 		state := states[0]
 
 		if state.status >= snapshotStatusDeleting {
 			logging.Info(ctx, "can't create already deleting/deleted snapshot with id %v", snapshot.ID)
-			return emptySnapshotMeta, errors.NewSilentNonRetriableErrorf(
+			return SnapshotMeta{}, errors.NewSilentNonRetriableErrorf(
 				"can't create already deleting/deleted snapshot with id %v",
 				snapshot.ID,
 			)
@@ -379,7 +377,7 @@ func (s *storageYDB) createSnapshot(
 			return *state.toSnapshotMeta(), nil
 		}
 
-		return emptySnapshotMeta, errors.NewNonCancellableErrorf(
+		return SnapshotMeta{}, errors.NewNonCancellableErrorf(
 			"snapshot with different params already exists, old=%v, new=%v",
 			state,
 			snapshot,
@@ -410,7 +408,7 @@ func (s *storageYDB) createSnapshot(
 		case nil:
 			state.encryptionKeyHash = nil
 		default:
-			return emptySnapshotMeta, errors.NewNonRetriableErrorf(
+			return SnapshotMeta{}, errors.NewNonRetriableErrorf(
 				"unknown key %s",
 				key,
 			)
@@ -432,12 +430,12 @@ func (s *storageYDB) createSnapshot(
 		persistence.ValueParam("$states", persistence.ListValue(state.structValue())),
 	)
 	if err != nil {
-		return emptySnapshotMeta, err
+		return SnapshotMeta{}, err
 	}
 
 	err = tx.Commit(ctx)
 	if err != nil {
-		return emptySnapshotMeta, err
+		return SnapshotMeta{}, err
 	}
 
 	return *state.toSnapshotMeta(), nil