chore: Build TestVectors with MPL main

codebuild/py310/decrypt_dafny_esdk_vectors.yml

@@ -28,25 +28,25 @@ phases:
         MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token ${GITHUB_TOKEN}" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
-           "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
+           "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
            | jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
       - |
         echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
       - |
         MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
+          "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
           | jq '.artifacts[0].archive_download_url')
       - |
         echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
       - |
         curl -L -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
+          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
       # This unzips to `net41.zip`.
-      - unzip ubuntu-latest_test_vector_artifact
+      - unzip ubuntu-22.04_vector_artifact
       # This unzips to `net41/`.
       - unzip net41.zip -d net41
   build:

codebuild/py310/decrypt_net_401_vectors.yml

@@ -21,7 +21,7 @@ phases:
     commands:
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
-      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
+      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
       - curl -s --output $VECTOR_ZIP --location $VECTORS_URL
       - UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
       - unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py311/decrypt_dafny_esdk_vectors_keyrings.yml

@@ -30,25 +30,25 @@ phases:
         MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token ${GITHUB_TOKEN}" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
-           "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
+           "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
            | jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
       - |
         echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
       - |
         MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
+          "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
           | jq '.artifacts[0].archive_download_url')
       - |
         echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
       - |
         curl -L -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
+          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
       # This unzips to `net41.zip`.
-      - unzip ubuntu-latest_test_vector_artifact
+      - unzip ubuntu-22.04_vector_artifact
       # This unzips to `net41/`.
       - unzip net41.zip -d net41
   build:

codebuild/py311/decrypt_dafny_esdk_vectors_masterkey.yml

@@ -28,25 +28,25 @@ phases:
         MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token ${GITHUB_TOKEN}" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
-           "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
+           "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
            | jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
       - |
         echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
       - |
         MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
+          "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
           | jq '.artifacts[0].archive_download_url')
       - |
         echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
       - |
         curl -L -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
+          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
       # This unzips to `net41.zip`.
-      - unzip ubuntu-latest_test_vector_artifact
+      - unzip ubuntu-22.04_vector_artifact
       # This unzips to `net41/`.
       - unzip net41.zip -d net41
   build:

codebuild/py311/decrypt_net_401_vectors_keyrings.yml

@@ -23,7 +23,7 @@ phases:
       - sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
-      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
+      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
       - curl -s --output $VECTOR_ZIP --location $VECTORS_URL
       - UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
       - unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py311/decrypt_net_401_vectors_masterkey.yml

@@ -31,7 +31,7 @@ phases:
 
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
-      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
+      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
       - curl -s --output $VECTOR_ZIP --location $VECTORS_URL
       - UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
       - unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py312/decrypt_dafny_esdk_vectors_keyrings.yml

@@ -30,25 +30,25 @@ phases:
         MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token ${GITHUB_TOKEN}" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
-           "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
+           "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
            | jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
       - |
         echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
       - |
         MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
+          "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
           | jq '.artifacts[0].archive_download_url')
       - |
         echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
       - |
         curl -L -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
+          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
       # This unzips to `net41.zip`.
-      - unzip ubuntu-latest_test_vector_artifact
+      - unzip ubuntu-22.04_vector_artifact
       # This unzips to `net41/`.
       - unzip net41.zip -d net41
   build:

codebuild/py312/decrypt_dafny_esdk_vectors_masterkey.yml

@@ -28,25 +28,25 @@ phases:
         MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token ${GITHUB_TOKEN}" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
-           "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
+           "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
            | jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
       - |
         echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
       - |
         MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
+          "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
           | jq '.artifacts[0].archive_download_url')
       - |
         echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
       - |
         curl -L -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
+          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
       # This unzips to `net41.zip`.
-      - unzip ubuntu-latest_test_vector_artifact
+      - unzip ubuntu-22.04_vector_artifact
       # This unzips to `net41/`.
       - unzip net41.zip -d net41
   build:

codebuild/py312/decrypt_hkeyring_with_net.yml

@@ -25,15 +25,15 @@ phases:
       - export DAFNY_AWS_ESDK_TEST_VECTOR_MANIFEST_PATH="${PWD}/312_hkeyring_reccmm_manifest/manifest.json"
 
       # Clone SDK-Dafny repo to get test vectors runner source code and the Dafny version to use
