Go with duvet dashboard

.github/workflows/duvet.yml

@@ -10,6 +10,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
+      pages: write
 
     steps:
       - name: Checkout code
@@ -43,3 +44,20 @@ jobs:
           name: reports
           include-hidden-files: true
           path: test-server/*-server/.duvet/reports/report.html
+
+      - name: Generate compliance dashboard
+        if: always()
+        run: |
+          cd test-server
+          python generate_compliance_dashboard.py
+
+      - name: Upload compliance dashboard
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: compliance-dashboard
+          include-hidden-files: true
+          path: |
+            test-server/compliance_homepage.html
+            test-server/*/compliance_summary_snapshot.html
+            test-server/templates/*

.github/workflows/test.yml

@@ -5,8 +5,8 @@ on:
     # Optional inputs that can be provided when calling this workflow
     inputs:
       python-version:
-        description: 'Python version to use'
-        default: '3.11'
+        description: "Python version to use"
+        default: "3.11"
         required: false
         type: string
 
@@ -16,7 +16,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -35,7 +35,25 @@ jobs:
           repository: awslabs/aws-sdk-cpp-staging
           ref: fire-egg-dev
           path: test-server/cpp-v2-transition-server/aws-sdk-cpp/
-
+
+      - name: Checkout .NET V2 code
+        uses: actions/checkout@v5
+        with:
+          token: ${{ secrets.PAT_FOR_DOTNET }}
+          repository: aws/private-amazon-s3-encryption-client-dotnet-staging
+          # This is the branch for S3EC .NET V2
+          ref: v3sdk-development 
+          path: test-server/net-v2-v3-server/s3ec-net-v2/
+
+      - name: Checkout .NET V3 code
+        uses: actions/checkout@v5
+        with:
+          token: ${{ secrets.PAT_FOR_DOTNET }}
+          repository: aws/private-amazon-s3-encryption-client-dotnet-staging
+          # This is the branch for S3EC .NET V3
+          ref: s3ec-v3
+          path: test-server/net-v2-v3-server/s3ec-net-v3
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -44,23 +62,28 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.4'
-      
+          ruby-version: "3.4"
+
       - name: Set up PHP with Composer
         uses: shivammathur/setup-php@verbose
         with:
-          php-version: '8.1'
-      
+          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
+        run: composer install
+
       - name: Install PHP V3 dependencies
         working-directory: ./test-server/php-v3-server
         shell: bash
         run: composer install
-      
+
       - name: Install Go
         uses: actions/setup-go@v5
         with:
@@ -74,10 +97,10 @@ jobs:
           key: ${{ runner.os }}-uv-${{ hashFiles('**/pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-uv-
-          
+
       - name: Install Uv
         run: pip install uv
-      
+
       # Cache Gradle dependencies and build outputs
       - name: Cache Gradle packages
         uses: actions/cache@v4
@@ -90,25 +113,25 @@ jobs:
           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') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-          
+
       - 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 }}
-          
+
       - name: Run test-server tests
         run: cd test-server && make ci
         env:

.gitignore

@@ -7,6 +7,7 @@ __pycache__/
 # Distribution / packaging
 dist/
 build/
+bin/
 *.egg-info/
 
 # Uv

.gitmodules

@@ -4,10 +4,11 @@
 [submodule "test-server/ruby-v3-server/local-ruby-sdk"]
 	path = test-server/ruby-v3-server/local-ruby-sdk
 	url = git@github.com:aws/aws-sdk-ruby-staging.git
+	branch = fire-egg
 [submodule "test-server/php-v2-server/local-php-sdk"]
 	path = test-server/php-v2-server/local-php-sdk
 	url = git@github.com:aws/private-aws-sdk-php-staging.git
-	branch = s3ec/transitional
+	branch = master
 [submodule "test-server/php-v3-server/local-php-sdk"]
 	path = test-server/php-v3-server/local-php-sdk
 	url = git@github.com:aws/private-aws-sdk-php-staging.git
@@ -27,3 +28,15 @@
 	path = test-server/specification
 	url = git@github.com:awslabs/private-aws-encryption-sdk-specification-staging.git
 	branch = fire-egg-staging
+[submodule "test-server/php-v2-transition-server/local-php-sdk"]
+	path = test-server/php-v2-transition-server/local-php-sdk
+	url = git@github.com:aws/private-aws-sdk-php-staging.git
+	branch = s3ec/transitional
+[submodule "test-server/net-v2-v3-server/s3ec-net-v2"]
+	path = test-server/net-v2-v3-server/s3ec-net-v2
+	url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git
+	branch = v3sdk-development
+[submodule "test-server/net-v2-v3-server/s3ec-net-v3"]
+	path = test-server/net-v2-v3-server/s3ec-net-v3
+	url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git
+	branch = s3ec-v3

test-server/Makefile

@@ -8,7 +8,7 @@ all: start-servers run-tests
 # CI target for GitHub Actions
 ci: start-servers run-tests stop-servers
 
-SERVER_DIRS := $(shell find . -maxdepth 1 -type d -name '*-server' | sed 's|^\./||' | $(if $(FILTER),grep $(FILTER),cat) | sort)
+SERVER_DIRS := $(shell find . -maxdepth 1 -type d -name '*-server' | sed 's|^\./||' | $(if $(FILTER),grep -E "$$(echo '$(FILTER)' | sed 's/,/|/g')",cat) | sort)
 # SERVER_DIRS := cpp-v3-server
 
 START_SERVER_TARGETS := $(addprefix start-, $(SERVER_DIRS))

test-server/cpp-v2-server/.duvet/.gitignore

@@ -1,3 +1,3 @@
 reports/
 requirements/
-specification/
+specification/

test-server/cpp-v2-server/.duvet/config.toml

@@ -1,24 +1,27 @@
 '$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"
+pattern = "local-go-s3ec/v4/**/*.go"
 
 # 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/client.md"
+[[specification]]
 source = "../specification/s3-encryption/encryption.md"
 [[specification]]
+source = "../specification/s3-encryption/decryption.md"
+[[specification]]
+source = "../specification/s3-encryption/key-commitment.md"
+[[specification]]
 source = "../specification/s3-encryption/key-derivation.md"
 
 [report.html]
 enabled = true
 
 # Enable snapshots to prevent requirement coverage regressions
 [report.snapshot]
-enabled = false
+enabled = true