diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml index e660e6f3c3f5f..b63aac1aa7e55 100644 --- a/.github/actions/setup-tf/action.yaml +++ b/.github/actions/setup-tf/action.yaml @@ -7,5 +7,5 @@ runs: - name: Install Terraform uses: hashicorp/setup-terraform@v3 with: - terraform_version: 1.8.4 + terraform_version: 1.9.2 terraform_wrapper: false diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 997a4999df2df..076011e85ba53 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -170,9 +170,9 @@ RUN apt-get update --quiet && apt-get install --yes \ # Configure FIPS-compliant policies update-crypto-policies --set FIPS -# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.7.5. +# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.9.2. # Installing the same version here to match. -RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.8.4/terraform_1.8.4_linux_amd64.zip" && \ +RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.9.2/terraform_1.9.2_linux_amd64.zip" && \ unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \ diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index e4693c3057db2..7f9464857f723 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -260,7 +260,7 @@ ] } ], - "timestamp": "2024-05-31T22:25:19Z", + "timestamp": "2024-07-15T17:48:23Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json index eed7ec7b0fe61..e30cc7513c92b 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "2941e1eb-40f5-41cf-9e08-8f0f1a80d430", + "id": "487890be-5e3c-4b06-a95b-a1d0a26f45c3", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "3105121f-9b54-4c91-b497-9da9bb05c5b6", + "token": "d50589ba-d3df-48e7-8fea-1ce92ea1e4e2", "troubleshooting_url": null }, "sensitive_values": { @@ -69,7 +69,7 @@ "outputs": { "script": "" }, - "random": "3895262600016319159" + "random": "2660912917742059845" }, "sensitive_values": { "inputs": {}, @@ -84,7 +84,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5027788252939043492", + "id": "7409017517144186812", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json index 8b02d13cdc75e..01ebff551b463 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -205,7 +205,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:20Z", + "timestamp": "2024-07-15T17:48:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json index 95db4fc47c82c..109f1a816e7c8 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "da093356-6550-4e76-bb9e-0269cede7e31", + "id": "d700ca89-c521-478d-a430-833580e60941", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "ebcb7f0e-4b80-4972-b434-1a42aa650d78", + "token": "1ffba24c-49cd-44ca-9855-08086c8f665f", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2686005653093770315", + "id": "8823809151721173831", "triggers": null }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1732714319726388691", + "id": "6260983806355230616", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json index 948ce6580b63b..b57638172a90d 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -205,7 +205,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:22Z", + "timestamp": "2024-07-15T17:48:26Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json index 15bfeec63e134..4e138f7476405 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "e56c4e1a-6b1a-4007-880c-875dc6400b73", + "id": "d2d1c3a3-3315-47ed-a200-290455966190", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "b3666f42-cc88-454e-93bd-553f71306dbe", + "token": "e2076595-5316-47ec-a305-215f2f2a901c", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8818573993093135925", + "id": "2887811124246756573", "triggers": null }, "sensitive_values": {}, @@ -73,7 +73,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2487290649323445841", + "id": "6007238228767050576", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json index e2bd6410a62c4..8929284177be8 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -204,7 +204,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:26Z", + "timestamp": "2024-07-15T17:48:30Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json index ce2facb3c5a1c..4e56df9aa0d7b 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "cd49cbe2-97f4-4980-9b13-4e4008f4d594", + "id": "51c9236c-7146-4e6b-85c2-b21361a6a359", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "4b1c44cb-d960-42ef-b19e-60d169085657", + "token": "0779e4d7-d9cf-4fa6-b3f7-92e6b83e52ca", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6613171819431602989", + "id": "5801369723993496133", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json index c3fe9046116ae..0371606e527fc 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -204,7 +204,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:24Z", + "timestamp": "2024-07-15T17:48:28Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json index 3ce1d2d34a181..49efca3f597ce 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "dac3e164-c9d2-43e2-89ee-54ce5955e551", + "id": "ba5352ad-c833-442b-93c8-86e330a65192", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "99ccf297-47b1-4c7c-819e-0bac896b12bd", + "token": "364b1d92-7a4f-475e-956a-90f4b2cfd2eb", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5268162908997861371", + "id": "3169937457521011358", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json index 77cac08ba071d..b0cacf1cc79f0 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -228,7 +228,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:28Z", + "timestamp": "2024-07-15T17:48:32Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json index 481e197946226..5b0424973a840 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -54,7 +54,7 @@ } ], "env": null, - "id": "2fcac464-b22b-4567-8391-7cdf592dae14", + "id": "186d9525-cebc-476f-888a-4fb43d443938", "init_script": "", "login_before_ready": true, "metadata": [], @@ -66,7 +66,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "57bcc78a-ed9b-46f9-9901-ffbdfb325871", + "token": "bdb44728-6909-4b52-ba86-ed6c058b5820", "troubleshooting_url": null }, "sensitive_values": { @@ -85,7 +85,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7076770981685522602", + "id": "848898101208151671", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfplan.json b/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfplan.json index ca6e7765c7a5b..6ca82aedf141c 100644 --- a/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfplan.json +++ b/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -223,7 +223,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:30Z", + "timestamp": "2024-07-15T17:48:34Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfstate.json b/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfstate.json index ae548c8f97f82..0087c31316519 100644 --- a/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfstate.json +++ b/provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -52,7 +52,7 @@ } ], "env": null, - "id": "c924e5b7-e2cb-4eb5-993e-3cc489ed5213", + "id": "30e31610-1801-4837-957e-93bdbbc64ea3", "init_script": "", "login_before_ready": true, "metadata": [], @@ -64,7 +64,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "cc8ceb98-822f-4b8f-b645-2162fada1dfb", + "token": "825b23c4-4243-4991-ac33-483ee4c50575", "troubleshooting_url": null }, "sensitive_values": { @@ -83,7 +83,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7049248910828562611", + "id": "8892771970332750063", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json index 2cdfdcf13345a..4c22ab424aeb0 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -225,7 +225,7 @@ ] } ], - "timestamp": "2024-05-31T22:25:32Z", + "timestamp": "2024-07-15T17:48:36Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json index 40519b8266850..513fe487d181b 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "b691d6a2-76de-4441-ac90-3260282dc1fb", + "id": "da0d9673-d232-47f5-8869-ebd78444dde0", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "244bf23b-b483-46f9-b2ff-7a6e746c836f", + "token": "df57eefc-83d5-444e-bbb5-47b5603156fa", "troubleshooting_url": null }, "sensitive_values": { @@ -57,8 +57,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "b691d6a2-76de-4441-ac90-3260282dc1fb", - "id": "66ce959f-b821-4657-9bdb-6290c3b3a0b9", + "agent_id": "da0d9673-d232-47f5-8869-ebd78444dde0", + "id": "f4b242e6-f0c9-4cd4-adb0-06062ed8a1b7", "instance_id": "example" }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3867175311980978156", + "id": "7960015436996479556", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json index 2d63b29fac5e4..100d89f57a080 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -327,7 +327,7 @@ ] } ], - "timestamp": "2024-05-31T22:25:34Z", + "timestamp": "2024-07-15T17:48:38Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json index dc78ba27d9f46..079f9c54fd818 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d3eece5c-3d36-4e77-a67c-284d6a665004", + "id": "ae638ce3-e9a0-4331-ad0d-b81d93975725", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "793d9e17-fe59-4e70-83ee-76397b81a5bd", + "token": "fdd8d060-455d-471f-a025-72937e049ccd", "troubleshooting_url": null }, "sensitive_values": { @@ -58,13 +58,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d3eece5c-3d36-4e77-a67c-284d6a665004", + "agent_id": "ae638ce3-e9a0-4331-ad0d-b81d93975725", "command": null, "display_name": "app1", "external": false, "healthcheck": [], "icon": null, - "id": "02a5c323-badd-4a9d-bb5e-6926b8c3f317", + "id": "65739639-3a6a-43ae-b95b-ba0d5ce07ce8", "name": null, "order": null, "relative_path": null, @@ -89,13 +89,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d3eece5c-3d36-4e77-a67c-284d6a665004", + "agent_id": "ae638ce3-e9a0-4331-ad0d-b81d93975725", "command": null, "display_name": "app2", "external": false, "healthcheck": [], "icon": null, - "id": "3f9b0fb0-fc06-49ed-b869-27b570b86b47", + "id": "37f6ea39-3c4a-458d-9f0d-1c036bc5f1d7", "name": null, "order": null, "relative_path": null, @@ -119,7 +119,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6739553050203442390", + "id": "2485965605399142745", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json index e55d3c536c9e5..94cf2e79ec738 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.5", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -587,7 +587,7 @@ ] } ], - "timestamp": "2024-07-01T14:04:52Z", + "timestamp": "2024-07-15T17:48:43Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json index 406e8b0aba351..db066d1078bbd 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.5", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "f70d5406-a47c-43f5-bc9f-303754927057", + "id": "74d75dac-6a80-4cac-9153-3a387bde6824", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "ca4bb419-556c-4e05-9ff1-9770f374da4e", + "token": "9683bf91-8de9-419d-8c60-294a81995ad6", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "ad49af97-8978-4464-a33a-7a078384292f", + "id": "27e6d9dd-6136-42ae-980a-eb299030111e", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "f6570798-baae-48a3-991c-a8560ce89d4f", + "token": "102429e0-a63a-4b75-9499-596c90f954ea", "troubleshooting_url": null }, "sensitive_values": { @@ -102,13 +102,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "f70d5406-a47c-43f5-bc9f-303754927057", + "agent_id": "74d75dac-6a80-4cac-9153-3a387bde6824", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "64cda2f9-04da-42bc-9354-da760d063e59", + "id": "37e01326-a44b-4042-b042-5b3bd26dff1d", "name": null, "order": null, "relative_path": null, @@ -132,7 +132,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "f70d5406-a47c-43f5-bc9f-303754927057", + "agent_id": "74d75dac-6a80-4cac-9153-3a387bde6824", "command": null, "display_name": null, "external": false, @@ -144,7 +144,7 @@ } ], "icon": null, - "id": "6ff03bae-cb3a-4b32-a475-05a4e104755d", + "id": "31576d00-cd93-452c-a385-ef91d8ebabc1", "name": null, "order": null, "relative_path": null, @@ -170,13 +170,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "ad49af97-8978-4464-a33a-7a078384292f", + "agent_id": "27e6d9dd-6136-42ae-980a-eb299030111e", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "59a1c0f0-21fb-4867-a7db-33a4d8a3d18e", + "id": "c8bb967e-4a36-4ccb-89f6-93cabfba150d", "name": null, "order": null, "relative_path": null, @@ -200,7 +200,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3152137311613337201", + "id": "4919579386937214358", "triggers": null }, "sensitive_values": {}, @@ -216,7 +216,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4927717367839364271", + "id": "4338309449618140876", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json index ee79410e810c7..c3ecb1db00d44 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.5", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -472,19 +472,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] } ], - "timestamp": "2024-07-02T13:02:20Z", + "timestamp": "2024-07-15T17:48:46Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json index 843887ac818fc..a982897075c3a 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.5", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "20f30173-700b-48fa-954a-3303ea0ea62f", + "id": "d5849a8b-3f84-44d1-80df-d61af159490f", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "0efed72e-b582-4573-beca-5bba2aff1a71", + "token": "1c5f00f4-f48b-4f0d-bd9b-5c97a63ea2d9", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "71dec38a-0885-48c3-834a-1c3455a01e43", + "id": "48ddd7f1-ab68-4247-9b8c-09ae1b93debc", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "cec160ae-dbab-44d9-99ba-dd4525448de7", + "token": "ffc286fe-0f27-46fb-bf0f-613f4e2943a4", "troubleshooting_url": null }, "sensitive_values": { @@ -102,8 +102,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "20f30173-700b-48fa-954a-3303ea0ea62f", - "id": "ad9d0cba-ace3-4257-a0e9-8521354c6eac", + "agent_id": "d5849a8b-3f84-44d1-80df-d61af159490f", + "id": "88a1c662-5e5b-4da6-bb60-4e4f4311b9ca", "name": "ENV_1", "value": "Env 1" }, @@ -120,8 +120,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "20f30173-700b-48fa-954a-3303ea0ea62f", - "id": "da1c5415-4e5e-4bd4-bb6a-2848dfe751e8", + "agent_id": "d5849a8b-3f84-44d1-80df-d61af159490f", + "id": "bbaea14d-a16b-4b1e-9feb-f445a2a08d14", "name": "ENV_2", "value": "Env 2" }, @@ -138,8 +138,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "71dec38a-0885-48c3-834a-1c3455a01e43", - "id": "06a07733-acb6-4be4-852f-ba4689230d3b", + "agent_id": "48ddd7f1-ab68-4247-9b8c-09ae1b93debc", + "id": "d6bdb1d7-06cd-4802-a860-b5d7a31f7d7b", "name": "ENV_3", "value": "Env 3" }, @@ -156,7 +156,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4158512646691730095", + "id": "1850797469207235208", "triggers": null }, "sensitive_values": {}, @@ -172,7 +172,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8795184716221619179", + "id": "214998680720912111", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json index 36b1d022ccb85..83d55b1e95056 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -535,7 +535,7 @@ ] } ], - "timestamp": "2024-07-03T10:58:35Z", + "timestamp": "2024-07-15T17:48:49Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json index 615716b3ea521..4fa235cb52eb5 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "26676b01-8c32-4fe2-af05-8409004c2132", + "id": "a46d73a8-3abc-4dab-84ae-1961772256ff", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "4d98aa2e-1b27-4a22-9658-0ccde329415c", + "token": "75b94908-e753-440a-af7d-2a7a97866360", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "ad10d725-ec7d-45f4-8b83-d67f94878f3c", + "id": "b8cce9b4-6a56-43e1-a547-5526a05f2881", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "de109669-b8e5-479d-82d0-2d0471f9a2cf", + "token": "14aa65f3-0e3f-4e86-bb86-5993c06526c1", "troubleshooting_url": null }, "sensitive_values": { @@ -102,11 +102,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "26676b01-8c32-4fe2-af05-8409004c2132", + "agent_id": "a46d73a8-3abc-4dab-84ae-1961772256ff", "cron": null, "display_name": "Foobar Script 1", "icon": null, - "id": "3083dd1d-67a0-46eb-a8c1-8d3d83a411c1", + "id": "13a60062-28d4-459c-8e53-729a45b4a75a", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -127,11 +127,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "26676b01-8c32-4fe2-af05-8409004c2132", + "agent_id": "a46d73a8-3abc-4dab-84ae-1961772256ff", "cron": null, "display_name": "Foobar Script 2", "icon": null, - "id": "ddb41617-27e2-43c8-b735-99d8567f46ca", + "id": "c13a1cc1-dfb5-4fab-a8c9-cd65bafef3c0", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -152,11 +152,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "ad10d725-ec7d-45f4-8b83-d67f94878f3c", + "agent_id": "b8cce9b4-6a56-43e1-a547-5526a05f2881", "cron": null, "display_name": "Foobar Script 3", "icon": null, - "id": "d793afab-f40a-4ae2-99d5-eae9e3d0d45f", + "id": "50d359c9-6fdd-4f29-8292-f547b4e22b32", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -177,7 +177,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4183830202442917773", + "id": "6599800639836820524", "triggers": null }, "sensitive_values": {}, @@ -193,7 +193,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6920808379078063017", + "id": "7049016876762601534", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json index 8a27774498541..ecb4729f909b2 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -464,7 +464,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:36Z", + "timestamp": "2024-07-15T17:48:40Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json index 023f6ab52f0fc..04bb862e4be54 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "2cd8a28d-b73c-4801-8748-5681512b99ed", + "id": "a777f1dc-7e43-497d-bac5-56ad5a2d7f7e", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "68c874c4-2f0d-4dff-9fd7-67209e9a08c7", + "token": "6df4262d-7ce5-41c7-b9ad-84df6d20070e", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "2e773a6e-0e57-428d-bdf8-414c2aaa55fc", + "id": "2f29a1dd-04ad-4360-bada-51a73dc1d352", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": "non-blocking", "startup_script_timeout": 30, - "token": "98944f07-1265-4329-8fd3-c92aac95855c", + "token": "52549a72-6199-4fab-beb1-27131129f94d", "troubleshooting_url": null }, "sensitive_values": { @@ -116,7 +116,7 @@ } ], "env": null, - "id": "9568f00b-0bd8-4982-a502-7b37562b1fa3", + "id": "7df8745b-3cd4-4638-a637-f370fc17973d", "init_script": "", "login_before_ready": true, "metadata": [], @@ -128,7 +128,7 @@ "startup_script": null, "startup_script_behavior": "blocking", "startup_script_timeout": 300, - "token": "8bf8789b-9efc-4517-aa30-89b99c46dd75", + "token": "bf843f72-6965-4000-b1ec-02f158556f5e", "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { @@ -161,7 +161,7 @@ } ], "env": null, - "id": "403e5299-2f3e-499c-b90a-2fa6fc9e44e6", + "id": "6a756f61-0050-4372-b458-35d38b595a79", "init_script": "", "login_before_ready": false, "metadata": [], @@ -173,7 +173,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "a10e5bfb-9756-4210-a112-877f2cfbdc0a", + "token": "4ed633b5-eff0-48ac-8089-57ffeff02bdc", "troubleshooting_url": null }, "sensitive_values": { @@ -192,7 +192,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2053669122262711043", + "id": "7329660528883337331", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json index 4a07ac904a675..dd6f3b247d4b9 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -446,7 +446,7 @@ ] } ], - "timestamp": "2024-05-31T22:25:38Z", + "timestamp": "2024-07-15T17:48:50Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json index e5a64a6928388..b172a050bebe3 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", + "id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "3be506a9-b085-4bd8-a6e9-ac1769aedac5", + "token": "eb7478f3-26ff-4c6d-b307-7c5cb78c692d", "troubleshooting_url": null }, "sensitive_values": { @@ -57,13 +57,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", + "agent_id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "cbfb480c-49f0-41dc-a5e5-fa8ab21514e7", + "id": "ae194f56-c14c-4d04-a05b-7cd9c4a95dbe", "name": null, "order": null, "relative_path": null, @@ -87,7 +87,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", + "agent_id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", "command": null, "display_name": null, "external": false, @@ -99,7 +99,7 @@ } ], "icon": null, - "id": "6cc74cc4-edd4-482a-be9c-46243008081d", + "id": "8254828f-8582-497a-8f9d-c2bc2b3495cc", "name": null, "order": null, "relative_path": null, @@ -125,13 +125,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", + "agent_id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "7b2131ed-3850-439e-8942-6c83fe02ce0c", + "id": "ec4dea85-191b-4543-b19c-90f298c514fb", "name": null, "order": null, "relative_path": null, @@ -155,7 +155,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6270198559972381862", + "id": "7610101534452317567", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json index 70379dc90d732..e2ccff05866b0 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -432,7 +432,7 @@ ] } ], - "timestamp": "2024-05-31T22:25:42Z", + "timestamp": "2024-07-15T17:48:54Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json index 264edcf513f81..569f348ec6c3a 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "15b21cea-46cb-4e70-b648-56dceff97236", + "id": "8a6eab74-3f83-4551-ab7c-6e2fbae32099", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "3308a570-7944-4238-aca8-fbc3644d7548", + "token": "c90854c9-a5a6-4794-9470-ef05bbc51491", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "28db1106-e6f0-41ff-b707-3100a99cadff", + "id": "77c46f95-fee8-4587-b6db-5da8d7d562a8", "item": [ { "is_null": false, @@ -86,7 +86,7 @@ "value": "" } ], - "resource_id": "3221770356529482934" + "resource_id": "5995054412151645025" }, "sensitive_values": { "item": [ @@ -110,7 +110,7 @@ "daily_cost": 20, "hide": true, "icon": "/icon/server.svg", - "id": "a30b56a6-c122-485a-a128-4210600ad17f", + "id": "20faad5d-8891-4ec8-8a94-46967240127f", "item": [ { "is_null": false, @@ -119,7 +119,7 @@ "value": "world" } ], - "resource_id": "3221770356529482934" + "resource_id": "5995054412151645025" }, "sensitive_values": { "item": [ @@ -139,7 +139,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3221770356529482934", + "id": "5995054412151645025", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json index 8e06a483749ac..09639c0768fe1 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -384,7 +384,7 @@ ] } ], - "timestamp": "2024-05-31T22:25:40Z", + "timestamp": "2024-07-15T17:48:52Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json index 80cb793a44704..3efef1ac379e8 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "5d102462-7646-4aae-bdac-c8b9906fb5b3", + "id": "cbffc18b-d2e5-4826-b202-5b7158917307", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "1d1ccced-ce84-4cbf-a80f-f17a59e948a0", + "token": "3ccecdc6-6947-44f8-bede-f3c8ee8f7afe", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "35194a0a-0012-4da3-9e3a-a4d7bdcc9638", + "id": "bee16745-291f-4209-937f-e8198beefbb2", "item": [ { "is_null": false, @@ -98,7 +98,7 @@ "value": "squirrel" } ], - "resource_id": "2094194534443319186" + "resource_id": "23022633153502273" }, "sensitive_values": { "item": [ @@ -121,7 +121,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2094194534443319186", + "id": "23022633153502273", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json index 240c9affe23e0..5a9754c6eb8ef 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5f79d935-c5bc-47e4-8152-eed302afc455", + "id": "2505d55b-a9f4-4aaa-90fd-b4f36079e2fd", "mutable": false, "name": "Example", "option": null, @@ -163,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e8af506e-91e7-457a-8e68-f33109f30e6a", + "id": "ad73ddbc-2c11-45a1-913c-b73cdd3b9b0f", "mutable": false, "name": "Sample", "option": null, @@ -269,7 +269,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:46Z", + "timestamp": "2024-07-15T17:48:58Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json index 4505699adf299..b3fed19aaa61c 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "487e2328-8fa1-472f-a35d-5c017f5a2621", + "id": "84da03d3-81af-43bd-bdc0-6fc2f34e3f4b", "mutable": false, "name": "Example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c85ec281-458c-4932-a10d-049be7e1b8f8", + "id": "eeb97e5f-1186-422f-b6db-95b3d4257636", "mutable": false, "name": "Sample", "option": null, @@ -80,7 +80,7 @@ } ], "env": null, - "id": "3d98abaf-7a38-450f-9fc9-eaebbebb1f1f", + "id": "ba82266f-8b63-4a31-9158-94b5ca51ceeb", "init_script": "", "login_before_ready": true, "metadata": [], @@ -92,7 +92,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "3000e759-60df-4470-8f51-50ea4bc6a1ad", + "token": "e8177f3a-5ce1-41ea-b709-cc8c3624c298", "troubleshooting_url": null }, "sensitive_values": { @@ -111,7 +111,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4580074114866058503", + "id": "8146132740199712825", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json index 0535ccd50bb59..fb308658d78f1 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "c2d5292e-1dea-434b-b5cc-dc288c2a512b", + "id": "0c018669-159f-4444-a3ca-3f80c9bb3ce3", "mutable": true, "name": "number_example", "option": null, @@ -163,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "689418c1-935c-40ad-aa9f-37ab4f8d9501", + "id": "78ced97f-753b-45e1-b176-5f7f37956363", "mutable": false, "name": "number_example_max", "option": null, @@ -202,7 +202,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "bc7db79f-d6ef-45a2-9bbf-50710eb1db8c", + "id": "df27d2cd-6feb-4106-bc0d-dacb33da8547", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -241,7 +241,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5e88eade-4255-4693-86bf-2c0331ca2a06", + "id": "35584863-347b-4dc0-8618-b2f7f0e42bbf", "mutable": false, "name": "number_example_min", "option": null, @@ -280,7 +280,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "26c34bb9-535d-45d7-bebd-1dcb2300f242", + "id": "cafe4351-a64b-481d-9a0d-e2c9cf057b25", "mutable": false, "name": "number_example_min_max", "option": null, @@ -319,7 +319,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "3b55387f-0117-4d34-b585-14959f4a9267", + "id": "41659f9c-8934-4763-8285-9ec401f5ef6b", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -551,7 +551,7 @@ ] } }, - "timestamp": "2024-05-31T22:25:48Z", + "timestamp": "2024-07-15T17:49:00Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json index e8415b0959bfa..3e18e55b2a735 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "1f836366-337f-47a9-bc49-f4810b2f1078", + "id": "d82331f3-56ce-43f5-a6f6-d818c916ac7a", "mutable": true, "name": "number_example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d58e721b-0134-42b6-b4b9-bb012f43a439", + "id": "6ee08f4e-4200-4c4c-b606-7e7d4a6a5fdb", "mutable": false, "name": "number_example_max", "option": null, @@ -83,7 +83,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4c3ff771-15ab-4a33-8067-45d5d44a5f7e", + "id": "f879ade0-27ba-45c8-84dd-d2393a7cdad0", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -122,7 +122,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "11f8f368-f829-403a-8ad9-3a10df1db0bf", + "id": "8d057664-79e1-4f0e-a24e-72b2ac5e3306", "mutable": false, "name": "number_example_min", "option": null, @@ -161,7 +161,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9de03421-e747-4084-b808-90464beb8ab4", + "id": "0249146a-ba5e-4d59-bbd2-48d1027ebb42", "mutable": false, "name": "number_example_min_max", "option": null, @@ -200,7 +200,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "eb75256a-66d6-45d6-a0f5-331a885742e4", + "id": "edeb33bb-b8d4-4770-9c41-e0e94a4886af", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -248,7 +248,7 @@ } ], "env": null, - "id": "e6810890-032b-4a01-9562-b9a8428dcc97", + "id": "7c672b0d-41f4-45ae-9596-9be1455505a9", "init_script": "", "login_before_ready": true, "metadata": [], @@ -260,7 +260,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "c162e35d-a066-472c-a469-91d6b116fa6f", + "token": "4938f98a-bc70-4dae-8825-27d41ba34842", "troubleshooting_url": null }, "sensitive_values": { @@ -279,7 +279,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8464994280406150541", + "id": "8043802126847197223", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json index 393acb59fe5a2..a37148f2b4d24 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e5891365-ddf0-417c-a5d7-9ae7cdc76754", + "id": "b0837593-03d9-4039-87d3-9170a6513751", "mutable": false, "name": "Example", "option": [ @@ -180,7 +180,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "b95cd221-cdca-4d6e-98d0-e4fb6d90dc32", + "id": "aff9e428-f431-4ca1-8c2f-3c1adf662ed7", "mutable": false, "name": "number_example", "option": null, @@ -207,7 +207,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e1e5bce0-ea22-401d-8253-1b9175077abc", + "id": "15371ea5-9ffc-4672-8c7b-338eed974655", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -246,7 +246,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "26a6eaca-c9ae-4130-a734-6c290637b250", + "id": "2e77000c-d96f-4110-ad55-3a733fef768c", "mutable": false, "name": "number_example_min_max", "option": null, @@ -285,7 +285,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ad985f1d-21fe-4ce1-988d-903084016cb4", + "id": "2c9f5877-7df8-42a8-9d34-20d7a74832e0", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -324,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9465cc3a-703a-4218-8fa4-d16a1631e648", + "id": "d9eb4625-889c-4eb7-87d4-80644c5ee57a", "mutable": false, "name": "Sample", "option": null, @@ -355,7 +355,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "547f8420-0630-4c4d-9507-e2d63640d0d9", + "id": "7549ee27-b944-46e8-89c7-66ce22285efc", "mutable": true, "name": "First parameter from module", "option": null, @@ -382,7 +382,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5c32dcad-d54a-474f-97f0-fbcc8aaba9bd", + "id": "c5fd9f8a-f83f-450a-b93a-4f4267be580a", "mutable": true, "name": "Second parameter from module", "option": null, @@ -414,7 +414,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "2362ba5e-0779-472c-bd3c-22446fd14075", + "id": "1b819f45-1451-45d8-bdf6-80c067be383b", "mutable": true, "name": "First parameter from child module", "option": null, @@ -441,7 +441,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0a8f6df4-364f-4d5f-b935-7dee8c568e10", + "id": "103f609f-e7d4-4060-b9dc-cc59afbcc2ad", "mutable": true, "name": "Second parameter from child module", "option": null, @@ -794,7 +794,7 @@ } } }, - "timestamp": "2024-05-31T22:25:44Z", + "timestamp": "2024-07-15T17:48:56Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json index eeec6ba4ea9c9..f3011a94e387c 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.8.4", + "terraform_version": "1.9.2", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9f041124-ccf3-4b7b-9e0d-4d37335a6f98", + "id": "6de72459-12d0-493b-a6de-849e08a80231", "mutable": false, "name": "Example", "option": [ @@ -61,7 +61,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ab5035e4-8dab-453d-92bc-9b866af26c78", + "id": "4c531563-c935-41ad-8cca-f417c16e5278", "mutable": false, "name": "number_example", "option": null, @@ -88,7 +88,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "bdf84ab6-1029-4645-a2df-cd897f30c145", + "id": "0c77e023-ebfd-4868-a25b-2f6b131c52a3", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -127,7 +127,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "b283766e-7e58-459d-a81f-aa71a95bbc0b", + "id": "d5415c63-b007-4409-8715-8750fcd014c5", "mutable": false, "name": "number_example_min_max", "option": null, @@ -166,7 +166,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7a4f8f6d-d81a-4b15-9d5b-6f221f2a6b07", + "id": "27846e1e-1ea4-463d-a0f1-2f06bd2767ff", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -205,7 +205,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "fd12f0d0-87dc-4d88-bcdc-352c11bd2144", + "id": "e0d43ce9-3377-48ab-8917-960a39fc78aa", "mutable": false, "name": "Sample", "option": null, @@ -241,7 +241,7 @@ } ], "env": null, - "id": "a20d4cf7-2d49-4ab8-8858-a9e1531e7033", + "id": "a84d968c-98b8-49e4-878f-8afbfcfcd058", "init_script": "", "login_before_ready": true, "metadata": [], @@ -253,7 +253,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "0d8692b3-746f-4f2e-b0cc-7952ee240ba4", + "token": "494f0e2b-0727-4833-b824-f3c5ae5ec701", "troubleshooting_url": null }, "sensitive_values": { @@ -272,7 +272,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "9033341587141190203", + "id": "6676147453513335498", "triggers": null }, "sensitive_values": {}, @@ -297,7 +297,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "6be6ebff-574c-4ab6-b314-a65f4f20446e", + "id": "28bbdb1b-bbfd-448e-a90d-667372384184", "mutable": true, "name": "First parameter from module", "option": null, @@ -324,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d7e3d42e-dc51-47f2-ae5f-1b1bdaa85e25", + "id": "edaafb64-16d1-4abc-9016-aa30d7ee3ed1", "mutable": true, "name": "Second parameter from module", "option": null, @@ -356,7 +356,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "69f71896-5cc4-44d0-ae7a-b7a5514a07ae", + "id": "85b4aa9c-206a-4708-b12b-f80e8905d178", "mutable": true, "name": "First parameter from child module", "option": null, @@ -383,7 +383,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9a2b177e-8f3c-4d6b-b302-3ba2f0e6c76b", + "id": "913d7ffb-d406-4a2e-9368-106e0af12d34", "mutable": true, "name": "Second parameter from child module", "option": null, diff --git a/provisioner/terraform/testdata/version.txt b/provisioner/terraform/testdata/version.txt index bfa363e76ed71..8fdcf3869464a 100644 --- a/provisioner/terraform/testdata/version.txt +++ b/provisioner/terraform/testdata/version.txt @@ -1 +1 @@ -1.8.4 +1.9.2 diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 36a702d08955d..b1c3109c1295d 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -26,7 +26,7 @@ RUN apk add --no-cache \ # Terraform was disabled in the edge repo due to a build issue. # https://gitlab.alpinelinux.org/alpine/aports/-/commit/f3e263d94cfac02d594bef83790c280e045eba35 # Using wget for now. Note that busybox unzip doesn't support streaming. -RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; elif [ "${ARCH}" == "aarch64" ]; then ARCH="arm64"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.8.4/terraform_1.8.4_linux_${ARCH}.zip" && \ +RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; elif [ "${ARCH}" == "aarch64" ]; then ARCH="arm64"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.9.2/terraform_1.9.2_linux_${ARCH}.zip" && \ busybox unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \