refactor(backup_service): remove destination_prefix field from MakeRestoreRequest (#175)

Author: ulya-sidorina

cmd/integration/make_backup/main.go

@@ -600,11 +600,11 @@ func main() {
 
 	restoreOperation, err := client.MakeRestore(
 		context.Background(), &pb.MakeRestoreRequest{
-			ContainerId:       containerID,
-			BackupId:          backupOperation.BackupId,
-			DatabaseName:      databaseName,
-			DatabaseEndpoint:  databaseEndpoint,
-			DestinationPrefix: "/tmp",
+			ContainerId:      containerID,
+			BackupId:         backupOperation.BackupId,
+			DatabaseName:     databaseName,
+			DatabaseEndpoint: databaseEndpoint,
+			DestinationPath:  "/tmp",
 		},
 	)
 	if err != nil {
@@ -632,12 +632,12 @@ func main() {
 
 	partialRestoreOperation, err := client.MakeRestore(
 		context.Background(), &pb.MakeRestoreRequest{
-			ContainerId:       containerID,
-			BackupId:          backupOperation.BackupId,
-			DatabaseName:      databaseName,
-			DatabaseEndpoint:  databaseEndpoint,
-			DestinationPrefix: "/partial_restore",
-			SourcePaths:       []string{"kv_test"},
+			ContainerId:      containerID,
+			BackupId:         backupOperation.BackupId,
+			DatabaseName:     databaseName,
+			DatabaseEndpoint: databaseEndpoint,
+			DestinationPath:  "/partial_restore",
+			SourcePaths:      []string{"kv_test"},
 		},
 	)
 	if err != nil {

internal/server/services/backup/backup_service.go

@@ -376,12 +376,6 @@ func (s *BackupService) MakeRestore(ctx context.Context, req *pb.MakeRestoreRequ
 		sourcePaths[fullPath] = true
 	}
 
-	// TODO: remove this code after full migration to DestinationPath
-	destinationPath := req.GetDestinationPath()
-	if len(destinationPath) == 0 {
-		destinationPath = req.GetDestinationPrefix()
-	}
-
 	s3Settings := types.ImportSettings{
 		Endpoint:         s.s3.Endpoint,
 		Region:           s.s3.Region,
@@ -394,7 +388,7 @@ func (s *BackupService) MakeRestore(ctx context.Context, req *pb.MakeRestoreRequ
 		BucketDbRoot:     backup.S3PathPrefix,
 		SourcePaths:      sourcePaths,
 		S3ForcePathStyle: s.s3.S3ForcePathStyle,
-		DestinationPath:  destinationPath,
+		DestinationPath:  req.GetDestinationPath(),
 	}
 
 	clientOperationID, err := s.clientConn.ImportFromS3(ctx, clientDriver, s3Settings, s.featureFlags)
@@ -421,7 +415,7 @@ func (s *BackupService) MakeRestore(ctx context.Context, req *pb.MakeRestoreRequ
 			Creator:   subject,
 		},
 		SourcePaths:     req.GetSourcePaths(),
-		DestinationPath: destinationPath,
+		DestinationPath: req.GetDestinationPath(),
 		UpdatedAt:       now,
 	}
 

pkg/proto/ydbcp/v1alpha1/backup_service.pb.go

@@ -111,8 +111,7 @@ message MakeRestoreRequest {
     string database_name = 3;
     // GRPC endpoint of the database.
     string database_endpoint = 4;
-    // The prefix for the destination path.
-    string destination_prefix = 5 [deprecated = true];
+    reserved 5;
     // Paths to s3 objects to restore.
     repeated string source_paths = 6;
     // Destination path to restore paths inside database,