Skip to content

Commit 29cccae

Browse files
committed
fix ci tests
1 parent d006e52 commit 29cccae

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

dev_requirements/linter-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ flake8-bugbear==22.9.11
66
flake8-docstrings==1.7.0
77
flake8-print==5.0.0
88
isort==5.11.4
9+
pbr==2.0.0 # needed due to to bandit
910
pyflakes==2.4.0
1011
pylint==2.13.5
1112
readme_renderer==37.3

src/aws_encryption_sdk/streaming_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def _prep_message(self):
454454
)
455455

456456
validate_commitment_policy_on_encrypt(self.config.commitment_policy, self._encryption_materials.algorithm)
457-
457+
458458
if self.config.algorithm is not None and self._encryption_materials.algorithm != self.config.algorithm:
459459
raise ActionNotAllowedError(
460460
(

src/pylintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ disable =
1010
attribute-defined-outside-init, # breaks with attrs_post_init
1111
abstract-method, # throws false positives on io.BaseIO grandchildren
1212
redefined-outer-name, # we do this on purpose in multiple places
13+
too-many-positional-arguments, # on 2026-04-17 aws_encryption_sdk_decrypt_oracle started failing because of this
1314
# All below are disabled because we need to support Python 2
1415
useless-object-inheritance,
1516
raise-missing-from,

test/functional/test_f_commitment.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def test_encrypt_with_require_policy_fail_when_retrieving_invalid_cmm_materials(
236236
required_encrypting_client = aws_encryption_sdk.EncryptionSDKClient(
237237
commitment_policy=CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT
238238
)
239-
239+
240240
provider = StaticRawMasterKeyProvider(
241241
wrapping_algorithm=WrappingAlgorithm.AES_256_GCM_IV12_TAG16_NO_PADDING,
242242
encryption_key_type=EncryptionKeyType.SYMMETRIC,
@@ -249,7 +249,7 @@ def test_encrypt_with_require_policy_fail_when_retrieving_invalid_cmm_materials(
249249
)
250250
plaintext = b"Yellow Submarine"
251251

252-
ciphertext, _ = forbid_encrypting_client.encrypt(source=plaintext, materials_manager=ccmm)
252+
_, _ = forbid_encrypting_client.encrypt(source=plaintext, materials_manager=ccmm)
253253
with pytest.raises(ActionNotAllowedError) as excinfo:
254254
required_encrypting_client.encrypt(source=plaintext, materials_manager=ccmm)
255255
excinfo.match("Configuration conflict. Cannot encrypt due to .* requiring only committed messages")
@@ -264,7 +264,7 @@ def test_encrypt_with_forbid_policy_fail_when_retrieving_invalid_cmm_materials()
264264
required_encrypting_client = aws_encryption_sdk.EncryptionSDKClient(
265265
commitment_policy=CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT
266266
)
267-
267+
268268
provider = StaticRawMasterKeyProvider(
269269
wrapping_algorithm=WrappingAlgorithm.AES_256_GCM_IV12_TAG16_NO_PADDING,
270270
encryption_key_type=EncryptionKeyType.SYMMETRIC,
@@ -277,7 +277,7 @@ def test_encrypt_with_forbid_policy_fail_when_retrieving_invalid_cmm_materials()
277277
)
278278
plaintext = b"Yellow Submarine"
279279

280-
ciphertext, _ = required_encrypting_client.encrypt(source=plaintext, materials_manager=ccmm)
280+
_, _ = required_encrypting_client.encrypt(source=plaintext, materials_manager=ccmm)
281281
with pytest.raises(ActionNotAllowedError) as excinfo:
282282
forbid_encrypting_client.encrypt(source=plaintext, materials_manager=ccmm)
283283
excinfo.match("Configuration conflict. Cannot encrypt due to .* requiring only non-committed messages.")

0 commit comments

Comments
 (0)