From 9aa22c3064c663b8bf849830aca4c14d7b05963e Mon Sep 17 00:00:00 2001
From: Lucas McDonald <lucasmcdonald3@gmail.com>
Date: Mon, 4 Nov 2024 12:04:56 -0800
Subject: [PATCH 1/2] chore(CI): Bump from macOS 12 to 13 (#723)

---
 .github/workflows/ci_test-vector-handler.yaml | 4 ++--
 .github/workflows/ci_tests.yaml               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_test-vector-handler.yaml b/.github/workflows/ci_test-vector-handler.yaml
index 8a142096d..90c87e502 100644
--- a/.github/workflows/ci_test-vector-handler.yaml
+++ b/.github/workflows/ci_test-vector-handler.yaml
@@ -19,7 +19,7 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-          - macos-12
+          - macos-13
         python:
           - 3.8
           - 3.x
@@ -34,7 +34,7 @@ jobs:
           # x86 builds are only meaningful for Windows
           - os: ubuntu-latest
             architecture: x86
-          - os: macos-12
+          - os: macos-13
             architecture: x86
     steps:
       - uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
index e1a13c334..e9388e092 100644
--- a/.github/workflows/ci_tests.yaml
+++ b/.github/workflows/ci_tests.yaml
@@ -26,7 +26,7 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-          - macos-12
+          - macos-13
         python:
           - 3.8
           - 3.9
@@ -48,7 +48,7 @@ jobs:
           # x86 builds are only meaningful for Windows
           - os: ubuntu-latest
             architecture: x86
-          - os: macos-12
+          - os: macos-13
             architecture: x86
     steps:
       - uses: actions/checkout@v4

From 6e53b21e5a4ab03d4400071f4be377e17ab68d45 Mon Sep 17 00:00:00 2001
From: Lucas McDonald <lucasmcdonald3@gmail.com>
Date: Mon, 11 Nov 2024 12:56:01 -0800
Subject: [PATCH 2/2] chore(CI): Run CodeBuild CI from GHA (#725)

---
 .github/workflows/ci_codebuild-tests.yml | 48 ++++++++++++++++++++++++
 buildspec.yml                            |  3 +-
 codebuild/py39/awses_local.yml           | 25 ++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/ci_codebuild-tests.yml
 create mode 100644 codebuild/py39/awses_local.yml

diff --git a/.github/workflows/ci_codebuild-tests.yml b/.github/workflows/ci_codebuild-tests.yml
new file mode 100644
index 000000000..2e84fc897
--- /dev/null
+++ b/.github/workflows/ci_codebuild-tests.yml
@@ -0,0 +1,48 @@
+name: AWS CodeBuild CI
+
+on:
+  pull_request:
+  push:
+  # Run once a day
+  schedule:
+    - cron: "0 0 * * *"
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  codebuild-tests:
+    name: AWS CodeBuild CI
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - python_version: "38"
+            image: "aws/codebuild/standard:5.0"
+          - python_version: "39"
+            image: "aws/codebuild/standard:5.0"
+          - python_version: "310"
+            image: "aws/codebuild/standard:6.0"
+          - python_version: "311"
+            image: "aws/codebuild/standard:7.0"
+          - python_version: "312"
+            image: "aws/codebuild/standard:7.0"
+        codebuild_file_name:
+          - "awses_local.yml"
+          - "examples.yml"
+          - "integ.yml"
+    steps:
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+          role-duration-seconds: 3600
+      - name: Run python-${{ matrix.python.python_version }} ${{ matrix.codebuild_file_name }}
+        uses: aws-actions/aws-codebuild-run-build@v1
+        timeout-minutes: 60
+        with:
+          project-name: python-esdk
+          buildspec-override: codebuild/py${{ matrix.python.python_version }}/${{ matrix.codebuild_file_name }}
+          image-override: ${{ matrix.python.image }}
diff --git a/buildspec.yml b/buildspec.yml
index 9bf6eafdf..d9604281f 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -24,7 +24,8 @@ batch:
       buildspec: codebuild/py39/examples.yml
       env:
         image: aws/codebuild/standard:5.0
-    - identifier: py39_awses_latest
+    - identifier: py39_awses_local
+      buildspec: codebuild/py39/awses_local.yml
       env:
         image: aws/codebuild/standard:5.0
 
diff --git a/codebuild/py39/awses_local.yml b/codebuild/py39/awses_local.yml
new file mode 100644
index 000000000..e56a9ff45
--- /dev/null
+++ b/codebuild/py39/awses_local.yml
@@ -0,0 +1,25 @@
+version: 0.2
+
+env:
+  variables:
+    TOXENV: "py39-awses_local"
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
+      arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-
+      arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
+      arn:aws:kms:us-west-2:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2: >-
+      arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
+    AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_API_DEPLOYMENT_ID: "xi1mwx3ttb"
+    AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_REGION: "us-west-2"
+
+phases:
+  install:
+    runtime-versions:
+      python: 3.9
+  build:
+    commands:
+      - pip install "tox < 4.0"
+      - cd test_vector_handlers
+      - tox