From fa8693605f7298c06a6ffb7860aa912ed94a780d Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Mon, 16 Mar 2026 17:51:06 +0200
Subject: [PATCH] test(provisioner/terraform/testdata): add subagent_id to UUID
 preservation and regenerate (#23122)

The minimize_diff function in generate.sh preserves autogenerated
values (UUIDs, tokens, etc.) across regeneration to keep diffs
minimal. The subagent_id field was missing from the preservation
list, causing unnecessary churn on devcontainer test data.

Also regenerates all testdata with the current terraform (1.14.5)
and coder provider (2.14.0).
---
 provisioner/terraform/testdata/generate.sh                  | 2 +-
 .../resources/devcontainer/converted_state.state.golden     | 6 ++++--
 .../resources/devcontainer/devcontainer.tfplan.json         | 6 ++++--
 .../resources/devcontainer/devcontainer.tfstate.json        | 2 ++
 provisioner/terraform/testdata/resources/version.txt        | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/provisioner/terraform/testdata/generate.sh b/provisioner/terraform/testdata/generate.sh
index 11b3d2c40a..ae6718dce2 100755
--- a/provisioner/terraform/testdata/generate.sh
+++ b/provisioner/terraform/testdata/generate.sh
@@ -65,7 +65,7 @@ minimize_diff() {
 		done < <(
 			# Filter out known keys with autogenerated values.
 			git diff -- "$f" |
-				grep -E "\"(terraform_version|id|agent_id|resource_id|token|random|timestamp)\":"
+				grep -E "\"(terraform_version|id|agent_id|subagent_id|resource_id|token|random|timestamp)\":"
 		)
 	done
 }
diff --git a/provisioner/terraform/testdata/resources/devcontainer/converted_state.state.golden b/provisioner/terraform/testdata/resources/devcontainer/converted_state.state.golden
index 7fa005a139..9dc77021cf 100644
--- a/provisioner/terraform/testdata/resources/devcontainer/converted_state.state.golden
+++ b/provisioner/terraform/testdata/resources/devcontainer/converted_state.state.golden
@@ -24,13 +24,15 @@
             {
               "workspace_folder": "/workspace1",
               "name": "dev1",
-              "id": "eb9b7f18-c277-48af-af7c-2a8e5fb42bab"
+              "id": "eb9b7f18-c277-48af-af7c-2a8e5fb42bab",
+              "subagent_id": "56eb6c04-83bf-4daa-85d0-dd4ad3983632"
             },
             {
               "workspace_folder": "/workspace2",
               "config_path": "/workspace2/.devcontainer/devcontainer.json",
               "name": "dev2",
-              "id": "964430ff-f0d9-4fcb-b645-6333cf6ba9f2"
+              "id": "964430ff-f0d9-4fcb-b645-6333cf6ba9f2",
+              "subagent_id": "19f7ba01-87bd-46f3-99dd-bb9ff5448e3d"
             }
           ],
           "api_key_scope": "all"
diff --git a/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.json b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.json
index fc765e999d..bbf8d7b10a 100644
--- a/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.json
+++ b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.json
@@ -139,7 +139,8 @@
         },
         "after_unknown": {
           "agent_id": true,
-          "id": true
+          "id": true,
+          "subagent_id": true
         },
         "before_sensitive": false,
         "after_sensitive": {}
@@ -162,7 +163,8 @@
         },
         "after_unknown": {
           "agent_id": true,
-          "id": true
+          "id": true,
+          "subagent_id": true
         },
         "before_sensitive": false,
         "after_sensitive": {}
diff --git a/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.json b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.json
index a024d46715..ca7bc2a207 100644
--- a/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.json
+++ b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.json
@@ -60,6 +60,7 @@
             "agent_id": "eb1fa705-34c6-405b-a2ec-70e4efd1614e",
             "config_path": null,
             "id": "eb9b7f18-c277-48af-af7c-2a8e5fb42bab",
+            "subagent_id": "56eb6c04-83bf-4daa-85d0-dd4ad3983632",
             "workspace_folder": "/workspace1"
           },
           "sensitive_values": {},
@@ -78,6 +79,7 @@
             "agent_id": "eb1fa705-34c6-405b-a2ec-70e4efd1614e",
             "config_path": "/workspace2/.devcontainer/devcontainer.json",
             "id": "964430ff-f0d9-4fcb-b645-6333cf6ba9f2",
+            "subagent_id": "19f7ba01-87bd-46f3-99dd-bb9ff5448e3d",
             "workspace_folder": "/workspace2"
           },
           "sensitive_values": {},
diff --git a/provisioner/terraform/testdata/resources/version.txt b/provisioner/terraform/testdata/resources/version.txt
index 63e799cf45..24a57f28a4 100644
--- a/provisioner/terraform/testdata/resources/version.txt
+++ b/provisioner/terraform/testdata/resources/version.txt
@@ -1 +1 @@
-1.14.1
+1.14.5