IGNORE: For Review Purposes Only

.github/workflows/main.yml → .github/workflows/all-ci.yml

@@ -1,8 +1,8 @@
-name: Main Workflow
+name: All CI
 
 on:
   push:
-    branches: [ main, fireegg-test-servers ]
+    branches: [ main, staging ]
   pull_request:
   workflow_dispatch:
     inputs:
@@ -13,33 +13,35 @@ on:
         type: string
 
 jobs:
-  lint:
+  python-lint:
     name: Lint
     uses: ./.github/workflows/lint.yml
 
-  run-tests:
+  run-test-server:
     permissions:
       id-token: write
       contents: read
-    name: Run Tests
-    uses: ./.github/workflows/test.yml
+    name: Run TestServer Tests
+    uses: ./.github/workflows/test-server.yml
     with:
       python-version: ${{ inputs.python-version || '3.11' }}
     secrets: inherit
 
-  run-duvet:
+  python-integ:
     permissions:
       id-token: write
       contents: read
-      pages: write
-    name: Run Duvet
-    uses: ./.github/workflows/duvet.yml
+    name: Python Integration Tests
+    uses: ./.github/workflows/python-integ.yml
+    with:
+      python-version: ${{ inputs.python-version || '3.11' }}
     secrets: inherit
 
-  run-examples:
+  run-duvet-test-server:
     permissions:
       id-token: write
       contents: read
-    name: Run Examples
-    uses: ./.github/workflows/examples.yml
+      pages: write
+    name: Run Duvet
+    uses: ./.github/workflows/duvet-test-server.yml
     secrets: inherit

.github/workflows/duvet.yml → .github/workflows/duvet-test-server.yml

@@ -1,11 +1,11 @@
-name: Run Tests
+name: Generate Duvet Report for TestServer
 
 on:
   workflow_call:
     # Optional inputs that can be provided when calling this workflow
 
 jobs:
-  test:
+  duvet:
     runs-on: macos-latest
     permissions:
       id-token: write
@@ -17,15 +17,14 @@ jobs:
         uses: actions/checkout@v5
         with:
           submodules: true
-          token: ${{ secrets.PAT_FOR_PRIVATE_RUBY }}
+          token: ${{ secrets.PAT_FOR_SPEC }}
 
       - name: Checkout CPP code cpp-v3
         uses: actions/checkout@v5
         with:
           submodules: recursive
-          token: ${{ secrets.PAT_FOR_CPP }}
-          repository: awslabs/aws-sdk-cpp-staging
-          ref: fire-egg-dev
+          repository: aws/aws-sdk-cpp
+          ref: main
           path: test-server/cpp-v3-server/aws-sdk-cpp/
 
       - name: Setup Rust toolchain
@@ -91,15 +90,15 @@ jobs:
             test-server/index.html
 
       - name: Setup Pages
-        if: always() && github.ref == 'refs/heads/fireegg-test-servers' && github.event_name == 'push'
+        if: always() && (github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fireegg-test-servers') && github.event_name == 'push'
         uses: actions/configure-pages@v5
 
       - name: Upload Pages artifact
-        if: always() && github.ref == 'refs/heads/fireegg-test-servers' && github.event_name == 'push'
+        if: always() && (github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fireegg-test-servers') && github.event_name == 'push'
         uses: actions/upload-pages-artifact@v3
         with:
           path: test-server/
 
       - name: Deploy to GitHub Pages
-        if: always() && github.ref == 'refs/heads/fireegg-test-servers' && github.event_name == 'push'
+        if: always() && (github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fireegg-test-servers') && github.event_name == 'push'
         uses: actions/deploy-pages@v4

.github/workflows/python-integ.yml

@@ -0,0 +1,57 @@
+name: Python Integration Tests
+
+on:
+  workflow_call:
+    inputs:
+      python-version:
+        description: "Python version to use"
+        default: "3.11"
+        required: false
+        type: string
+
+jobs:
+  python-integ:
+    runs-on: macos-14-large
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          submodules: false
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ inputs.python-version || '3.11' }}
+
+      - name: Cache uv dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/uv
+          key: ${{ runner.os }}-uv-${{ hashFiles('./test-server/python-v3-server/**/pyproject.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-uv-
+
+      - name: Install Uv
+        run: pip install uv
+
+      - name: Install dependencies
+        run: make install
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::370957321024:role/S3EC-Python-Github-test-role
+          aws-region: us-west-2
+
+      - name: Run unit tests
+        run: make test-unit
+
+      - name: Run integration tests
+        run: make test-integration
+        env:
+          CI_S3_BUCKET: ${{ vars.CI_S3_BUCKET }}
+          CI_KMS_KEY_ALIAS: ${{ vars.CI_KMS_KEY_ALIAS }}

.github/workflows/test.yml → .github/workflows/test-server.yml

@@ -1,4 +1,4 @@
-name: Run Tests
+name: Run TestServer Tests
 
 on:
   workflow_call:
@@ -11,7 +11,7 @@ on:
         type: string
 
 jobs:
-  test:
+  test-server:
     runs-on: macos-14-large
     permissions:
       id-token: write
@@ -22,10 +22,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           submodules: false
-          # This is Ryan Emery's (seebees) PAT.
-          # To grant this workflow access to a new private repo,
-          # ask Ryan to edit this PAT's permissions to add access to a new private repo.
-          token: ${{ secrets.PAT_FOR_PRIVATE_RUBY }}
+          token: ${{ secrets.PAT_FOR_SPEC }}
 
       # There are a lot of submodules here
       # This initializes the checkouts in parallel (--jobs)
@@ -39,7 +36,7 @@ jobs:
         run: |
           git config --global url."https://github.com/".insteadOf "git@github.com:"
           git config --global credential.helper store
-          echo "https://x-token-auth:${{ secrets.PAT_FOR_PRIVATE_RUBY }}@github.com" > ~/.git-credentials
+          echo "https://x-token-auth:${{ secrets.PAT_FOR_SPEC }}@github.com" > ~/.git-credentials
 
       - name: Optimize git for performance
         run: |
@@ -58,24 +55,19 @@ jobs:
             --jobs ${{ steps.cpu-count.outputs.count }} \
             --force \
             test-server/cpp-v2-transition-server/aws-sdk-cpp \
-            test-server/cpp-v3-server/aws-sdk-cpp \
-            test-server/cpp-v2-server/aws-sdk-cpp
+            test-server/cpp-v3-server/aws-sdk-cpp
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: "3.4.7"
+          bundler-cache: true
 
       - name: Set up PHP with Composer
         uses: shivammathur/setup-php@verbose
         with:
           php-version: "8.1"
 
-      - name: Install PHP V2 dependencies
-        working-directory: ./test-server/php-v2-server
-        shell: bash
-        run: composer install
-
       - name: Install PHP V2 Transition dependencies
         working-directory: ./test-server/php-v2-transition-server
         shell: bash
@@ -95,46 +87,15 @@ jobs:
         run: |
           brew install libmicrohttpd nlohmann-json ossp-uuid
 
-      # Legacy Python tests:
-      # - name: Set up Python
-      #   uses: actions/setup-python@v5
-      #   with:
-      #     python-version: ${{ inputs.python-version || '3.11' }}
-      # 
-      # # Cache uv dependencies
-      # - name: Cache uv dependencies
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ~/.cache/uv
-      #     key: ${{ runner.os }}-uv-${{ hashFiles('./test-server/python-v3-server/**/pyproject.toml') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-uv-
-
-      # - name: Install Uv
-      #   run: pip install uv
-
-      # - name: Install dependencies
-      #   run: make install
-
-      # - name: Run unit tests
-      #   run: make test-unit
-
-      # - name: Run integration tests
-      #   run: make test-integration
-      #   env:
-      #     CI_S3_BUCKET: ${{ vars.CI_S3_BUCKET }}
-      #     CI_KMS_KEY_ALIAS: ${{ vars.CI_KMS_KEY_ALIAS }}
-
       # Cache Gradle dependencies and build outputs
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-            test-server/java-v3-server/.gradle
             test-server/java-tests/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('test-server/java-v3-server/**/*.gradle*', 'test-server/java-tests/**/gradle-wrapper.properties', 'test-server/java-tests/**/*.gradle*', 'test-server/java-v3-server/**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('test-server/java-tests/**/gradle-wrapper.properties', 'test-server/java-tests/**/*.gradle*') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
 
@@ -163,7 +124,7 @@ jobs:
           MAKEFLAGS: -j${{ steps.cpu-count.outputs.count }}
 
       - name: Run run-tests
-        run: cd test-server && make run-tests
+        run: cd test-server && make test-servers-run-tests
         env:
           AWS_REGION: us-west-2
           TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
@@ -177,11 +138,9 @@ jobs:
           name: server-logs
           path: |
             test-server/*/server.log
-            test-server/*/net-v2-server.log
-            test-server/*/net-v3-server.log
 
       - name: Stop the servers
-        run: cd test-server && make stop-servers
+        run: cd test-server && make test-servers-stop
 
       - name: Upload results
         if: always()