expand testing

Author: lucasmcdonald3

.github/workflows/ci_static-analysis.yaml

@@ -13,8 +13,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python:
-          - 3.8
         category:
           - bandit
           - doc8
@@ -32,7 +30,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python }}
+          python-version: 3.8
       - run: |
           python -m pip install --upgrade pip
           pip install --upgrade -r dev_requirements/ci-requirements.txt

.github/workflows/ci_tests.yaml

@@ -44,10 +44,14 @@ jobs:
         category:
           - local
           - accept
+          - mpllocal
+          - mplaccept
 # These require credentials.
 # Enable them once we sort how to provide them.
 #          - integ
 #          - examples
+        # Append '-mpl' to some test environments.
+        # This suffix signals to tox to install the MPL in the test environment. 
         optional_mpl_dependency:
           - ""
           - -mpl
@@ -66,7 +70,13 @@ jobs:
             optional_mpl_dependency: -mpl
           - python: 3.10
             optional_mpl_dependency: -mpl
+          # mpllocal and mplaccept require the MPL to be installed
+          - python: mpllocal
+            optional_mpl_dependency: 
+          - python: mplaccept
+            optional_mpl_dependency:
     steps:
+      # Support long Dafny filenames (used in MPL and DBESDK repos)
       - name: Support longpaths
         run: |
           git config --global core.longpaths true

codebuild/py311/examples_mpl.yml

@@ -2,7 +2,7 @@ version: 0.2
 
 env:
   variables:
-    # No TOXENV; examples using the MPL switch envs
+    # No TOXENV. This runs multiple environments.
     REGION: "us-west-2"
     AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
       arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
@@ -20,14 +20,15 @@ phases:
   build:
     commands:
       - pip install "tox < 4.0"
+      # Run non-MPL-specific tests with the MPL installed
       - tox -e py311-examples-mpl
-      # Assume special role
+      # Assume special role to access keystore
       - TMP_ROLE=$(aws sts assume-role --role-arn "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Python-Role-us-west-2" --role-session-name "CB-Py311ExamplesMpl")
       - export TMP_ROLE
       - export AWS_ACCESS_KEY_ID=$(echo "${TMP_ROLE}" | jq -r '.Credentials.AccessKeyId')
       - export AWS_SECRET_ACCESS_KEY=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
       - export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
       - aws sts get-caller-identity
-      # Run special role-specific examples
+      # Run MPL-specific tests with special role
       - tox -e py311-mplexamples-mpl
 

codebuild/py312/awses_local_mpl.yml

@@ -1,3 +1,5 @@
+# Runs the same tests as awses_local in an environment with the MPL installed.
+# This asserts existing tests continue to pass with the MPL installed.
 version: 0.2
 
 env:

codebuild/py312/examples_mpl.yml

@@ -1,8 +1,11 @@
+# Runs the same tests as examples in an environment with the MPL installed
+# to assert existing tests continue to pass with the MPL installed.
+# Then, run MPL-specific tests.
 version: 0.2
 
 env:
   variables:
-    # No TOXENV; examples using the MPL switch envs
+    # No TOXENV. This runs multiple environments.
     REGION: "us-west-2"
     AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
       arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
@@ -25,13 +28,14 @@ phases:
       - pip install --upgrade pip
       - pip install setuptools
       - pip install "tox < 4.0"
+      # Run non-MPL-specific tests with the MPL installed
       - tox -e py312-examples-mpl
-      # Assume special role
+      # Assume special role to access keystore
       - TMP_ROLE=$(aws sts assume-role --role-arn "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Python-Role-us-west-2" --role-session-name "CB-Py311ExamplesMpl")
       - export TMP_ROLE
       - export AWS_ACCESS_KEY_ID=$(echo "${TMP_ROLE}" | jq -r '.Credentials.AccessKeyId')
       - export AWS_SECRET_ACCESS_KEY=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
       - export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
       - aws sts get-caller-identity
-      # Run special role-specific examples
+      # Run MPL-specific tests with special role
       - tox -e py312-mplexamples-mpl

codebuild/py312/integ_mpl.yml

@@ -1,3 +1,5 @@
+# Runs the same tests as integ in an environment with the MPL installed.
+# This asserts existing tests continue to pass with the MPL installed.
 version: 0.2
 
 env:

tox.ini

@@ -15,7 +15,7 @@ envlist =
     # These must be separate from the above target.
     # These require the `-mpl` suffix so tox installs the MPL.
     # The `mpl` prefix runs only MPL-specific tests
-    py{311,312}-mpl{local,examples}-mpl
+    py{311,312}-mpl{local,integ,accept,examples}-mpl
     nocmk,
     bandit, doc8, readme, docs,
     {flake8,pylint}{,-tests,-examples},
@@ -56,7 +56,7 @@ envlist =
 # coverage :: Runs code coverage, failing the build if coverage is below the configured threshold
 
 [testenv:base-command]
-commands = pytest --basetemp={envtmpdir} -l {posargs} -s -v
+commands = pytest --basetemp={envtmpdir} -l {posargs}
 
 [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,PIP_CONFIG_FILE
@@ -87,11 +87,16 @@ commands =
     # MPL unit tests require the MPL to be installed
     mpllocal: {[testenv:base-command]commands} test/unit/mpl/ -m local
     integ: {[testenv:base-command]commands} test/ -m integ --ignore test/unit/mpl/
+    # MPL integ tests require the MPL to be installed
+    mplinteg: {[testenv:base-command]commands} test/unit/mpl -m integ
     accept: {[testenv:base-command]commands} test/ -m accept --ignore test/unit/mpl/
+    # MPL accept tests require the MPL to be installed
+    mplaccept: {[testenv:base-command]commands} test/unit/mpl -m accept
     examples: {[testenv:base-command]commands} examples/test/ -m examples --ignore examples/test/keyrings/
     # MPL keyring examples require a special IAM role; run these separately under a separate set of permissions
     mplexamples: {[testenv:base-command]commands} examples/test/keyrings -m examples
-    all: {[testenv:base-command]commands} test/ examples/test/ --ignore test/unit/mpl/
+    all: {[testenv:base-command]commands} test/ examples/test/ --ignore test/unit/mpl/ --ignore examples/test/keyrings/
+    mplall: {[testenv:base-command]commands} test/unit/mpl/ examples/test/keyrings/
     manual: {[testenv:base-command]commands}
 
 # Run code coverage on the unit tests