Skip to content

Commit 21e4ce7

Browse files
author
Lucas McDonald
committed
m
1 parent 2c836f0 commit 21e4ce7

File tree

17 files changed

+33
-32
lines changed

17 files changed

+33
-32
lines changed

‎TestVectors/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ SERVICE_DEPS_DDBEncryption := \
8888
DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms \
8989
DynamoDbEncryption/dafny/DynamoDbEncryption \
9090
DynamoDbEncryption/dafny/DynamoDbItemEncryptor \
91-
DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms \
91+
DynamoDbEncryption/dafny/StructuredEncryption \
9292
submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders \
9393

9494
SERVICE_DEPS_WrappedDynamoDbItemEncryptor := \
@@ -110,7 +110,7 @@ SED_BEFORE_STRING=' \#\[cfg(feature = "wrapped-client")\]' SED_AFTER_STRING='\/\
110110

111111
# Python
112112

113-
PYTHON_MODULE_NAME=aws_dbesdk_ddb_test_vectors
113+
PYTHON_MODULE_NAME=aws_dbesdk_dynamodb_test_vectors
114114

115115
TRANSLATION_RECORD_PYTHON := \
116116
--translation-record ../submodules/MaterialProviders/StandardLibrary/runtimes/python/src/smithy_dafny_standard_library/internaldafny/generated/dafny_src-py.dtr \
@@ -147,12 +147,12 @@ _sed_types_file_add_extern:
147147

148148
test_python_client_interface:
149149
rm -rf runtimes/python/.tox
150-
python3 -m tox -c runtimes/python/test/client
150+
python3 -m tox -c runtimes/python --workdir runtimes/python/test/client
151151

152152
test_python_resource_interface:
153153
rm -rf runtimes/python/.tox
154-
python3 -m tox -c runtimes/python/test/resource
154+
python3 -m tox -c runtimes/python --workdir runtimes/python/test/resource
155155

156156
test_python_table_interface:
157157
rm -rf runtimes/python/.tox
158-
python3 -m tox -c runtimes/python/test/table
158+
python3 -m tox -c runtimes/python --workdir runtimes/python/test/table

‎TestVectors/runtimes/python/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
description = ""
55
authors = ["AWS Crypto Tools <[email protected]>"]
66
packages = [
7-
{ include = "dbesdk_ddb_test_vectors", from = "src" },
7+
{ include = "aws_dbesdk_dynamodb_test_vectors", from = "src" },
88
]
99
# Include all of the following .gitignored files in package distributions,
1010
# even though it is not included in version control
@@ -17,6 +17,7 @@ aws-cryptography-internal-mpl-testvectors = { path = "../../../submodules/Materi
1717

1818
[tool.poetry.group.test.dependencies]
1919
pytest = "^7.4.0"
20+
tox = "^3"
2021

2122
[build-system]
2223
requires = ["poetry-core<2.0.0"]

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/__init__.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/__init__.py

File renamed without changes.

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/internaldafny/extern/CreateInterceptedDDBClient.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBClient.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import boto3
2-
import dbesdk_ddb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient
2+
import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient
33
import aws_cryptography_internal_dynamodb.internaldafny.extern
44
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_DynamoDbTablesEncryptionConfig
55
from aws_dbesdk_dynamodb.encrypted.client import EncryptedClient
66
from smithy_dafny_standard_library.internaldafny.generated import Wrappers
77
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.errors import _smithy_error_to_dafny_error
8-
from dbesdk_ddb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
8+
from aws_dbesdk_dynamodb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
99

1010
class default__:
1111
@staticmethod
@@ -25,4 +25,4 @@ def CreateInterceptedDDBClient(dafny_encryption_config):
2525
except Exception as e:
2626
return Wrappers.Result_Failure(_smithy_error_to_dafny_error(e))
2727

28-
dbesdk_ddb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient.default__ = default__
28+
aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient.default__ = default__

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/internaldafny/extern/CreateInterceptedDDBResource.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBResource.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import boto3
22
import types
3-
import dbesdk_ddb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient
3+
import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient
44
import aws_cryptography_internal_dynamodb.internaldafny.extern
55
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_DynamoDbTablesEncryptionConfig
66
from aws_dbesdk_dynamodb.encrypted.table import EncryptedTable
77
from aws_dbesdk_dynamodb.encrypted.resource import EncryptedResource
88
from smithy_dafny_standard_library.internaldafny.generated import Wrappers
99
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.errors import _smithy_error_to_dafny_error
10-
from dbesdk_ddb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
10+
from aws_dbesdk_dynamodb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
1111
from aws_dbesdk_dynamodb.transform import (
1212
dict_to_ddb,
1313
ddb_to_dict,
@@ -159,4 +159,4 @@ def CreateInterceptedDDBClient(dafny_encryption_config):
159159
except Exception as e:
160160
return Wrappers.Result_Failure(_smithy_error_to_dafny_error(e))
161161

162-
dbesdk_ddb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient.default__ = default__
162+
aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient.default__ = default__

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/internaldafny/extern/CreateInterceptedDDBTable.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateInterceptedDDBTable.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import boto3
22
import types
3-
import dbesdk_ddb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient
3+
import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient
44
import aws_cryptography_internal_dynamodb.internaldafny.extern
55
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_DynamoDbTablesEncryptionConfig
66
from aws_dbesdk_dynamodb.encrypted.table import (
@@ -10,7 +10,7 @@
1010
from aws_dbesdk_dynamodb.internal.client_to_resource import ClientShapeToResourceShapeConverter
1111
from smithy_dafny_standard_library.internaldafny.generated import Wrappers
1212
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb.errors import _smithy_error_to_dafny_error
13-
from dbesdk_ddb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
13+
from aws_dbesdk_dynamodb_test_vectors.waiting_boto3_ddb_client import WaitingDynamoClient
1414
from aws_dbesdk_dynamodb.transform import (
1515
dict_to_ddb,
1616
ddb_to_dict,
@@ -461,4 +461,4 @@ def CreateInterceptedDDBClient(dafny_encryption_config):
461461
except Exception as e:
462462
return Wrappers.Result_Failure(_smithy_error_to_dafny_error(e))
463463

464-
dbesdk_ddb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient.default__ = default__
464+
aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateInterceptedDDBClient.default__ = default__

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/internaldafny/extern/CreateWrappedDictItemEncryptor.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateWrappedDictItemEncryptor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import boto3
2-
import dbesdk_ddb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor
2+
import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor
33
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_DynamoDbItemEncryptorConfig
44
from aws_dbesdk_dynamodb.encrypted.item import ItemEncryptor
55
from smithy_dafny_standard_library.internaldafny.generated import Wrappers
66
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.errors import _smithy_error_to_dafny_error
7-
from dbesdk_ddb_test_vectors.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.shim import DynamoDbItemEncryptorShim
7+
from aws_dbesdk_dynamodb_test_vectors.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.shim import DynamoDbItemEncryptorShim
88
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.models import (
99
DecryptItemInput,
1010
DecryptItemOutput,
@@ -83,4 +83,4 @@ def CreateWrappedItemEncryptor(dafny_encryption_config):
8383
except Exception as e:
8484
return Wrappers.Result_Failure(_smithy_error_to_dafny_error(e))
8585

86-
dbesdk_ddb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor.default__ = default__
86+
aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor.default__ = default__

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/internaldafny/extern/CreateWrappedDynamoDbItemEncryptor.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/CreateWrappedDynamoDbItemEncryptor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import boto3
2-
import dbesdk_ddb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor
2+
import aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor
33
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.dafny_to_smithy import aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor_DynamoDbItemEncryptorConfig
44
from aws_dbesdk_dynamodb.encrypted.item import ItemEncryptor
55
from smithy_dafny_standard_library.internaldafny.generated import Wrappers
66
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.errors import _smithy_error_to_dafny_error
7-
from dbesdk_ddb_test_vectors.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.shim import DynamoDbItemEncryptorShim
7+
from aws_dbesdk_dynamodb_test_vectors.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.shim import DynamoDbItemEncryptorShim
88
from aws_dbesdk_dynamodb.smithygenerated.aws_cryptography_dbencryptionsdk_dynamodb_itemencryptor.models import (
99
DecryptItemInput,
1010
EncryptItemInput,
@@ -24,4 +24,4 @@ def CreateWrappedItemEncryptor(dafny_encryption_config):
2424
except Exception as e:
2525
return Wrappers.Result_Failure(_smithy_error_to_dafny_error(e))
2626

27-
dbesdk_ddb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor.default__ = default__
27+
aws_dbesdk_dynamodb_test_vectors.internaldafny.generated.CreateWrappedItemEncryptor.default__ = default__

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/internaldafny/extern/__init__.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/internaldafny/extern/__init__.py

File renamed without changes.

‎TestVectors/runtimes/python/src/dbesdk_ddb_test_vectors/smithygenerated/aws_cryptography_dbencryptionsdk_dynamodb/__init__.py renamed to ‎TestVectors/runtimes/python/src/aws_dbesdk_dynamodb_test_vectors/smithygenerated/aws_cryptography_dbencryptionsdk_dynamodb/__init__.py

File renamed without changes.

0 commit comments

Comments
 (0)