From 9a67d59d51c0d9189c12fd581408f0aa01e8991a Mon Sep 17 00:00:00 2001
From: Andy Jewell <ajewell@amazon.com>
Date: Wed, 5 Nov 2025 15:51:14 -0500
Subject: [PATCH] duvet

---
 .github/workflows/duvet.yml                  | 20 +++++++++++++-
 test-server/cpp-v2-server/.duvet/config.toml | 29 --------------------
 test-server/cpp-v2-server/Makefile           |  3 --
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 test-server/cpp-v2-server/.duvet/config.toml

diff --git a/.github/workflows/duvet.yml b/.github/workflows/duvet.yml
index e5be7039..1531d9e3 100644
--- a/.github/workflows/duvet.yml
+++ b/.github/workflows/duvet.yml
@@ -14,11 +14,29 @@ jobs:
     
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: true
           token: ${{ secrets.PAT_FOR_PRIVATE_RUBY }}
       
+      - name: Checkout CPP code for cpp-v2-transition
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_FOR_CPP }}
+          repository: awslabs/aws-sdk-cpp-staging
+          ref: fire-egg-dev
+          path: test-server/cpp-v2-transition-server/aws-sdk-cpp/
+
+      - 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
+          path: test-server/cpp-v3-server/aws-sdk-cpp/
+
       - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
diff --git a/test-server/cpp-v2-server/.duvet/config.toml b/test-server/cpp-v2-server/.duvet/config.toml
deleted file mode 100644
index d137df36..00000000
--- a/test-server/cpp-v2-server/.duvet/config.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-'$schema' = "https://awslabs.github.io/duvet/config/v0.4.0.json"
-
-[[source]]
-pattern = "aws-sdk-cpp/src/aws-cpp-sdk-s3-encryption/**/*.cpp"
-
-[[source]]
-pattern = "aws-sdk-cpp/src/aws-cpp-sdk-s3-encryption/**/*.h"
-
-# Include required specifications here
-[[specification]]
-source = "../specification/s3-encryption/data-format/content-metadata.md"
-[[specification]]
-source = "../specification/s3-encryption/data-format/metadata-strategy.md"
-[[specification]]
-source = "../specification/s3-encryption/encryption.md"
-[[specification]]
-source = "../specification/s3-encryption/decryption.md"
-[[specification]]
-source = "../specification/s3-encryption/key-derivation.md"
-[[specification]]
-source = "../specification/s3-encryption/key-commitment.md"
-
-
-[report.html]
-enabled = true
-
-# Enable snapshots to prevent requirement coverage regressions
-[report.snapshot]
-enabled = false
diff --git a/test-server/cpp-v2-server/Makefile b/test-server/cpp-v2-server/Makefile
index cc562c1a..0f4e4782 100644
--- a/test-server/cpp-v2-server/Makefile
+++ b/test-server/cpp-v2-server/Makefile
@@ -30,8 +30,5 @@ stop-server:
 wait-for-server:
 	$(MAKE) -C .. wait-for-port PORT=$(PORT)
 
-duvet:
-	duvet report
-
 view-report-mac:
 	open .duvet/reports/report.html