chore: test

Author: imabhichow

codebuild/release/validate_released_with_examples.yml

@@ -30,11 +30,13 @@ phases:
       - echo "Installing aws-encryption-sdk version $VERSION"
       - pip install "aws-encryption-sdk==$VERSION"
       - pip install "tox < 4.0"
+      # Export VERSION for subprocesses to use
+      - export VERSION="$VERSION"
   build:
     commands:
       # Create a simple tox.ini file for running examples with the installed package
       - |
-        cat > release_validation_tox.ini << 'EOF'
+        cat > release_validation_tox.ini << EOF
         [tox]
         envlist = py311
         skipsdist = True
@@ -59,6 +61,7 @@ phases:
             moto
             boto3
             cryptography
+            aws-encryption-sdk==$VERSION
         commands =
             # Run non-MPL examples
             pytest examples/test/legacy/ -m examples
@@ -101,9 +104,42 @@ phases:
       - |
         while [ $NUM_RETRIES -gt 0 ]
         do
-          # Only run the MPL-specific tests that require special permissions
-          # These would normally be run with py311-mplexamples-mpl
-          python -m pytest examples/test/ -m examples --ignore examples/test/legacy/
+          # Create a fresh tox.ini for MPL tests with correct dependencies
+          echo "Creating MPL tox.ini with VERSION=$VERSION"
+          cat > mpl_validation_tox.ini << EOF
+          [tox]
+          envlist = py311
+          skipsdist = True
+
+          [testenv]
+          passenv =
+              AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID
+              AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2
+              AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1
+              AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2
+              AWS_ACCESS_KEY_ID
+              AWS_SECRET_ACCESS_KEY
+              AWS_SESSION_TOKEN
+              AWS_CONTAINER_CREDENTIALS_RELATIVE_URI
+              AWS_PROFILE
+          deps =
+              pytest
+              pytest-mock
+              mock
+              coverage
+              pyyaml
+              moto
+              boto3
+              cryptography
+              aws-encryption-sdk==$VERSION
+              -r requirements_mpl.txt
+          commands =
+              # Only run the MPL-specific tests
+              pytest examples/test/ -m examples --ignore examples/test/legacy/
+          EOF
+          
+          # Run the MPL-specific tests
+          tox -c mpl_validation_tox.ini -e py311
           if [ $? -eq 0 ]; then
             break
           fi

codebuild/release/validate_test_vectors.yml

@@ -1,8 +1,5 @@
 version: 0.2
 
-# Validation script for aws-encryption-sdk using test vectors to verify cryptographic operations
-# and interoperability with the keyring model
-
 env:
   variables:
     # Default VERSION if not provided externally
@@ -11,26 +8,28 @@ env:
 phases:
   install:
     commands:
+      - cd ..
       - pip install "tox < 4.0" poetry
       - pip install --upgrade pip
+      # Get Dafny
+      - curl https://github.com/dafny-lang/dafny/releases/download/v4.9.0/dafny-4.9.0-x64-ubuntu-20.04.zip  -L -o dafny.zip
+      - unzip -qq dafny.zip && rm dafny.zip
+      - export PATH="$PWD/dafny:$PATH"
+      - cd  aws-encryption-sdk-python/
     runtime-versions:
       python: latest
       dotnet: 6.0
   pre_build:
     commands:
       # Setup environment
       - aws configure set region us-west-2
-      - git clone https://github.com/aws/aws-encryption-sdk.git esdk-dafny
-      - cd esdk-dafny && git submodule update --init --recursive && cd ..
+      - git clone git@github.com:aws/aws-encryption-sdk.git
+      - cd aws-encryption-sdk && git submodule update --init --recursive && cd ..
       # Install packages and setup environments
-      - echo "Installing aws-encryption-sdk version $VERSION"
       - pip install "aws-encryption-sdk==$VERSION"
       - pyenv install --skip-existing 3.11.0 && pyenv local 3.11.0
-      - make -C esdk-dafny/mpl/StandardLibrary setup_net
+      - make -C aws-encryption-sdk/mpl/StandardLibrary setup_net
       - pip install pytest boto3 attrs cryptography
-      # Update the aws-encryption-sdk version in TestVectors
-      - sed -i "s/aws-encryption-sdk = \">=4.0.1\"/aws-encryption-sdk = \"==$VERSION\"/" \
-        esdk-dafny/TestVectors/runtimes/python/pyproject.toml
   build:
     commands:
       - NUM_RETRIES=3
@@ -41,7 +40,7 @@ phases:
         }
         
         # Navigate to TestVectors directory
-        cd esdk-dafny/TestVectors || exit 1
+        cd aws-encryption-sdk/TestVectors || exit 1
         
         while [ $NUM_RETRIES -gt 0 ]
         do