m

Author: lucasmcdonald3

codebuild/py312/decrypt_dafny_esdk_vectors_keyrings.yml

@@ -22,6 +22,8 @@ phases:
       python: 3.12
   pre_build:
     commands:
+      # Build and install MPL test vector Python package
+      - tox -e install-mpl-runner
       # Fetch test vectors from Dafny ESDK's most recent run
       # (Assuming the first result is most recent; seems to be correct...)
       - |

codebuild/py312/decrypt_golden_manifest_with_keyrings.yml

@@ -21,6 +21,8 @@ phases:
       # Download "golden manifest"
       - 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
       - unzip python-2.3.0.zip -d python-2.3.0
+      # Build and install MPL test vector Python package
+      - tox -e install-mpl-runner
   build:
     commands:
       - pip install "tox < 4.0"

test_vector_handlers/requirements_mpl.txt

@@ -1 +1 @@
-aws-cryptography-internal-mpl-testvectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-main-with-dafny-code#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python
+aws-cryptographic-material-providers==1.7.2

test_vector_handlers/tox.ini

@@ -38,6 +38,21 @@ envlist =
 [testenv:base-command]
 commands = pytest --basetemp={envtmpdir} -l --cov awses_test_vectors test/ --ignore test/mpl {posargs}
 
+[testenv:install-mpl-runner]
+commands = 
+    # Clone MPL repo to get test vectors runner source code and the Dafny version to use
+    ; git clone --recurse-submodules https://github.com/aws/aws-cryptographic-material-providers-library.git
+    # Download Dafny to build the test vector runner; get Dafny version from ESDK's project.properties file
+    ; /bin/bash -c "export dafnyVersion=$(grep '^dafnyVersion=' aws-cryptographic-material-providers-library/project.properties | cut -d '=' -f 2)"
+    ; /bin/bash -c "curl https://github.com/dafny-lang/dafny/releases/download/v$(grep '^dafnyVersion=' aws-cryptographic-material-providers-library/project.properties | cut -d '=' -f 2)/dafny-$(grep '^dafnyVersion=' aws-cryptographic-material-providers-library/project.properties | cut -d '=' -f 2)-x64-ubuntu-20.04.zip  -L -o dafny.zip"
+    ; /bin/bash -c "unzip -qq dafny.zip && rm dafny.zip"
+    ; /bin/bash -c 'export PATH="$PWD/dafny:$PATH"'
+
+    # Build MPL test vector runner from source
+    make -C aws-cryptographic-material-providers-library/TestVectorsAwsCryptographicMaterialProviders/ transpile_python
+    # Install just the test vector runner, not its local MPL dependency
+    pip install aws-cryptographic-material-providers-library/TestVectorsAwsCryptographicMaterialProviders/runtimes/python --no-deps
+
 [testenv]
 passenv =
     # Pass through AWS credentials
@@ -48,10 +63,10 @@ passenv =
     AWS_PROFILE
 sitepackages = False
 deps =
-    -rtest/requirements.txt
-    # Install the MPL requirements if the `-mpl` suffix is present
-    mpl: -rrequirements_mpl.txt
-    ..
+    ; -rtest/requirements.txt
+    ; # Install the MPL requirements if the `-mpl` suffix is present
+    ; mpl: -rrequirements_mpl.txt
+    ; ..
 commands = 
     awses_local: {[testenv:base-command]commands}
     full_decrypt_generate: awses-full-message-decrypt-generate {posargs}