-      - git clone --recurse-submodules https://github.com/aws/aws-encryption-sdk-dafny.git
+      - git clone --recurse-submodules https://github.com/aws/aws-encryption-sdk.git
       # Download Dafny to build the test vector runner; get Dafny version from ESDK's project.properties file
-      - export dafnyVersion=$(grep '^dafnyVersion=' aws-encryption-sdk-dafny/AwsEncryptionSDK/project.properties | cut -d '=' -f 2)
+      - export dafnyVersion=$(grep '^dafnyVersion=' aws-encryption-sdk/project.properties | cut -d '=' -f 2)
       - curl https://github.com/dafny-lang/dafny/releases/download/v$dafnyVersion/dafny-$dafnyVersion-x64-ubuntu-20.04.zip  -L -o dafny.zip
       - unzip -qq dafny.zip && rm dafny.zip
       - export PATH="$PWD/dafny:$PATH"
 
       # Build MPL test vector runner from source
-      - cd aws-encryption-sdk-dafny/mpl/TestVectorsAwsCryptographicMaterialProviders/
+      - cd aws-encryption-sdk/mpl/TestVectorsAwsCryptographicMaterialProviders/
       - make transpile_net
 
       # Change ESDK TestVectors project to reference the published .NET ESDK

codebuild/py312/decrypt_net_401_vectors_keyrings.yml

@@ -23,7 +23,7 @@ phases:
       - sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
-      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
+      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
       - curl -s --output $VECTOR_ZIP --location $VECTORS_URL
       - UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
       - unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py312/decrypt_net_401_vectors_masterkey.yml

@@ -31,7 +31,7 @@ phases:
 
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
-      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
+      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
       - curl -s --output $VECTOR_ZIP --location $VECTORS_URL
       - UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
       - unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py38/decrypt_dafny_esdk_vectors.yml

@@ -28,25 +28,25 @@ phases:
         MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token ${GITHUB_TOKEN}" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
-           "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
+           "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
            | jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
       - |
         echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
       - |
         MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
+          "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
           | jq '.artifacts[0].archive_download_url')
       - |
         echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
       - |
         curl -L -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
+          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
       # This unzips to `net41.zip`.
-      - unzip ubuntu-latest_test_vector_artifact
+      - unzip ubuntu-22.04_vector_artifact
       # This unzips to `net41/`.
       - unzip net41.zip -d net41
   build:

codebuild/py38/decrypt_net_401_vectors.yml

@@ -21,7 +21,7 @@ phases:
     commands:
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
-      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
+      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
       - curl -s --output $VECTOR_ZIP --location $VECTORS_URL
       - UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
       - unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py39/decrypt_dafny_esdk_vectors.yml

@@ -28,25 +28,25 @@ phases:
         MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token ${GITHUB_TOKEN}" \
            -H "X-GitHub-Api-Version: 2022-11-28" \
-           "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
+           "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
            | jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
       - |
         echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
       - |
         MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
+          "https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
           | jq '.artifacts[0].archive_download_url')
       - |
         echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
       - |
         curl -L -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $GITHUB_TOKEN" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
+          $(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
       # This unzips to `net41.zip`.
-      - unzip ubuntu-latest_test_vector_artifact
+      - unzip ubuntu-22.04_vector_artifact
       # This unzips to `net41/`.
       - unzip net41.zip -d net41
   build:

codebuild/py39/decrypt_net_401_vectors.yml

@@ -21,7 +21,7 @@ phases:
     commands:
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
-      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
+      - VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
       - curl -s --output $VECTOR_ZIP --location $VECTORS_URL
       - UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
       - unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

test_vector_handlers/requirements_mpl.txt

@@ -1 +0,0 @@
-aws-cryptographic-material-providers==1.7.4

test_vector_handlers/scripts/install_mpl_test_vector_runner.sh

@@ -11,7 +11,8 @@ cd "$(dirname "$0")"
 export mplVersion=$(grep 'aws-cryptographic-material-providers==' ../requirements_mpl.txt | sed -E 's/.*==(.+)/\1/')
 
 # Clone MPL repo to get test vectors runner source code and the Dafny version to use
-git clone --branch v$mplVersion --recurse-submodules https://github.com/aws/aws-cryptographic-material-providers-library.git
+# git clone --branch v$mplVersion --recurse-submodules https://github.com/aws/aws-cryptographic-material-providers-library.git
+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
 export dafnyVersion=$(grep '^dafnyVersion=' aws-cryptographic-material-providers-library/project.properties | cut -d '=' -f 2)