Skip to content

Commit 6a4e39a

Browse files
author
Lucas McDonald
committed
m
1 parent a980548 commit 6a4e39a

File tree

5 files changed

+29
-19
lines changed

5 files changed

+29
-19
lines changed

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/encrypted/client.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def transact_write_items(self, **kwargs) -> dict[str, Any]:
355355

356356
def delete_item(self, **kwargs):
357357
"""
358-
Delete an item from a table by the specified key.
358+
Delete an item from a table by the specified key.
359359
360360
The input and output syntaxes match those for the boto3 DynamoDB client ``delete_item`` API:
361361
@@ -382,7 +382,7 @@ def delete_item(self, **kwargs):
382382
output_item_to_dict_transform_method=self._client_to_resource_shape_converter.delete_item_response,
383383
output_item_to_ddb_transform_method=self._resource_to_client_shape_converter.delete_item_response,
384384
)
385-
385+
386386
def execute_statement(self, **kwargs):
387387
"""
388388
Not implemented. Raises DynamoDbEncryptionTransformsException.
@@ -454,7 +454,7 @@ def update_item(self, **kwargs):
454454
output_item_to_dict_transform_method=self._client_to_resource_shape_converter.update_item_response,
455455
output_item_to_ddb_transform_method=self._resource_to_client_shape_converter.update_item_response,
456456
)
457-
457+
458458
def batch_execute_statement(self, **kwargs):
459459
"""
460460
Not implemented. Raises DynamoDbEncryptionTransformsException.
@@ -478,7 +478,6 @@ def batch_execute_statement(self, **kwargs):
478478
output_item_to_dict_transform_method=self._client_to_resource_shape_converter.batch_execute_statement_response,
479479
output_item_to_ddb_transform_method=self._resource_to_client_shape_converter.batch_execute_statement_response,
480480
)
481-
482481

483482
def get_paginator(self, operation_name: str) -> EncryptedPaginator | botocore.client.Paginator:
484483
"""

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/internal/client_to_resource.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,27 +104,27 @@ def update_item_request(self, update_item_request):
104104

105105
def update_item_response(self, update_item_response):
106106
return self.boto3_converter.UpdateItemOutput(update_item_response)
107-
107+
108108
def batch_execute_statement_request(self, batch_execute_statement_request):
109109
return self.boto3_converter.BatchExecuteStatementInput(batch_execute_statement_request)
110-
110+
111111
def batch_execute_statement_response(self, batch_execute_statement_response):
112112
return self.boto3_converter.BatchExecuteStatementOutput(batch_execute_statement_response)
113-
113+
114114
def delete_item_request(self, delete_item_request):
115115
return self.boto3_converter.DeleteItemInput(delete_item_request)
116-
116+
117117
def delete_item_response(self, delete_item_response):
118118
return self.boto3_converter.DeleteItemOutput(delete_item_response)
119-
119+
120120
def execute_statement_request(self, execute_statement_request):
121121
return self.boto3_converter.ExecuteStatementInput(execute_statement_request)
122-
122+
123123
def execute_statement_response(self, execute_statement_response):
124124
return self.boto3_converter.ExecuteStatementOutput(execute_statement_response)
125-
125+
126126
def execute_transaction_request(self, execute_transaction_request):
127127
return self.boto3_converter.ExecuteTransactionInput(execute_transaction_request)
128-
128+
129129
def execute_transaction_response(self, execute_transaction_response):
130130
return self.boto3_converter.ExecuteTransactionOutput(execute_transaction_response)

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/internal/resource_to_client.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,22 +129,22 @@ def batch_write_item_request(self, batch_write_item_request):
129129

130130
def batch_write_item_response(self, batch_write_item_response):
131131
return self.boto3_converter.BatchWriteItemOutput(batch_write_item_response)
132-
132+
133133
def batch_execute_statement_request(self, batch_execute_statement_request):
134134
return self.boto3_converter.BatchExecuteStatementInput(batch_execute_statement_request)
135-
135+
136136
def batch_execute_statement_response(self, batch_execute_statement_response):
137137
return self.boto3_converter.BatchExecuteStatementOutput(batch_execute_statement_response)
138-
138+
139139
def execute_statement_request(self, execute_statement_request):
140140
return self.boto3_converter.ExecuteStatementInput(execute_statement_request)
141-
141+
142142
def execute_statement_response(self, execute_statement_response):
143143
return self.boto3_converter.ExecuteStatementOutput(execute_statement_response)
144-
144+
145145
def execute_transaction_request(self, execute_transaction_request):
146146
return self.boto3_converter.ExecuteTransactionInput(execute_transaction_request)
147-
147+
148148
def execute_transaction_response(self, execute_transaction_response):
149149
return self.boto3_converter.ExecuteTransactionOutput(execute_transaction_response)
150150

