Skip to content

Commit a21da88

Browse files
texastonytexastony
authored
Merge branch 'master' into dependabot/pip/dev_requirements/setuptools-70.0.0
2 parents 9175270 + 1835214 commit a21da88

File tree

49 files changed

+388
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+388
-61
lines changed

‎CHANGELOG.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22
Changelog
33
*********
44

5+
4.0.1 -- 2025-03-26
6+
===================
7+
8+
Fixes
9+
-----------
10+
* fix: Improve header serialization
11+
`#747 <https://github.com/aws/aws-encryption-sdk-python/pull/747>`_
12+
13+
ESDK-Python <4.0.1 would truncate non-ASCII key provider IDs it wrote to message headers.
14+
If a Raw or Custom MasterKeyProvider or Keyring supplied a non-ASCII key provider ID / key namespace,
15+
ESDK-Python would truncate the the key provider ID it wrote to the message's header.
16+
The message can be decrypted by replacing the truncated provider ID with the expected provider ID in decryption code.
17+
Contact AWS for any questions about this approach.
18+
19+
Maintenance
20+
-----------
21+
* deps: Extend supported `MPL`_ versions to include v1.10.0
22+
523
4.0.0 -- 2024-10-29
624
===================
725

@@ -23,6 +41,7 @@ Breaking Changes
2341
However, messages that are constructed with the required EC CMM are not backward compatible with ESDK <4.0.0,
2442
as no version of ESDK <4.0.0 supports reading messages encrypted with the required EC CMM.
2543
A message that is encrypted with the required EC CMM from the MPL must be decrypted with a CMM from the MPL.
44+
For more information on using the required EC CMM, see `AWS Documentation <https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/configure.html#config-required-encryption-context-cmm>`_.
2645

2746
Fixes
2847
-----------
@@ -425,6 +444,7 @@ Minor
425444
===================
426445
* Initial public release
427446

447+
.. _MPL: https://github.com/aws/aws-cryptographic-material-providers-library
428448
.. _breaking changes in attrs 17.1.0: https://attrs.readthedocs.io/en/stable/changelog.html
429449
.. _tox: https://tox.readthedocs.io/en/latest/
430450
.. _pylint: https://www.pylint.org/

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Required Prerequisites
4242
Recommended Prerequisites
4343
=========================
4444

45-
* aws-cryptographic-material-providers: == 1.7.4
45+
* aws-cryptographic-material-providers: == 1.10.0
4646
* Requires Python 3.11+.
4747

4848
Installation
@@ -246,7 +246,7 @@ sharing entries in that cache across threads needs to be done carefully
246246

247247
**Important:** Components from the `AWS Cryptographic Material Providers Library (MPL)`_
248248
have separate thread safety considerations.
249-
For more information, see the note on thread safety in that project's README (TODO-MPL: link)
249+
For more information, see the note on thread safety in that project's `README <https://github.com/aws/aws-cryptographic-material-providers-library/blob/main/AwsCryptographicMaterialProviders/runtimes/python/README.rst#thread-safety>`_.
250250

251251

252252
.. _AWS Encryption SDK: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/introduction.html

‎SUPPORT_POLICY.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ This table describes the current support status of each major version of the AWS
3030
-
3131
-
3232
* - 3.x
33+
- General Availability
34+
- Maintenance
35+
- 2025-05-20
36+
* - 4.x
3337
- General Availability
3438
-
3539
-

‎codebuild/py310/decrypt_dafny_esdk_vectors.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ phases:
2828
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2929
-H "Authorization: token ${GITHUB_TOKEN}" \
3030
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
31+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3232
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3333
- |
3434
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3535
- |
3636
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3737
-H "Authorization: token $GITHUB_TOKEN" \
3838
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
39+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4040
| jq '.artifacts[0].archive_download_url')
4141
- |
4242
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4343
- |
4444
curl -L -H "Accept: application/vnd.github+json" \
4545
-H "Authorization: token $GITHUB_TOKEN" \
4646
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
47+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4848
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
49+
- unzip ubuntu-22.04_vector_artifact
5050
# This unzips to `net41/`.
5151
- unzip net41.zip -d net41
5252
build:

‎codebuild/py310/decrypt_net_401_vectors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ phases:
2121
commands:
2222
# Fetch ESDK .NET v4.0.1 Test Vectors
2323
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
24-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
24+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
2525
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
2626
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
2727
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

