diff --git a/examples/src/aws_kms_encrypted_item.py b/examples/src/aws_kms_encrypted_item.py index 0e89a848..dd4eef4d 100644 --- a/examples/src/aws_kms_encrypted_item.py +++ b/examples/src/aws_kms_encrypted_item.py @@ -16,9 +16,9 @@ from dynamodb_encryption_sdk.encrypted import CryptoConfig from dynamodb_encryption_sdk.encrypted.item import decrypt_python_item, encrypt_python_item from dynamodb_encryption_sdk.identifiers import CryptoAction -from dynamodb_encryption_sdk.internal.formatting.transform import dict_to_ddb from dynamodb_encryption_sdk.material_providers.aws_kms import AwsKmsCryptographicMaterialsProvider from dynamodb_encryption_sdk.structures import AttributeActions, EncryptionContext, TableInfo +from dynamodb_encryption_sdk.transform import dict_to_ddb def encrypt_item(table_name, aws_cmk_id): diff --git a/src/dynamodb_encryption_sdk/encrypted/item.py b/src/dynamodb_encryption_sdk/encrypted/item.py index 8df4bfd9..1847642f 100644 --- a/src/dynamodb_encryption_sdk/encrypted/item.py +++ b/src/dynamodb_encryption_sdk/encrypted/item.py @@ -24,10 +24,10 @@ from dynamodb_encryption_sdk.internal.formatting.material_description import ( deserialize as deserialize_material_description, serialize as serialize_material_description ) -from dynamodb_encryption_sdk.internal.formatting.transform import ddb_to_dict, dict_to_ddb from dynamodb_encryption_sdk.internal.identifiers import ( MaterialDescriptionKeys, MaterialDescriptionValues, ReservedAttributes ) +from dynamodb_encryption_sdk.transform import ddb_to_dict, dict_to_ddb from . import CryptoConfig # noqa pylint: disable=unused-import __all__ = ('encrypt_dynamodb_item', 'encrypt_python_item', 'decrypt_dynamodb_item', 'decrypt_python_item') diff --git a/src/dynamodb_encryption_sdk/internal/formatting/transform.py b/src/dynamodb_encryption_sdk/transform.py similarity index 100% rename from src/dynamodb_encryption_sdk/internal/formatting/transform.py rename to src/dynamodb_encryption_sdk/transform.py diff --git a/test/functional/functional_test_utils.py b/test/functional/functional_test_utils.py index 1699f1e0..6a310bb5 100644 --- a/test/functional/functional_test_utils.py +++ b/test/functional/functional_test_utils.py @@ -29,12 +29,12 @@ from dynamodb_encryption_sdk.encrypted.resource import EncryptedResource from dynamodb_encryption_sdk.encrypted.table import EncryptedTable from dynamodb_encryption_sdk.identifiers import CryptoAction -from dynamodb_encryption_sdk.internal.formatting.transform import ddb_to_dict, dict_to_ddb from dynamodb_encryption_sdk.internal.identifiers import ReservedAttributes from dynamodb_encryption_sdk.material_providers.static import StaticCryptographicMaterialsProvider from dynamodb_encryption_sdk.material_providers.wrapped import WrappedCryptographicMaterialsProvider from dynamodb_encryption_sdk.materials.raw import RawDecryptionMaterials, RawEncryptionMaterials from dynamodb_encryption_sdk.structures import AttributeActions +from dynamodb_encryption_sdk.transform import ddb_to_dict, dict_to_ddb _DELEGATED_KEY_CACHE = defaultdict(lambda: defaultdict(dict)) TEST_TABLE_NAME = 'my_table' diff --git a/test/functional/internal/formatting/test_attribute.py b/test/functional/internal/formatting/test_attribute.py index 2c0de55e..6b726f46 100644 --- a/test/functional/internal/formatting/test_attribute.py +++ b/test/functional/internal/formatting/test_attribute.py @@ -18,7 +18,7 @@ from dynamodb_encryption_sdk.exceptions import DeserializationError, SerializationError from dynamodb_encryption_sdk.internal.formatting.deserialize.attribute import deserialize_attribute from dynamodb_encryption_sdk.internal.formatting.serialize.attribute import serialize_attribute -from dynamodb_encryption_sdk.internal.formatting.transform import ddb_to_dict, dict_to_ddb +from dynamodb_encryption_sdk.transform import ddb_to_dict, dict_to_ddb from ...functional_test_vector_generators import attribute_test_vectors from ...hypothesis_strategies import ddb_attribute_values, ddb_items, SLOW_SETTINGS, VERY_SLOW_SETTINGS