DynamoDbEncryption/runtimes/python/test/integ/encrypted/test_client.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ def get_item_request(expect_standard_dictionaries, test_item):
158158
return {**basic_get_item_request_dict(test_item), "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
159159
return basic_get_item_request_ddb(test_item)
160160

161+
161162
@pytest.fixture
162163
def delete_item_request(expect_standard_dictionaries, test_item):
163164
if expect_standard_dictionaries:
@@ -387,6 +388,7 @@ def test_WHEN_update_item_THEN_raises_DynamoDbEncryptionTransformsException():
387388
ExpressionAttributeValues={":val": {"S": "new value"}},
388389
)
389390

391+
390392
def test_WHEN_execute_statement_THEN_raises_DynamoDbEncryptionTransformsException():
391393
"""Test that execute_statement raises DynamoDbEncryptionTransformsException."""
392394
# Given: Encrypted client and update item parameters
@@ -397,6 +399,7 @@ def test_WHEN_execute_statement_THEN_raises_DynamoDbEncryptionTransformsExceptio
397399
Statement="SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
398400
)
399401

402+
400403
def test_WHEN_execute_transaction_THEN_raises_DynamoDbEncryptionTransformsException():
401404
"""Test that execute_transaction raises DynamoDbEncryptionTransformsException."""
402405
# Given: Encrypted client and update item parameters
@@ -412,6 +415,7 @@ def test_WHEN_execute_transaction_THEN_raises_DynamoDbEncryptionTransformsExcept
412415
],
413416
)
414417

418+
415419
def test_WHEN_batch_execute_statement_THEN_raises_DynamoDbEncryptionTransformsException():
416420
"""Test that batch_execute_statement raises DynamoDbEncryptionTransformsException."""
417421
# Given: Encrypted client and update item parameters
@@ -427,6 +431,7 @@ def test_WHEN_batch_execute_statement_THEN_raises_DynamoDbEncryptionTransformsEx
427431
],
428432
)
429433

434+
430435
def test_WHEN_get_paginator_THEN_correct_paginator_is_returned():
431436
"""Test get_paginator for scan and query operations."""
432437
# Given: Encrypted client

DynamoDbEncryption/runtimes/python/test/requests.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ def base_get_item_request(item):
1616
"""Base structure for get_item requests."""
1717
return {"Key": {"partition_key": item["partition_key"], "sort_key": item["sort_key"]}}
1818

19+
1920
def base_delete_item_request(item):
2021
"""Base structure for delete_item requests."""
2122
return {"Key": {"partition_key": item["partition_key"], "sort_key": item["sort_key"]}}
2223

24+
2325
def base_query_request(item):
2426
"""Base structure for query requests."""
2527
return {
@@ -110,13 +112,14 @@ def base_exhaustive_get_item_request(item):
110112
"AttributesToGet": ["partition_key", "sort_key", "attribute1", "attribute2"],
111113
}
112114

115+
113116
def base_exhaustive_delete_item_request(item):
114117
"""
115118
Base structure for exhaustive delete_item requests.
116119
This is not intended to be able to be used as a real request.
117120
Some parameters conflict with each other when sent to DynamoDB.
118121
This is only intended to test the conversion of the request from client to resource format.
119-
"""
122+
"""
120123
return {
121124
"ReturnConsumedCapacity": "TOTAL",
122125
"ReturnItemCollectionMetrics": "SIZE",
@@ -210,6 +213,7 @@ def basic_delete_item_request_ddb(item):
210213
base = base_delete_item_request(item)
211214
return {"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME, **base}
212215

216+
213217
def exhaustive_delete_item_request_ddb(item):
214218
"""Get a delete_item request in DDB format for any item."""
215219
base = basic_delete_item_request_ddb(item)
@@ -347,10 +351,12 @@ def basic_get_item_request_dict(item):
347351
"""Get a get_item request in dict format for any item."""
348352
return base_get_item_request(item)
349353

354+
350355
def basic_delete_item_request_dict(item):
351356
"""Get a delete_item request in dict format for any item."""
352357
return base_delete_item_request(item)
353358

359+
354360
def exhaustive_get_item_request_dict(item):
355361
"""
356362
Get a get_item request in dict format for any item.

0 commit comments

Comments
 (0)