m

Author: Lucas McDonald

.github/workflows/dafny_interop_test_vector_python.yml renamed to .github/workflows/ci_test_vector_python.yml

@@ -1,26 +1,27 @@
-# This workflow performs test vectors in Python with the client interface.
-name: Library Python Test Vectors Client Interface Interop Tests
+# This workflow performs test vectors in Python.
+name: Library Python Test Vectors
 
 on:
   workflow_call:
     inputs:
-      mpl-dafny:
-        description: "The Dafny version to compile the MPL with (4.2.0, dafny-nightly, etc..)"
+      dafny:
+        description: "The Dafny version to run"
         required: true
         type: string
-      mpl-commit:
-        description: "The MPL commit to use"
+      regenerate-code:
+        description: "Regenerate code using smithy-dafny"
         required: false
-        default: "main"
-        type: string
+        default: false
+        type: boolean
       mpl-version:
-        description: "The MPL version to use"
-        required: true
-        type: string
-      dbesdk-dafny:
-        description: "The Dafny version to compile the DBESDK with (4.2.0, dafny-nightly, etc..)"
-        required: true
+        description: "MPL version to use"
+        required: false
         type: string
+      mpl-head:
+        description: "Running on MPL HEAD"
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   testPython:
@@ -51,51 +52,44 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-          fetch-depth: 0
 
-      - name: Setup MPL Dafny
+      - name: Setup Dafny
         uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
         with:
-          dafny-version: ${{ inputs.mpl-dafny }}
+          dafny-version: ${{ inputs.dafny }}
 
-      - name: Update MPL submodule
+      - name: Update MPL submodule if using MPL HEAD
+        if: ${{ inputs.mpl-head == true }}
         working-directory: submodules/MaterialProviders
         run: |
-          git fetch
-          git checkout ${{inputs.mpl-commit}}
+          git checkout main
+          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 
+      - name: Regenerate code using smithy-dafny if necessary
+        if: ${{ inputs.regenerate-code }}
+        uses: ./.github/actions/polymorph_codegen
+        with:
+          dafny: ${{ env.DAFNY_VERSION }}
+          library: ${{ matrix.library }}
+          diff-generated-code: false
+          update-and-regenerate-mpl: true
+
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Build MPL with Dafny ${{inputs.mpl-dafny}}
-        working-directory: submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders
-        run: |
-          # This works because `node` is installed by default on GHA runners
-          CORES=$(node -e 'console.log(os.cpus().length)')
-          make build_python CORES=$CORES
-
-      - name: Setup DBESDK Dafny
-        uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
-        with:
-          dafny-version: ${{ inputs.dbesdk-dafny}}
-
-      - name: Build DynamoDbEncryption implementation
-        shell: bash
-        working-directory: DynamoDbEncryption
-        run: |
-          make transpile_python
-
       - name: Build TestVectors implementation
         shell: bash
         working-directory: ${{matrix.library}}
         run: |
-          make transpile_python
+          # This works because `node` is installed by default on GHA runners
+          CORES=$(node -e 'console.log(os.cpus().length)')
+          make build_python CORES=$CORES
 
       - name: Test TestVectors
-        working-directory: ./TestVectors
+        working-directory: ${{matrix.library}}
         run: |
           make test_python_${{matrix.interface}}_interface

.github/workflows/pull.yml

@@ -61,7 +61,7 @@ jobs:
       dafny: ${{needs.getVersion.outputs.version}}
   pr-ci-python-testvectors:
     needs: getVersion
-    uses: ./.github/workflows/dafny_interop_test_vector_python.yml
+    uses: ./.github/workflows/ci_test_vector_python.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
   pr-ci-net-test-vectors: