Skip to content

Commit 4adb696

Browse files
fixes, now run net
1 parent 4240cee commit 4adb696

File tree

3 files changed

+41
-9
lines changed

3 files changed

+41
-9
lines changed

buildspec.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,12 @@ batch:
342342
buildspec: codebuild/py312/decrypt_hkeyring_with_keyrings.yml
343343
env:
344344
image: aws/codebuild/standard:7.0
345-
# TODO: turn this into the .NET runner
346-
# - identifier: py312_decrypt_keyrings_with_js
347-
# depend-on:
348-
# - py312_generate_decrypt_vectors_keyrings
349-
# buildspec: codebuild/py312/decrypt_keyrings_with_js.yml
350-
# env:
351-
# image: aws/codebuild/standard:7.0
352-
345+
- identifier: py312_decrypt_kkeyring_with_net
346+
depend-on:
347+
- py312_generate_hkeyring_decrypt_vectors
348+
buildspec: codebuild/py312/decrypt_hkeyring_with_net.yml
349+
env:
350+
image: aws/codebuild/standard:7.0
353351

354352
- identifier: code_coverage
355353
buildspec: codebuild/coverage/coverage.yml
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
version: 0.2
2+
3+
env:
4+
variables:
5+
TOXENV: "py312-full_decrypt-mpl"
6+
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
7+
arn:aws:kms:us-west-2:658956600833:key/b35311ef1-d8dc-4780-9f5a-55776cbb2f7f
8+
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-
9+
arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2
10+
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
11+
arn:aws:kms:us-west-2:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
12+
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2: >-
13+
arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
14+
15+
phases:
16+
install:
17+
runtime-versions:
18+
python: 3.12
19+
pre_build:
20+
commands:
21+
# Download previously generated vectors
22+
- aws s3 cp s3://generated-vectors-artifacts-bucket/$CODEBUILD_RESOLVED_SOURCE_VERSION/312_hkeyring_manifest.zip 312_hkeyring_manifest.zip
23+
- unzip 312_hkeyring_manifest.zip
24+
25+
# Download published .NET ESDK so we don't have to build from source
26+
dotnet add package AWS.Cryptography.EncryptionSDK --version 4.0.1
27+
28+
# Clone SDK-Dafny repo to get test vectors runner
29+
- git clone [email protected]:aws/aws-encryption-sdk-dafny.git
30+
- cd aws-encryption-sdk-dafny/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors
31+
- export DAFNY_AWS_ESDK_TEST_VECTOR_MANIFEST_PATH=../../../../../../312_hkeyring_manifest/manifest.json
32+
build:
33+
commands:
34+
- dotnet test --framework net48

test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ def master_key_provider_fn():
322322
else:
323323
return None
324324
else:
325-
raise ValueError("Unrecognized cmm_type: " + cmm_type)
325+
raise ValueError("Unrecognized cmm_type: " + scenario["cmm"])
326326
else:
327327
# If unspecified, set "Default" as the default
328328
cmm_type = "Default"

0 commit comments

Comments
 (0)