From c0a854e661cf3348e49723d4dc4724f83ba32be8 Mon Sep 17 00:00:00 2001
From: Kess Plasmeier <kessplas@amazon.com>
Date: Tue, 4 Aug 2026 20:48:01 +0000
Subject: [PATCH 1/2] chore(esdk): split server/feature/bug config into
 separate files

---
 test-server/bug-config.json                               | 6 ++++++
 .../{commons-configuration.json => feature-config.json}   | 6 ------
 test-server/server-config.json                            | 8 ++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 test-server/bug-config.json
 rename test-server/{commons-configuration.json => feature-config.json} (65%)
 create mode 100644 test-server/server-config.json

diff --git a/test-server/bug-config.json b/test-server/bug-config.json
new file mode 100644
index 000000000..0dd86cbba
--- /dev/null
+++ b/test-server/bug-config.json
@@ -0,0 +1,6 @@
+[
+  "decrypt-accepts-trailing-bytes-commit-key",
+  "create-client-accepts-reserved-aws-kms-namespace",
+  "encrypt-accepts-reserved-prefix-encryption-context-key",
+  "encrypt-mishandles-proto-encryption-context-key"
+]
diff --git a/test-server/commons-configuration.json b/test-server/feature-config.json
similarity index 65%
rename from test-server/commons-configuration.json
rename to test-server/feature-config.json
index c17455c06..d32c5f0bc 100644
--- a/test-server/commons-configuration.json
+++ b/test-server/feature-config.json
@@ -1,10 +1,4 @@
 {
-  "commonsRepository": {
-    "name": "aws-crypto-tools-commons",
-    "url": "git@github.com:aws/aws-crypto-tools-commons.git",
-    "branch": "lucmcdon/esdk-test-server-all-languages"
-  },
-  "product": "esdk",
   "supportedFeatures": [
     "streaming",
     "hierarchical",
diff --git a/test-server/server-config.json b/test-server/server-config.json
new file mode 100644
index 000000000..180128721
--- /dev/null
+++ b/test-server/server-config.json
@@ -0,0 +1,8 @@
+{
+  "commonsRepository": {
+    "name": "aws-crypto-tools-commons",
+    "url": "git@github.com:aws/aws-crypto-tools-commons.git",
+    "branch": "lucmcdon/esdk-test-server-all-languages"
+  },
+  "product": "esdk"
+}

From fec2b4ea4a16f9e305e9b6962c54cb5738df12c8 Mon Sep 17 00:00:00 2001
From: Kess Plasmeier <76071473+kessplas@users.noreply.github.com>
Date: Thu, 17 Sep 2026 20:06:49 +0000
Subject: [PATCH 2/2] chore(test-server): read commons coordinates from
 server-config.json

commons-configuration.json was replaced by the server-config.json / feature-config.json / bug-config.json trio in the config split but the Makefile still read the removed file; point COMMONS_CONFIGURATION at server-config.json (same commonsRepository shape) so `make test-server` resolves commons again. Its commonsRepository.branch is already lucmcdon/esdk-test-server-all-languages.
---
 test-server/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-server/Makefile b/test-server/Makefile
index ca3b27e6a..89927c715 100644
--- a/test-server/Makefile
+++ b/test-server/Makefile
@@ -11,11 +11,11 @@ PID_FILE := .server.pid
 LOG_FILE := .server.log
 
 # Bootstrap-then-delegate coordinates for `make test-server`. The commons
-# repository coordinates live in commons-configuration.json next to this
+# repository coordinates live in server-config.json next to this
 # Makefile; COMMONS_BRANCH overrides the configured branch at invocation time.
 MAKEFILE_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 REPO_ROOT    := $(abspath $(MAKEFILE_DIR)/..)
-COMMONS_CONFIGURATION := $(MAKEFILE_DIR)/commons-configuration.json
+COMMONS_CONFIGURATION := $(MAKEFILE_DIR)/server-config.json
 COMMONS_BRANCH ?=
 CLONE_DIR      ?= $(MAKEFILE_DIR)/.commons-clone
 CLONE_ORCH_DIR := $(CLONE_DIR)/esdk/test-server/orchestrator