Skip to content

Commit 7ac8a18

Browse files
author
Lucas McDonald
committed
m
1 parent eb158dc commit 7ac8a18

File tree

3 files changed

+31
-23
lines changed

3 files changed

+31
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def update_item(self, **kwargs):
418418
output_item_to_dict_transform_method=self._client_to_resource_shape_converter.update_item_response,
419419
output_item_to_ddb_transform_method=self._resource_to_client_shape_converter.update_item_response,
420420
)
421-
421+
422422
def get_paginator(self, operation_name: str) -> EncryptedPaginator | botocore.client.Paginator:
423423
"""
424424
Get a paginator from the underlying client.

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

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
simple_key_dict,
2525
)
2626
from ...requests import (
27+
basic_batch_execute_statement_request,
2728
basic_batch_get_item_request_ddb,
2829
basic_batch_get_item_request_dict,
2930
basic_batch_write_item_delete_request_ddb,
@@ -32,6 +33,8 @@
3233
basic_batch_write_item_put_request_dict,
3334
basic_delete_item_request_ddb,
3435
basic_delete_item_request_dict,
36+
basic_execute_statement_request,
37+
basic_execute_transaction_request,
3538
basic_get_item_request_ddb,
3639
basic_get_item_request_dict,
3740
basic_put_item_request_ddb,
@@ -50,9 +53,6 @@
5053
basic_update_item_request_ddb_unsigned_attribute,
5154
basic_update_item_request_dict_signed_attribute,
5255
basic_update_item_request_dict_unsigned_attribute,
53-
basic_execute_statement_request,
54-
basic_execute_transaction_request,
55-
basic_batch_execute_statement_request,
5656
)
5757
from . import sort_dynamodb_json_lists
5858

@@ -381,10 +381,14 @@ def test_GIVEN_valid_transact_write_and_get_requests_WHEN_transact_write_and_get
381381
# Then: transact_write_item delete succeeds
382382
assert transact_write_delete_response["ResponseMetadata"]["HTTPStatusCode"] == 200
383383

384+
384385
@pytest.fixture
385386
def update_item_request_unsigned_attribute(expect_standard_dictionaries, test_item):
386387
if expect_standard_dictionaries:
387-
return {**basic_update_item_request_dict_unsigned_attribute(test_item), "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
388+
return {
389+
**basic_update_item_request_dict_unsigned_attribute(test_item),
390+
"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
391+
}
388392
return basic_update_item_request_ddb_unsigned_attribute(test_item)
389393

390394

@@ -397,15 +401,21 @@ def test_WHEN_update_item_with_unsigned_attribute_THEN_passes(
397401
# Then: update_item succeeds
398402
assert update_response["ResponseMetadata"]["HTTPStatusCode"] == 200
399403

404+
400405
@pytest.fixture
401406
def update_item_request_signed_attribute(expect_standard_dictionaries, test_item):
402407
if expect_standard_dictionaries:
403-
return {**basic_update_item_request_dict_signed_attribute(test_item), "TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
408+
return {
409+
**basic_update_item_request_dict_signed_attribute(test_item),
410+
"TableName": INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME,
411+
}
404412
return basic_update_item_request_ddb_signed_attribute(test_item)
405413

406414

407415
def test_WHEN_update_item_with_signed_attribute_THEN_raises_DynamoDbEncryptionTransformsException(
408-
client, update_item_request_signed_attribute, encrypted,
416+
client,
417+
update_item_request_signed_attribute,
418+
encrypted,
409419
):
410420
"""Test that update_item raises DynamoDbEncryptionTransformsException."""
411421
if not encrypted:
@@ -415,9 +425,7 @@ def test_WHEN_update_item_with_signed_attribute_THEN_raises_DynamoDbEncryptionTr
415425
# Then: DynamoDbEncryptionTransformsException is raised
416426
with pytest.raises(DynamoDbEncryptionTransformsException):
417427
# When: Calling update_item
418-
client.update_item(
419-
**update_item_request_signed_attribute
420-
)
428+
client.update_item(**update_item_request_signed_attribute)
421429

422430

423431
@pytest.fixture
@@ -426,7 +434,9 @@ def execute_statement_request():
426434

427435

428436
def test_WHEN_execute_statement_THEN_raises_DynamoDbEncryptionTransformsException(
429-
client, execute_statement_request, encrypted,
437+
client,
438+
execute_statement_request,
439+
encrypted,
430440
):
431441
"""Test that execute_statement raises DynamoDbEncryptionTransformsException."""
432442
if not encrypted:
@@ -436,9 +446,7 @@ def test_WHEN_execute_statement_THEN_raises_DynamoDbEncryptionTransformsExceptio
436446
# Then: DynamoDbEncryptionTransformsException is raised
437447
with pytest.raises(DynamoDbEncryptionTransformsException):
438448
# When: Calling update_item
439-
client.execute_statement(
440-
**execute_statement_request
441-
)
449+
client.execute_statement(**execute_statement_request)
442450

443451

444452
@pytest.fixture
@@ -447,7 +455,9 @@ def execute_transaction_request():
447455

448456

449457
def test_WHEN_execute_transaction_THEN_raises_DynamoDbEncryptionTransformsException(
450-
client, execute_transaction_request, encrypted,
458+
client,
459+
execute_transaction_request,
460+
encrypted,
451461
):
452462
"""Test that execute_transaction raises DynamoDbEncryptionTransformsException."""
453463
if not encrypted:
@@ -457,9 +467,7 @@ def test_WHEN_execute_transaction_THEN_raises_DynamoDbEncryptionTransformsExcept
457467
# Then: DynamoDbEncryptionTransformsException is raised
458468
with pytest.raises(DynamoDbEncryptionTransformsException):
459469
# When: Calling update_item
460-
client.execute_transaction(
461-
**execute_transaction_request
462-
)
470+
client.execute_transaction(**execute_transaction_request)
463471

464472

465473
@pytest.fixture
@@ -468,7 +476,9 @@ def batch_execute_statement_request():
468476

469477

470478
def test_WHEN_batch_execute_statement_THEN_raises_DynamoDbEncryptionTransformsException(
471-
client, batch_execute_statement_request, encrypted,
479+
client,
480+
batch_execute_statement_request,
481+
encrypted,
472482
):
473483
"""Test that batch_execute_statement raises DynamoDbEncryptionTransformsException."""
474484
if not encrypted:
@@ -478,9 +488,7 @@ def test_WHEN_batch_execute_statement_THEN_raises_DynamoDbEncryptionTransformsEx
478488
# Then: DynamoDbEncryptionTransformsException is raised
479489
with pytest.raises(DynamoDbEncryptionTransformsException):
480490
# When: Calling update_item
481-
client.batch_execute_statement(
482-
**batch_execute_statement_request
483-
)
491+
client.batch_execute_statement(**batch_execute_statement_request)
484492

485493

486494
def test_WHEN_get_paginator_THEN_correct_paginator_is_returned():

DynamoDbEncryption/runtimes/python/test/requests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ def base_update_item_request_unsigned_attribute(item):
7878
"ExpressionAttributeNames": {"#attr3": ":attribute3"},
7979
}
8080

81+
8182
def basic_execute_statement_request():
8283
"""Base structure for execute_statement requests."""
8384
return {"Statement": "SELECT * FROM " + INTEG_TEST_DEFAULT_DYNAMODB_TABLE_NAME}
@@ -521,4 +522,3 @@ def basic_update_item_request_dict_unsigned_attribute(item):
521522
"""Get an update_item request in dict format for any item."""
522523
base = base_update_item_request_unsigned_attribute(item)
523524
return base
524-

0 commit comments

Comments
 (0)