‎codebuild/py311/awses_local_mpl.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ phases:
2121
python: 3.11
2222
build:
2323
commands:
24+
# Build Python MPL TestVector runner from source
25+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2426
- pip install "tox < 4.0"
2527
- cd test_vector_handlers
2628
- tox

‎codebuild/py311/decrypt_dafny_esdk_vectors_keyrings.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,33 @@ phases:
2222
python: 3.11
2323
pre_build:
2424
commands:
25+
# Build Python MPL TestVector runner from source
26+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2527
# Fetch test vectors from Dafny ESDK's most recent run
2628
# (Assuming the first result is most recent; seems to be correct...)
2729
- |
2830
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2931
-H "Authorization: token ${GITHUB_TOKEN}" \
3032
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
33+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3234
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3335
- |
3436
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3537
- |
3638
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3739
-H "Authorization: token $GITHUB_TOKEN" \
3840
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
41+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4042
| jq '.artifacts[0].archive_download_url')
4143
- |
4244
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4345
- |
4446
curl -L -H "Accept: application/vnd.github+json" \
4547
-H "Authorization: token $GITHUB_TOKEN" \
4648
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
49+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4850
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
51+
- unzip ubuntu-22.04_vector_artifact
5052
# This unzips to `net41/`.
5153
- unzip net41.zip -d net41
5254
build:

‎codebuild/py311/decrypt_dafny_esdk_vectors_masterkey.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ phases:
2828
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2929
-H "Authorization: token ${GITHUB_TOKEN}" \
3030
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
31+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3232
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3333
- |
3434
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3535
- |
3636
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3737
-H "Authorization: token $GITHUB_TOKEN" \
3838
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
39+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4040
| jq '.artifacts[0].archive_download_url')
4141
- |
4242
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4343
- |
4444
curl -L -H "Accept: application/vnd.github+json" \
4545
-H "Authorization: token $GITHUB_TOKEN" \
4646
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
47+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4848
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
49+
- unzip ubuntu-22.04_vector_artifact
5050
# This unzips to `net41/`.
5151
- unzip net41.zip -d net41
5252
build:

‎codebuild/py311/decrypt_golden_manifest_with_keyrings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ phases:
1818
python: 3.11
1919
pre_build:
2020
commands:
21+
# Build Python MPL TestVector runner from source
22+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2123
# Download "golden manifest"
2224
- curl -L -o python-2.3.0.zip https://github.com/awslabs/aws-encryption-sdk-test-vectors/raw/master/vectors/awses-decrypt/python-2.3.0.zip
2325
- unzip python-2.3.0.zip -d python-2.3.0

‎codebuild/py311/decrypt_golden_manifest_with_masterkey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 0.2
22

33
env:
44
variables:
5-
TOXENV: "py311-full_decrypt-mpl"
5+
TOXENV: "py311-full_decrypt"
66
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
77
arn:aws:kms:us-west-2:658956600833:key/b35311ef1-d8dc-4780-9f5a-55776cbb2f7f
88
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-

‎codebuild/py311/decrypt_keyrings_with_keyrings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ phases:
1818
python: 3.11
1919
pre_build:
2020
commands:
21+
# Build Python MPL TestVector runner from source
22+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2123
# Download previously generated vectors
2224
- aws s3 cp s3://generated-vectors-artifacts-bucket/$CODEBUILD_RESOLVED_SOURCE_VERSION/311_keyrings.zip 311_keyrings.zip
2325
- unzip 311_keyrings.zip

‎codebuild/py311/decrypt_masterkey_with_keyrings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ phases:
1818
python: 3.11
1919
pre_build:
2020
commands:
21+
# Build Python MPL TestVector runner from source
22+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2123
# Download previously generated vectors
2224
- aws s3 cp s3://generated-vectors-artifacts-bucket/$CODEBUILD_RESOLVED_SOURCE_VERSION/311_masterkey.zip 311_masterkey.zip
2325
- unzip 311_masterkey.zip

‎codebuild/py311/decrypt_net_401_vectors_keyrings.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ phases:
1919
python: 3.11
2020
pre_build:
2121
commands:
22+
# Build Python MPL TestVector runner from source
23+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2224
# Fetch ESDK .NET v4.0.1 Test Vectors
2325
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
24-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
26+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
2527
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
2628
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
2729
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

‎codebuild/py311/decrypt_net_401_vectors_masterkey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ phases:
3131

3232
# Fetch ESDK .NET v4.0.1 Test Vectors
3333
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
34-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
34+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
3535
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
3636
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
3737
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

