Skip to content

Commit fa86936

Browse files
mafredrimafredri
authored
test(provisioner/terraform/testdata): add subagent_id to UUID preservation and regenerate (coder#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).
1 parent af1be59 commit fa86936

5 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎provisioner/terraform/testdata/generate.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ minimize_diff() {
6565
done < <(
6666
# Filter out known keys with autogenerated values.
6767
git diff -- "$f" |
68-
grep -E "\"(terraform_version|id|agent_id|resource_id|token|random|timestamp)\":"
68+
grep -E "\"(terraform_version|id|agent_id|subagent_id|resource_id|token|random|timestamp)\":"
6969
)
7070
done
7171
}

‎provisioner/terraform/testdata/resources/devcontainer/converted_state.state.golden‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
{
2525
"workspace_folder": "/workspace1",
2626
"name": "dev1",
27-
"id": "eb9b7f18-c277-48af-af7c-2a8e5fb42bab"
27+
"id": "eb9b7f18-c277-48af-af7c-2a8e5fb42bab",
28+
"subagent_id": "56eb6c04-83bf-4daa-85d0-dd4ad3983632"
2829
},
2930
{
3031
"workspace_folder": "/workspace2",
3132
"config_path": "/workspace2/.devcontainer/devcontainer.json",
3233
"name": "dev2",
33-
"id": "964430ff-f0d9-4fcb-b645-6333cf6ba9f2"
34+
"id": "964430ff-f0d9-4fcb-b645-6333cf6ba9f2",
35+
"subagent_id": "19f7ba01-87bd-46f3-99dd-bb9ff5448e3d"
3436
}
3537
],
3638
"api_key_scope": "all"

‎provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.json‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.json‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎provisioner/terraform/testdata/resources/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.14.1
1+
1.14.5

0 commit comments

Comments
 (0)