Skip to content

fix: move calls requiring integ test environment setup from test setup to inside test body #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 18, 2020
Merged

fix: move calls requiring integ test environment setup from test setup to inside test body #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a67fd8
chore: fix 'nocmk' test environment to block environment variables again
mattsb42-aws Apr 17, 2020
4edf39c
fix: move calls requiring integ test environment setup from test para…
mattsb42-aws Apr 17, 2020
73fdd50
fix: fix broken parameter reconfiguration
mattsb42-aws Apr 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 29 additions & 17 deletions test/integration/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,38 +27,41 @@
}


def _generate_mkp():
"""Isolated inside a function to avoid calling get_cmk_arn during test discovery."""
return setup_kms_master_key_provider().master_key(get_cmk_arn())


@pytest.mark.parametrize(
"kwargs",
"parameter_name, value_partial",
(
pytest.param(dict(key_provider=setup_kms_master_key_provider()), id="AWS KMS master key provider"),
pytest.param(
dict(key_provider=setup_kms_master_key_provider().master_key(get_cmk_arn())), id="AWS KMS master key"
),
pytest.param(dict(keyring=build_aws_kms_keyring()), id="AWS KMS keyring"),
pytest.param("key_provider", setup_kms_master_key_provider, id="AWS KMS master key provider"),
pytest.param("key_provider", _generate_mkp, id="AWS KMS master key"),
pytest.param("keyring", build_aws_kms_keyring, id="AWS KMS keyring"),
),
)
def test_encrypt_verify_user_agent_in_logs(caplog, kwargs):
def test_encrypt_verify_user_agent_in_logs(caplog, parameter_name, value_partial):
caplog.set_level(level=logging.DEBUG)

aws_encryption_sdk.encrypt(source=VALUES["plaintext_128"], **kwargs)
aws_encryption_sdk.encrypt(source=VALUES["plaintext_128"], **{parameter_name: value_partial()})

assert USER_AGENT_SUFFIX in caplog.text


@pytest.mark.parametrize("frame_size", (pytest.param(0, id="unframed"), pytest.param(1024, id="1024 byte frame")))
@pytest.mark.parametrize("algorithm_suite", Algorithm)
@pytest.mark.parametrize(
"encrypt_key_provider_kwargs",
"encrypt_key_provider_param, encrypt_key_provider_partial",
(
pytest.param(dict(key_provider=setup_kms_master_key_provider()), id="encrypt with MKP"),
pytest.param(dict(keyring=build_aws_kms_keyring()), id="encrypt with keyring"),
pytest.param("key_provider", setup_kms_master_key_provider, id="encrypt with MKP"),
pytest.param("keyring", build_aws_kms_keyring, id="encrypt with keyring"),
),
)
@pytest.mark.parametrize(
"decrypt_key_provider_kwargs",
"decrypt_key_provider_param, decrypt_key_provider_partial",
(
pytest.param(dict(key_provider=setup_kms_master_key_provider()), id="decrypt with MKP"),
pytest.param(dict(keyring=build_aws_kms_keyring()), id="decrypt with keyring"),
pytest.param("key_provider", setup_kms_master_key_provider, id="decrypt with MKP"),
pytest.param("keyring", build_aws_kms_keyring, id="decrypt with keyring"),
),
)
@pytest.mark.parametrize(
Expand All @@ -76,16 +79,25 @@ def test_encrypt_verify_user_agent_in_logs(caplog, kwargs):
),
)
def test_encrypt_decrypt_cycle_aws_kms(
frame_size, algorithm_suite, encrypt_key_provider_kwargs, decrypt_key_provider_kwargs, encryption_context, plaintext
frame_size,
algorithm_suite,
encrypt_key_provider_param,
encrypt_key_provider_partial,
decrypt_key_provider_param,
decrypt_key_provider_partial,
encryption_context,
plaintext,
):
ciphertext, _ = aws_encryption_sdk.encrypt(
source=plaintext,
encryption_context=encryption_context,
frame_length=frame_size,
algorithm=algorithm_suite,
**encrypt_key_provider_kwargs
**{encrypt_key_provider_param: encrypt_key_provider_partial()}
)
decrypted, _ = aws_encryption_sdk.decrypt(
source=ciphertext, **{decrypt_key_provider_param: decrypt_key_provider_partial()}
)
decrypted, _ = aws_encryption_sdk.decrypt(source=ciphertext, **decrypt_key_provider_kwargs)
assert decrypted == plaintext


Expand Down
5 changes: 5 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ commands =
[testenv:nocmk]
basepython = python3
sitepackages = False
#########################################################
# Do not pass through or set any environment variables! #
passenv =
setenv =
#########################################################
deps = -rtest/requirements.txt
commands = {[testenv:base-command]commands} test/ -m local

Expand Down