shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-02 20:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(provisioner/terraform): regenerate fixtures with current provider (#23685)

Browse Source 
Two test fixtures (devcontainer-resources, multiple-agents-multiple-envs)
were generated before terraform-provider-coder v2.15.0 added the
merge_strategy attribute to coder_env. Running generate.sh with the
current provider adds merge_strategy: "replace" (the default) to all
coder_env resources, causing unstable diffs on every regeneration.
This commit is contained in:
Mathias Fredriksson
2026-03-26 20:22:45 +02:00
committed by GitHub
parent fc60a6bf9b
commit 6cbb7c6da7
9 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provisioner/terraform/resources_test.go
+12 -8
View File
@@ -325,12 +325,14 @@ func TestConvertResources(t *testing.T) {
Architecture: "amd64",
ExtraEnvs: []*proto.Env{
{
Name: "ENV_1",
Value: "Env 1",
Name: "ENV_1",
Value: "Env 1",
MergeStrategy: "replace",
},
{
Name: "ENV_2",
Value: "Env 2",
Name: "ENV_2",
Value: "Env 2",
MergeStrategy: "replace",
},
},
Auth: &proto.Agent_Token{},
@@ -348,8 +350,9 @@ func TestConvertResources(t *testing.T) {
Architecture: "amd64",
ExtraEnvs: []*proto.Env{
{
Name: "ENV_3",
Value: "Env 3",
Name: "ENV_3",
Value: "Env 3",
MergeStrategy: "replace",
},
},
Auth: &proto.Agent_Token{},
@@ -1012,8 +1015,9 @@ func TestConvertResources(t *testing.T) {
},
Envs: []*proto.Env{
{
Name: "DEVCONTAINER_ENV",
Value: "devcontainer-value",
Name: "DEVCONTAINER_ENV",
Value: "devcontainer-value",
MergeStrategy: "replace",
},
},
},
provisioner/terraform/testdata/resources/devcontainer-resources/converted_state.plan.golden
Vendored
+2 -1
View File
@@ -45,7 +45,8 @@
"envs": [
{
"name": "DEVCONTAINER_ENV",
"value": "devcontainer-value"
"value": "devcontainer-value",
"merge_strategy": "replace"
}
]
}
provisioner/terraform/testdata/resources/devcontainer-resources/converted_state.state.golden
Vendored
+2 -1
View File
@@ -48,7 +48,8 @@
"envs": [
{
"name": "DEVCONTAINER_ENV",
"value": "devcontainer-value"
"value": "devcontainer-value",
"merge_strategy": "replace"
}
]
}
provisioner/terraform/testdata/resources/devcontainer-resources/devcontainer-resources.tfplan.json
Generated Vendored
+2
View File
@@ -83,6 +83,7 @@
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 1,
"values": {
"merge_strategy": "replace",
"name": "DEVCONTAINER_ENV",
"value": "devcontainer-value"
},
@@ -243,6 +244,7 @@
],
"before": null,
"after": {
"merge_strategy": "replace",
"name": "DEVCONTAINER_ENV",
"value": "devcontainer-value"
},
provisioner/terraform/testdata/resources/devcontainer-resources/devcontainer-resources.tfstate.json
Generated Vendored
+1
View File
@@ -111,6 +111,7 @@
"values": {
"agent_id": "b4db82a1-1cba-4d97-8893-cf2ca9a9fe1a",
"id": "0982d946-8a12-423a-a316-d4263f94a124",
"merge_strategy": "replace",
"name": "DEVCONTAINER_ENV",
"value": "devcontainer-value"
},
provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/converted_state.plan.golden
Vendored
+6 -3
View File
@@ -21,11 +21,13 @@
"extra_envs": [
{
"name": "ENV_1",
"value": "Env 1"
"value": "Env 1",
"merge_strategy": "replace"
},
{
"name": "ENV_2",
"value": "Env 2"
"value": "Env 2",
"merge_strategy": "replace"
}
],
"resources_monitoring": {},
@@ -54,7 +56,8 @@
"extra_envs": [
{
"name": "ENV_3",
"value": "Env 3"
"value": "Env 3",
"merge_strategy": "replace"
}
],
"resources_monitoring": {},
provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/converted_state.state.golden
Vendored
+6 -3
View File
@@ -22,11 +22,13 @@
"extra_envs": [
{
"name": "ENV_1",
"value": "Env 1"
"value": "Env 1",
"merge_strategy": "replace"
},
{
"name": "ENV_2",
"value": "Env 2"
"value": "Env 2",
"merge_strategy": "replace"
}
],
"resources_monitoring": {},
@@ -56,7 +58,8 @@
"extra_envs": [
{
"name": "ENV_3",
"value": "Env 3"
"value": "Env 3",
"merge_strategy": "replace"
}
],
"resources_monitoring": {},
provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json
Generated Vendored
+6
View File
@@ -74,6 +74,7 @@
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 1,
"values": {
"merge_strategy": "replace",
"name": "ENV_1",
"value": "Env 1"
},
@@ -87,6 +88,7 @@
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 1,
"values": {
"merge_strategy": "replace",
"name": "ENV_2",
"value": "Env 2"
},
@@ -100,6 +102,7 @@
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 1,
"values": {
"merge_strategy": "replace",
"name": "ENV_3",
"value": "Env 3"
},
@@ -235,6 +238,7 @@
],
"before": null,
"after": {
"merge_strategy": "replace",
"name": "ENV_1",
"value": "Env 1"
},
@@ -258,6 +262,7 @@
],
"before": null,
"after": {
"merge_strategy": "replace",
"name": "ENV_2",
"value": "Env 2"
},
@@ -281,6 +286,7 @@
],
"before": null,
"after": {
"merge_strategy": "replace",
"name": "ENV_3",
"value": "Env 3"
},
provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json
Generated Vendored
+3
View File
@@ -104,6 +104,7 @@
"values": {
"agent_id": "fac6034b-1d42-4407-b266-265e35795241",
"id": "fd793e28-41fb-4d56-8b22-6a4ad905245a",
"merge_strategy": "replace",
"name": "ENV_1",
"value": "Env 1"
},
@@ -122,6 +123,7 @@
"values": {
"agent_id": "fac6034b-1d42-4407-b266-265e35795241",
"id": "809a9f24-48c9-4192-8476-31bca05f2545",
"merge_strategy": "replace",
"name": "ENV_2",
"value": "Env 2"
},
@@ -140,6 +142,7 @@
"values": {
"agent_id": "a02262af-b94b-4d6d-98ec-6e36b775e328",
"id": "cb8f717f-0654-48a7-939b-84936be0096d",
"merge_strategy": "replace",
"name": "ENV_3",
"value": "Env 3"
},