‎codebuild/py311/encrypt_keyrings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ phases:
1818
python: 3.11
1919
build:
2020
commands:
21+
# Build Python MPL TestVector runner from source
22+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2123
- pip install "tox < 4.0"
2224
- cd test_vector_handlers
2325
- |

‎codebuild/py311/generate_decrypt_vectors_keyrings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ phases:
1818
python: 3.11
1919
build:
2020
commands:
21+
# Build Python MPL TestVector runner from source
22+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2123
- pip install "tox < 4.0"
2224
- cd test_vector_handlers
2325
- |

‎codebuild/py312/awses_local_mpl.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ phases:
2323
python: 3.12
2424
build:
2525
commands:
26+
# Build Python MPL TestVector runner from source
27+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2628
- cd /root/.pyenv/plugins/python-build/../.. && git pull && cd -
2729
- pyenv install --skip-existing 3.12.0
2830
- pyenv local 3.12.0

‎codebuild/py312/decrypt_dafny_esdk_vectors_keyrings.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,33 @@ phases:
2222
python: 3.12
2323
pre_build:
2424
commands:
25+
# Build Python MPL TestVector runner from source
26+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2527
# Fetch test vectors from Dafny ESDK's most recent run
2628
# (Assuming the first result is most recent; seems to be correct...)
2729
- |
2830
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2931
-H "Authorization: token ${GITHUB_TOKEN}" \
3032
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
33+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3234
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3335
- |
3436
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3537
- |
3638
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3739
-H "Authorization: token $GITHUB_TOKEN" \
3840
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
41+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4042
| jq '.artifacts[0].archive_download_url')
4143
- |
4244
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4345
- |
4446
curl -L -H "Accept: application/vnd.github+json" \
4547
-H "Authorization: token $GITHUB_TOKEN" \
4648
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
49+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4850
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
51+
- unzip ubuntu-22.04_vector_artifact
5052
# This unzips to `net41/`.
5153
- unzip net41.zip -d net41
5254
build:

‎codebuild/py312/decrypt_dafny_esdk_vectors_masterkey.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ phases:
2828
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2929
-H "Authorization: token ${GITHUB_TOKEN}" \
3030
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
31+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3232
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3333
- |
3434
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3535
- |
3636
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3737
-H "Authorization: token $GITHUB_TOKEN" \
3838
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
39+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4040
| jq '.artifacts[0].archive_download_url')
4141
- |
4242
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4343
- |
4444
curl -L -H "Accept: application/vnd.github+json" \
4545
-H "Authorization: token $GITHUB_TOKEN" \
4646
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
47+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4848
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
49+
- unzip ubuntu-22.04_vector_artifact
5050
# This unzips to `net41/`.
5151
- unzip net41.zip -d net41
5252
build:

‎codebuild/py312/decrypt_golden_manifest_with_keyrings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ phases:
1818
python: 3.12
1919
pre_build:
2020
commands:
21+
# Build Python MPL TestVector runner from source
22+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2123
# Download "golden manifest"
2224
- curl -L -o python-2.3.0.zip https://github.com/awslabs/aws-encryption-sdk-test-vectors/raw/master/vectors/awses-decrypt/python-2.3.0.zip
2325
- unzip python-2.3.0.zip -d python-2.3.0

‎codebuild/py312/decrypt_golden_manifest_with_masterkey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 0.2
22

33
env:
44
variables:
5-
TOXENV: "py312-full_decrypt-mpl"
5+
TOXENV: "py312-full_decrypt"
66
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
77
arn:aws:kms:us-west-2:658956600833:key/b35311ef1-d8dc-4780-9f5a-55776cbb2f7f
88
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-

‎codebuild/py312/decrypt_hkeyring_with_keyrings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ phases:
1818
python: 3.12
1919
pre_build:
2020
commands:
21+
# Build Python MPL TestVector runner from source
22+
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2123
# Download previously generated vectors
2224
# This manifest has coverage for both HKeyring and required encryption context CMM
2325
- aws s3 cp s3://generated-vectors-artifacts-bucket/$CODEBUILD_RESOLVED_SOURCE_VERSION/312_hkeyring_reccmm_manifest.zip 312_hkeyring_reccmm_manifest.zip

‎codebuild/py312/decrypt_hkeyring_with_masterkey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 0.2
22

33
env:
44
variables:
5-
TOXENV: "py312-full_decrypt-mpl"
5+
TOXENV: "py312-full_decrypt"
66
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
77
arn:aws:kms:us-west-2:658956600833:key/b35311ef1-d8dc-4780-9f5a-55776cbb2f7f
88
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-

0 commit comments

Comments
 (0)