starred/deltaglider
1
0
Fork 0
mirror of https://github.com/beshu-tech/deltaglider.git synced 2026-04-23 16:58:33 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

feat: Enhance S3 migration CLI with new commands and EC2 detection option

Browse Source
This commit is contained in:
Simone Scarduzio
2025-10-12 23:12:32 +02:00
parent b2ca59490b
commit aea5cb5d9a
5 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/integration/test_s3_migration.py
View File

@@ -1,7 +1,5 @@
"""Test S3-to-S3 migration functionality."""
import tempfile
from pathlib import Path
from unittest.mock import MagicMock, patch
import pytest
@@ -68,21 +66,21 @@ def test_migrate_s3_to_s3_with_resume(mock_service):
mock_service.storage.list.side_effect = list_side_effect
# Mock the copy operation and click functions
# Use quiet=True to skip EC2 detection logging
with patch("deltaglider.app.cli.aws_compat.copy_s3_to_s3") as mock_copy:
with patch("deltaglider.app.cli.aws_compat.click.echo") as mock_echo:
with patch("deltaglider.app.cli.aws_compat.click.confirm", return_value=True):
migrate_s3_to_s3(
mock_service,
"s3://source-bucket/",
"s3://dest-bucket/",
exclude=None,
include=None,
quiet=False,
no_delta=False,
max_ratio=None,
dry_run=False,
skip_confirm=False,
)
with patch("deltaglider.app.cli.aws_compat.click.confirm", return_value=True):
migrate_s3_to_s3(
mock_service,
"s3://source-bucket/",
"s3://dest-bucket/",
exclude=None,
include=None,
quiet=True, # Skip EC2 detection and logging
no_delta=False,
max_ratio=None,
dry_run=False,
skip_confirm=False,
)
# Should copy only file2.zip and subdir/file3.zip (file1 already exists)
assert mock_copy.call_count == 2
@@ -92,7 +90,10 @@ def test_migrate_s3_to_s3_with_resume(mock_service):
migrated_files = [(args[1], args[2]) for args in call_args]
assert ("s3://source-bucket/file2.zip", "s3://dest-bucket/file2.zip") in migrated_files
assert ("s3://source-bucket/subdir/file3.zip", "s3://dest-bucket/subdir/file3.zip") in migrated_files
assert (
"s3://source-bucket/subdir/file3.zip",
"s3://dest-bucket/subdir/file3.zip",
) in migrated_files
def test_migrate_s3_to_s3_dry_run(mock_service):
@@ -118,7 +119,7 @@ def test_migrate_s3_to_s3_dry_run(mock_service):
"s3://dest-bucket/",
exclude=None,
include=None,
quiet=False,
quiet=True, # Skip EC2 detection
no_delta=False,
max_ratio=None,
dry_run=True,
@@ -172,7 +173,7 @@ def test_migrate_s3_to_s3_with_filters(mock_service):
"s3://dest-bucket/",
exclude="*.log",
include=None,
quiet=False,
quiet=True, # Skip EC2 detection
no_delta=False,
max_ratio=None,
dry_run=False,
@@ -213,7 +214,7 @@ def test_migrate_s3_to_s3_skip_confirm(mock_service):
"s3://dest-bucket/",
exclude=None,
include=None,
quiet=False,
quiet=True, # Skip EC2 detection
no_delta=False,
max_ratio=None,
dry_run=False,
@@ -255,7 +256,7 @@ def test_migrate_s3_to_s3_with_prefix(mock_service):
"s3://dest-bucket/archive/",
exclude=None,
include=None,
quiet=False,
quiet=True, # Skip EC2 detection
no_delta=False,
max_ratio=None,
dry_run=False,
@@ -266,4 +267,4 @@ def test_migrate_s3_to_s3_with_prefix(mock_service):
mock_copy.assert_called_once()
call_args = mock_copy.call_args[0]
assert call_args[1] == "s3://source-bucket/data/file1.zip"
assert call_args[2] == "s3://dest-bucket/archive/file1.zip"
assert call_args[2] == "s3://dest-bucket/archive/file1.zip"