diff --git a/.github/workflows/ci_examples_python.yml b/.github/workflows/ci_examples_python.yml index c400bdc40..83a79ff3a 100644 --- a/.github/workflows/ci_examples_python.yml +++ b/.github/workflows/ci_examples_python.yml @@ -94,5 +94,5 @@ jobs: run: | # Run simple examples tox -e dynamodbencryption - # Run migration examples - tox -e migration + # Run legacy migration examples + tox -e legacymigration diff --git a/Examples/runtimes/python/Migration/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/README.md b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/README.md similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/README.md rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/README.md diff --git a/Examples/runtimes/python/Migration/src/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/common.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/common.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/common.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/common.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/migration_step_1.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/migration_step_1.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/migration_step_2.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/migration_step_2.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/migration_step_3.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/client/migration_step_3.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/client/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/migration_step_1.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/migration_step_1.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/migration_step_2.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/migration_step_2.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/migration_step_3.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/paginator/migration_step_3.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/paginator/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/common.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/common.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/common.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/common.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/migration_step_1.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/migration_step_1.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/migration_step_2.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/migration_step_2.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/migration_step_3.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/resource/migration_step_3.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/resource/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/common.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/common.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/common.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/common.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/migration_step_1.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/migration_step_1.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/migration_step_2.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/migration_step_2.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/migration_step_3.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/awsdbe/table/migration_step_3.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/README.md b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/README.md similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/README.md rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/README.md diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/awsdbe/table/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/client/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/client/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/client/migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/client/migration_step_0.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/client/migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/client/migration_step_0.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/client/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/paginator/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/client/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/paginator/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/paginator/migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/paginator/migration_step_0.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/paginator/migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/paginator/migration_step_0.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/paginator/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/resource/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/paginator/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/resource/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/resource/migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/resource/migration_step_0.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/resource/migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/resource/migration_step_0.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/resource/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/table/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/resource/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/table/__init__.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/table/migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/table/migration_step_0.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/table/migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/src/ddbec/table/migration_step_0.py diff --git a/Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/table/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/ddbec_to_awsdbe/ddbec/table/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/__init__.py diff --git a/Examples/runtimes/python/Migration/src/plaintext_to_awsdbe/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/plaintext_to_awsdbe/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/__init__.py diff --git a/Examples/runtimes/python/Migration/src/plaintext_to_awsdbe/awsdbe/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/plaintext_to_awsdbe/awsdbe/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_1.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_1.py index 691384c47..db50e0bda 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_1.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_1.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.client import ( +from ....src.awsdbe.client import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.client import migration_step_0 +from ....src.ddbec.client import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_2.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_2.py index d276fc002..5734db996 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_2.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_2.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.client import ( +from ....src.awsdbe.client import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.client import migration_step_0 +from ....src.ddbec.client import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_3.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_3.py index 1f62e4b32..eab2b18b3 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/test_migration_step_3.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/client/test_migration_step_3.py @@ -12,12 +12,12 @@ DynamoDbItemEncryptor, ) -from .....src.ddbec_to_awsdbe.awsdbe.client import ( +from ....src.awsdbe.client import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.client import migration_step_0 +from ....src.ddbec.client import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/src/plaintext_to_awsdbe/plaintext/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/src/plaintext_to_awsdbe/plaintext/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_1.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_1.py index 8a284c7a9..dc3c5d615 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_1.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_1.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.paginator import ( +from ....src.awsdbe.paginator import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.paginator import migration_step_0 +from ....src.ddbec.paginator import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_2.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_2.py index 0f690cfa6..9f08252a7 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_2.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_2.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.paginator import ( +from ....src.awsdbe.paginator import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.paginator import migration_step_0 +from ....src.ddbec.paginator import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_3.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_3.py index ffa8ba1e9..c884d3143 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/test_migration_step_3.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/paginator/test_migration_step_3.py @@ -12,12 +12,12 @@ DynamoDbItemEncryptor, ) -from .....src.ddbec_to_awsdbe.awsdbe.paginator import ( +from ....src.awsdbe.paginator import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.paginator import migration_step_0 +from ....src.ddbec.paginator import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/test/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_1.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_1.py index 4bf65a6dd..fde9845a8 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_1.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_1.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.resource import ( +from ....src.awsdbe.resource import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.resource import migration_step_0 +from ....src.ddbec.resource import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_2.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_2.py index 7c07af889..c79a1b84e 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_2.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_2.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.resource import ( +from ....src.awsdbe.resource import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.resource import migration_step_0 +from ....src.ddbec.resource import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_3.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_3.py index ba5602ab3..72d05242d 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/test_migration_step_3.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/resource/test_migration_step_3.py @@ -12,12 +12,12 @@ DynamoDbItemEncryptor, ) -from .....src.ddbec_to_awsdbe.awsdbe.resource import ( +from ....src.awsdbe.resource import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.resource import migration_step_0 +from ....src.ddbec.resource import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_1.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_1.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_1.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_1.py index 0a7216ea7..8fed113b2 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_1.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_1.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.table import ( +from ....src.awsdbe.table import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.table import migration_step_0 +from ....src.ddbec.table import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_2.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_2.py similarity index 94% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_2.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_2.py index 58f9010c8..27330d236 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_2.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_2.py @@ -9,12 +9,12 @@ """ import pytest -from .....src.ddbec_to_awsdbe.awsdbe.table import ( +from ....src.awsdbe.table import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.table import migration_step_0 +from ....src.ddbec.table import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_3.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_3.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_3.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_3.py index fce9e4a9c..993ba82ca 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/test_migration_step_3.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/awsdbe/table/test_migration_step_3.py @@ -12,12 +12,12 @@ DynamoDbItemEncryptor, ) -from .....src.ddbec_to_awsdbe.awsdbe.table import ( +from ....src.awsdbe.table import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.table import migration_step_0 +from ....src.ddbec.table import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/client/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/client/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/client/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/client/test_migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/client/test_migration_step_0.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/client/test_migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/client/test_migration_step_0.py index 23591c113..9d908b669 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/client/test_migration_step_0.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/client/test_migration_step_0.py @@ -10,12 +10,12 @@ import pytest from dynamodb_encryption_sdk.exceptions import DecryptionError -from .....src.ddbec_to_awsdbe.awsdbe.client import ( +from ....src.awsdbe.client import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.client import migration_step_0 +from ....src.ddbec.client import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/paginator/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/paginator/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/paginator/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/paginator/test_migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/paginator/test_migration_step_0.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/paginator/test_migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/paginator/test_migration_step_0.py index ddcfc32c1..7383d1b32 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/paginator/test_migration_step_0.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/paginator/test_migration_step_0.py @@ -10,12 +10,12 @@ import pytest from dynamodb_encryption_sdk.exceptions import DecryptionError -from .....src.ddbec_to_awsdbe.awsdbe.paginator import ( +from ....src.awsdbe.paginator import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.paginator import migration_step_0 +from ....src.ddbec.paginator import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/resource/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/resource/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/resource/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/resource/test_migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/resource/test_migration_step_0.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/resource/test_migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/resource/test_migration_step_0.py index f39dfb58e..4265c368a 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/resource/test_migration_step_0.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/resource/test_migration_step_0.py @@ -10,12 +10,12 @@ import pytest from dynamodb_encryption_sdk.exceptions import DecryptionError -from .....src.ddbec_to_awsdbe.awsdbe.resource import ( +from ....src.awsdbe.resource import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.resource import migration_step_0 +from ....src.ddbec.resource import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/__init__.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/table/__init__.py similarity index 100% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/awsdbe/table/__init__.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/table/__init__.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/table/test_migration_step_0.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/table/test_migration_step_0.py similarity index 95% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/table/test_migration_step_0.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/table/test_migration_step_0.py index 05e532a24..6cc410fc5 100644 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/table/test_migration_step_0.py +++ b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/ddbec/table/test_migration_step_0.py @@ -10,12 +10,12 @@ import pytest from dynamodb_encryption_sdk.exceptions import DecryptionError -from .....src.ddbec_to_awsdbe.awsdbe.table import ( +from ....src.awsdbe.table import ( migration_step_1, migration_step_2, migration_step_3, ) -from .....src.ddbec_to_awsdbe.ddbec.table import migration_step_0 +from ....src.ddbec.table import migration_step_0 from ...test_utils import TEST_DDB_TABLE_NAME, TEST_KMS_KEY_ID pytestmark = [pytest.mark.examples] diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/test_utils.py b/Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/test_utils.py similarity index 100% rename from Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/test_utils.py rename to Examples/runtimes/python/Migration/ddbec_to_awsdbe/test/test_utils.py diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/__init__.py b/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/__init__.py deleted file mode 100644 index fa977e22f..000000000 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 -"""Stub to allow relative imports of examples from tests.""" diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/client/__init__.py b/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/client/__init__.py deleted file mode 100644 index fa977e22f..000000000 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/client/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 -"""Stub to allow relative imports of examples from tests.""" diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/paginator/__init__.py b/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/paginator/__init__.py deleted file mode 100644 index fa977e22f..000000000 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/paginator/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 -"""Stub to allow relative imports of examples from tests.""" diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/resource/__init__.py b/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/resource/__init__.py deleted file mode 100644 index fa977e22f..000000000 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/resource/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 -"""Stub to allow relative imports of examples from tests.""" diff --git a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/table/__init__.py b/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/table/__init__.py deleted file mode 100644 index fa977e22f..000000000 --- a/Examples/runtimes/python/Migration/test/ddbec_to_awsdbe/ddbec/table/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 -"""Stub to allow relative imports of examples from tests.""" diff --git a/Examples/runtimes/python/tox.ini b/Examples/runtimes/python/tox.ini index 525f3596c..eaf7153ac 100644 --- a/Examples/runtimes/python/tox.ini +++ b/Examples/runtimes/python/tox.ini @@ -1,7 +1,7 @@ [tox] isolated_build = True envlist = - py{311,312,313}-{dynamodbencryption,migration} + py{311,312,313}-{dynamodbencryption,legacymigration} [testenv:base-command] commands = poetry run pytest -s -v -l {posargs} @@ -15,4 +15,4 @@ commands_pre = poetry install --with test --no-root commands = dynamodbencryption: {[testenv:base-command]commands} DynamoDBEncryption/test/ - migration: {[testenv:base-command]commands} Migration/test/ \ No newline at end of file + legacymigration: {[testenv:base-command]commands} Migration/ddbec_to_awsdbe/test/ \ No newline at end of file