From fa675791226fb6f724acb5ae8a5c94b964edd77e Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Mon, 28 Oct 2024 15:09:03 -0500 Subject: [PATCH] chore: update Terraform to 1.9.8 --- .github/actions/setup-tf/action.yaml | 2 +- docs/install/offline.md | 2 +- dogfood/contents/Dockerfile | 4 +-- install.sh | 2 +- provisioner/terraform/install.go | 2 +- .../calling-module/calling-module.tfplan.json | 4 +-- .../calling-module.tfstate.json | 10 +++---- .../chaining-resources.tfplan.json | 4 +-- .../chaining-resources.tfstate.json | 10 +++---- .../conflicting-resources.tfplan.json | 4 +-- .../conflicting-resources.tfstate.json | 10 +++---- .../display-apps-disabled.tfplan.json | 4 +-- .../display-apps-disabled.tfstate.json | 8 +++--- .../display-apps/display-apps.tfplan.json | 4 +-- .../display-apps/display-apps.tfstate.json | 8 +++--- .../external-auth-providers.tfplan.json | 6 ++-- .../external-auth-providers.tfstate.json | 8 +++--- provisioner/terraform/testdata/generate.sh | 5 ++++ .../git-auth-providers.tfplan.json | 6 ++-- .../git-auth-providers.tfstate.json | 8 +++--- .../instance-id/instance-id.tfplan.json | 4 +-- .../instance-id/instance-id.tfstate.json | 12 ++++---- .../mapped-apps/mapped-apps.tfplan.json | 4 +-- .../mapped-apps/mapped-apps.tfstate.json | 16 +++++------ .../multiple-agents-multiple-apps.tfplan.json | 8 +++--- ...multiple-agents-multiple-apps.tfstate.json | 26 ++++++++--------- .../multiple-agents-multiple-envs.tfplan.json | 8 +++--- ...multiple-agents-multiple-envs.tfstate.json | 26 ++++++++--------- ...ltiple-agents-multiple-scripts.tfplan.json | 8 +++--- ...tiple-agents-multiple-scripts.tfstate.json | 26 ++++++++--------- .../multiple-agents.tfplan.json | 4 +-- .../multiple-agents.tfstate.json | 20 ++++++------- .../multiple-apps/multiple-apps.tfplan.json | 4 +-- .../multiple-apps/multiple-apps.tfstate.json | 20 ++++++------- .../resource-metadata-duplicate.tfplan.json | 4 +-- .../resource-metadata-duplicate.tfstate.json | 16 +++++------ .../resource-metadata.tfplan.json | 4 +-- .../resource-metadata.tfstate.json | 12 ++++---- .../rich-parameters-order.tfplan.json | 10 +++---- .../rich-parameters-order.tfstate.json | 12 ++++---- .../rich-parameters-validation.tfplan.json | 18 ++++++------ .../rich-parameters-validation.tfstate.json | 20 ++++++------- .../rich-parameters.tfplan.json | 26 ++++++++--------- .../rich-parameters.tfstate.json | 28 +++++++++---------- provisioner/terraform/testdata/version.txt | 2 +- scripts/Dockerfile.base | 2 +- 46 files changed, 228 insertions(+), 223 deletions(-) diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml index 12ee87f5a5c9f..c52f1138e03ca 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@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2 with: - terraform_version: 1.9.2 + terraform_version: 1.9.8 terraform_wrapper: false diff --git a/docs/install/offline.md b/docs/install/offline.md index 5a06388a992ee..6a4aae1af0daa 100644 --- a/docs/install/offline.md +++ b/docs/install/offline.md @@ -54,7 +54,7 @@ RUN mkdir -p /opt/terraform # The below step is optional if you wish to keep the existing version. # See https://github.com/coder/coder/blob/main/provisioner/terraform/install.go#L23-L24 # for supported Terraform versions. -ARG TERRAFORM_VERSION=1.9.2 +ARG TERRAFORM_VERSION=1.9.8 RUN apk update && \ apk del terraform && \ curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ diff --git a/dogfood/contents/Dockerfile b/dogfood/contents/Dockerfile index 059b76dcf0d68..bef5bccbaa423 100644 --- a/dogfood/contents/Dockerfile +++ b/dogfood/contents/Dockerfile @@ -189,9 +189,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.9.2. +# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.9.8. # Installing the same version here to match. -RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.9.2/terraform_1.9.2_linux_amd64.zip" && \ +RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_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/install.sh b/install.sh index 8fbc4e58f000c..257576ae4d57a 100755 --- a/install.sh +++ b/install.sh @@ -250,7 +250,7 @@ EOF main() { MAINLINE=1 STABLE=0 - TERRAFORM_VERSION="1.9.2" + TERRAFORM_VERSION="1.9.8" if [ "${TRACE-}" ]; then set -x diff --git a/provisioner/terraform/install.go b/provisioner/terraform/install.go index 8c96be6452a22..af425ec307724 100644 --- a/provisioner/terraform/install.go +++ b/provisioner/terraform/install.go @@ -20,7 +20,7 @@ var ( // when Terraform is not available on the system. // NOTE: Keep this in sync with the version in scripts/Dockerfile.base. // NOTE: Keep this in sync with the version in install.sh. - TerraformVersion = version.Must(version.NewVersion("1.9.2")) + TerraformVersion = version.Must(version.NewVersion("1.9.8")) minTerraformVersion = version.Must(version.NewVersion("1.1.0")) maxTerraformVersion = version.Must(version.NewVersion("1.9.9")) // use .9 to automatically allow patch releases diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index 7f9464857f723..30bc360bb1940 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -260,7 +260,7 @@ ] } ], - "timestamp": "2024-07-15T17:48:23Z", + "timestamp": "2024-10-28T20:07:49Z", "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 e30cc7513c92b..5ead2c6ace0d5 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "487890be-5e3c-4b06-a95b-a1d0a26f45c3", + "id": "04d66dc4-e25a-4f65-af6f-a9af6b907430", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "d50589ba-d3df-48e7-8fea-1ce92ea1e4e2", + "token": "10fbd765-b0cc-4d6f-b5de-e5a036b2cb4b", "troubleshooting_url": null }, "sensitive_values": { @@ -69,7 +69,7 @@ "outputs": { "script": "" }, - "random": "2660912917742059845" + "random": "7917595776755902204" }, "sensitive_values": { "inputs": {}, @@ -84,7 +84,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7409017517144186812", + "id": "2669991968036854745", "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 01ebff551b463..38af6827019e7 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -205,7 +205,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:25Z", + "timestamp": "2024-10-28T20:07:50Z", "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 109f1a816e7c8..0cee8567db250 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d700ca89-c521-478d-a430-833580e60941", + "id": "bcf4bae1-0870-48e9-8bb4-af2f652c4d54", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "1ffba24c-49cd-44ca-9855-08086c8f665f", + "token": "afe98f25-25a2-4892-b921-be04bcd71efc", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8823809151721173831", + "id": "6598177855275264799", "triggers": null }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6260983806355230616", + "id": "4663187895457986148", "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 b57638172a90d..3fe9f6c41fa9b 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -205,7 +205,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:26Z", + "timestamp": "2024-10-28T20:07:52Z", "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 4e138f7476405..ffd0690db2263 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d2d1c3a3-3315-47ed-a200-290455966190", + "id": "d047c7b6-b69e-4029-ab82-67468a0364f7", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "e2076595-5316-47ec-a305-215f2f2a901c", + "token": "ceff37e3-52b9-4c80-af1b-1f9f99184590", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2887811124246756573", + "id": "3120105803817695206", "triggers": null }, "sensitive_values": {}, @@ -73,7 +73,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6007238228767050576", + "id": "2942451035046396496", "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 8929284177be8..598d6f1735a84 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -204,7 +204,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:30Z", + "timestamp": "2024-10-28T20:07:55Z", "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 4e56df9aa0d7b..7e9bdad7a02bb 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "51c9236c-7146-4e6b-85c2-b21361a6a359", + "id": "6ba13739-4a9c-456f-90cf-feba8f194853", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "0779e4d7-d9cf-4fa6-b3f7-92e6b83e52ca", + "token": "6e348a4c-ef00-40ab-9732-817fb828045c", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5801369723993496133", + "id": "3123606937441446452", "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 0371606e527fc..3331a8f282c2b 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -204,7 +204,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:28Z", + "timestamp": "2024-10-28T20:07:54Z", "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 49efca3f597ce..2b04222e751f2 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "ba5352ad-c833-442b-93c8-86e330a65192", + "id": "b7e8dd7a-34aa-41e2-977e-e38577ab2476", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "364b1d92-7a4f-475e-956a-90f4b2cfd2eb", + "token": "c6aeeb35-2766-4524-9818-687f7687831d", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3169937457521011358", + "id": "2407243137316459395", "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 b0cacf1cc79f0..5ba9e7b6af80f 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -228,7 +228,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:32Z", + "timestamp": "2024-10-28T20:07:57Z", "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 5b0424973a840..875d8c9aaf439 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -54,7 +54,7 @@ } ], "env": null, - "id": "186d9525-cebc-476f-888a-4fb43d443938", + "id": "ec5d36c9-8690-4246-8ab3-2d85a3eacee6", "init_script": "", "login_before_ready": true, "metadata": [], @@ -66,7 +66,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "bdb44728-6909-4b52-ba86-ed6c058b5820", + "token": "78c55fa2-8e3c-4564-950d-e022c76cf05a", "troubleshooting_url": null }, "sensitive_values": { @@ -85,7 +85,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "848898101208151671", + "id": "455343782636271645", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/generate.sh b/provisioner/terraform/testdata/generate.sh index 04ac7bdef3c64..6cc79568582ee 100755 --- a/provisioner/terraform/testdata/generate.sh +++ b/provisioner/terraform/testdata/generate.sh @@ -19,6 +19,11 @@ for d in */; do continue fi + if [[ $name == "timings-aggregation" ]]; then + popd + continue + fi + terraform init -upgrade terraform plan -out terraform.tfplan terraform show -json ./terraform.tfplan | jq >"$name".tfplan.json 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 6ca82aedf141c..fba34f1cb5f4d 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -223,7 +223,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:34Z", + "timestamp": "2024-10-28T20:07:58Z", "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 0087c31316519..3cf905c0a2948 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -52,7 +52,7 @@ } ], "env": null, - "id": "30e31610-1801-4837-957e-93bdbbc64ea3", + "id": "ffa1f524-0350-4891-868d-93cad369318a", "init_script": "", "login_before_ready": true, "metadata": [], @@ -64,7 +64,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "825b23c4-4243-4991-ac33-483ee4c50575", + "token": "8ba649af-b498-4f20-8055-b6a0b995837e", "troubleshooting_url": null }, "sensitive_values": { @@ -83,7 +83,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8892771970332750063", + "id": "7420557451345159984", "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 4c22ab424aeb0..527a2fa05769d 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -225,7 +225,7 @@ ] } ], - "timestamp": "2024-07-15T17:48:36Z", + "timestamp": "2024-10-28T20:08:00Z", "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 513fe487d181b..929d72365502c 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "da0d9673-d232-47f5-8869-ebd78444dde0", + "id": "0389c8a5-cc5c-485d-959c-8738bada65ff", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "df57eefc-83d5-444e-bbb5-47b5603156fa", + "token": "097b6128-8d60-4849-969b-03f0b463ac2c", "troubleshooting_url": null }, "sensitive_values": { @@ -57,8 +57,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "da0d9673-d232-47f5-8869-ebd78444dde0", - "id": "f4b242e6-f0c9-4cd4-adb0-06062ed8a1b7", + "agent_id": "0389c8a5-cc5c-485d-959c-8738bada65ff", + "id": "0ae6bb98-871c-4091-8098-d32f256d8c05", "instance_id": "example" }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7960015436996479556", + "id": "5569763710827889183", "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 100d89f57a080..2151b4631647a 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -327,7 +327,7 @@ ] } ], - "timestamp": "2024-07-15T17:48:38Z", + "timestamp": "2024-10-28T20:08:02Z", "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 079f9c54fd818..9aaa7b352f518 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "ae638ce3-e9a0-4331-ad0d-b81d93975725", + "id": "b3d3e1d7-1f1f-4abf-8475-2058f73f3437", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "fdd8d060-455d-471f-a025-72937e049ccd", + "token": "56420fd5-57e5-44e0-a264-53395b74505a", "troubleshooting_url": null }, "sensitive_values": { @@ -58,13 +58,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "ae638ce3-e9a0-4331-ad0d-b81d93975725", + "agent_id": "b3d3e1d7-1f1f-4abf-8475-2058f73f3437", "command": null, "display_name": "app1", "external": false, "healthcheck": [], "icon": null, - "id": "65739639-3a6a-43ae-b95b-ba0d5ce07ce8", + "id": "e8163eb0-e56e-46e7-8848-8c6c250ce5b9", "name": null, "order": null, "relative_path": null, @@ -89,13 +89,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "ae638ce3-e9a0-4331-ad0d-b81d93975725", + "agent_id": "b3d3e1d7-1f1f-4abf-8475-2058f73f3437", "command": null, "display_name": "app2", "external": false, "healthcheck": [], "icon": null, - "id": "37f6ea39-3c4a-458d-9f0d-1c036bc5f1d7", + "id": "0971e625-7a23-4108-9765-78f7ad045b38", "name": null, "order": null, "relative_path": null, @@ -119,7 +119,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2485965605399142745", + "id": "60927265551659604", "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 94cf2e79ec738..d8f5a4763518b 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -575,19 +575,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-15T17:48:43Z", + "timestamp": "2024-10-28T20:08:05Z", "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 db066d1078bbd..4a94e05baa29d 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "74d75dac-6a80-4cac-9153-3a387bde6824", + "id": "571523c7-e7a3-420a-b65d-39d15f5f3267", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "9683bf91-8de9-419d-8c60-294a81995ad6", + "token": "c18d762d-062d-43d4-b7c2-98be546b39a6", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "27e6d9dd-6136-42ae-980a-eb299030111e", + "id": "e94994f2-cab5-4288-8ff3-a290c95e4e25", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "102429e0-a63a-4b75-9499-596c90f954ea", + "token": "c0757e3a-4be4-4643-b3ba-b27234169eb1", "troubleshooting_url": null }, "sensitive_values": { @@ -102,13 +102,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "74d75dac-6a80-4cac-9153-3a387bde6824", + "agent_id": "571523c7-e7a3-420a-b65d-39d15f5f3267", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "37e01326-a44b-4042-b042-5b3bd26dff1d", + "id": "bf2b3c44-1b1d-49c5-9149-4f2f18590c60", "name": null, "order": null, "relative_path": null, @@ -132,7 +132,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "74d75dac-6a80-4cac-9153-3a387bde6824", + "agent_id": "571523c7-e7a3-420a-b65d-39d15f5f3267", "command": null, "display_name": null, "external": false, @@ -144,7 +144,7 @@ } ], "icon": null, - "id": "31576d00-cd93-452c-a385-ef91d8ebabc1", + "id": "580cf864-a64d-4430-98b7-fa37c44083f8", "name": null, "order": null, "relative_path": null, @@ -170,13 +170,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "27e6d9dd-6136-42ae-980a-eb299030111e", + "agent_id": "e94994f2-cab5-4288-8ff3-a290c95e4e25", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "c8bb967e-4a36-4ccb-89f6-93cabfba150d", + "id": "182dca7b-12ab-4c58-9424-23b7d61135a9", "name": null, "order": null, "relative_path": null, @@ -200,7 +200,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4919579386937214358", + "id": "3778543820798621894", "triggers": null }, "sensitive_values": {}, @@ -216,7 +216,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4338309449618140876", + "id": "1094622314762410115", "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 c3ecb1db00d44..4cb28ae592516 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -472,19 +472,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] } ], - "timestamp": "2024-07-15T17:48:46Z", + "timestamp": "2024-10-28T20:08:06Z", "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 a982897075c3a..f87b6f0a9eb56 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d5849a8b-3f84-44d1-80df-d61af159490f", + "id": "702e7cd2-95a0-46cf-8ef7-c1dfbd3e56b9", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "1c5f00f4-f48b-4f0d-bd9b-5c97a63ea2d9", + "token": "1cfd79e3-3f9c-4d66-b7c2-42c385c26012", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "48ddd7f1-ab68-4247-9b8c-09ae1b93debc", + "id": "ca137ba9-45ce-44ff-8e30-59a86565fa7d", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "ffc286fe-0f27-46fb-bf0f-613f4e2943a4", + "token": "0d3aa4f8-025c-4044-8053-d077484355fb", "troubleshooting_url": null }, "sensitive_values": { @@ -102,8 +102,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d5849a8b-3f84-44d1-80df-d61af159490f", - "id": "88a1c662-5e5b-4da6-bb60-4e4f4311b9ca", + "agent_id": "702e7cd2-95a0-46cf-8ef7-c1dfbd3e56b9", + "id": "e3d37294-2407-4286-a519-7551b901ba54", "name": "ENV_1", "value": "Env 1" }, @@ -120,8 +120,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d5849a8b-3f84-44d1-80df-d61af159490f", - "id": "bbaea14d-a16b-4b1e-9feb-f445a2a08d14", + "agent_id": "702e7cd2-95a0-46cf-8ef7-c1dfbd3e56b9", + "id": "9451575b-da89-4297-a42d-4aaf0a23775d", "name": "ENV_2", "value": "Env 2" }, @@ -138,8 +138,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "48ddd7f1-ab68-4247-9b8c-09ae1b93debc", - "id": "d6bdb1d7-06cd-4802-a860-b5d7a31f7d7b", + "agent_id": "ca137ba9-45ce-44ff-8e30-59a86565fa7d", + "id": "948e3fb5-12a1-454b-b85e-d4dc1f01838f", "name": "ENV_3", "value": "Env 3" }, @@ -156,7 +156,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1850797469207235208", + "id": "7502424400840788651", "triggers": null }, "sensitive_values": {}, @@ -172,7 +172,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "214998680720912111", + "id": "3916143681500058654", "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 83d55b1e95056..ab14e49f02989 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -523,19 +523,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] } ], - "timestamp": "2024-07-15T17:48:49Z", + "timestamp": "2024-10-28T20:08:08Z", "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 4fa235cb52eb5..37c4ef13ee6fb 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "a46d73a8-3abc-4dab-84ae-1961772256ff", + "id": "753eb8c0-e2b7-4cbc-b0ff-1370ce2e4022", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "75b94908-e753-440a-af7d-2a7a97866360", + "token": "77b179b6-0e2d-4307-9ba0-98325fc96e37", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "b8cce9b4-6a56-43e1-a547-5526a05f2881", + "id": "86f7e422-1798-4de5-8209-69b023808241", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "14aa65f3-0e3f-4e86-bb86-5993c06526c1", + "token": "aa4ae02d-4084-4dff-951c-af10f78a98c2", "troubleshooting_url": null }, "sensitive_values": { @@ -102,11 +102,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "a46d73a8-3abc-4dab-84ae-1961772256ff", + "agent_id": "753eb8c0-e2b7-4cbc-b0ff-1370ce2e4022", "cron": null, "display_name": "Foobar Script 1", "icon": null, - "id": "13a60062-28d4-459c-8e53-729a45b4a75a", + "id": "eb1eb8f4-3a4a-4040-bd6a-0abce01d6330", "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": "a46d73a8-3abc-4dab-84ae-1961772256ff", + "agent_id": "753eb8c0-e2b7-4cbc-b0ff-1370ce2e4022", "cron": null, "display_name": "Foobar Script 2", "icon": null, - "id": "c13a1cc1-dfb5-4fab-a8c9-cd65bafef3c0", + "id": "1de43abc-8416-4455-87ca-23fb425b4eeb", "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": "b8cce9b4-6a56-43e1-a547-5526a05f2881", + "agent_id": "86f7e422-1798-4de5-8209-69b023808241", "cron": null, "display_name": "Foobar Script 3", "icon": null, - "id": "50d359c9-6fdd-4f29-8292-f547b4e22b32", + "id": "ede835f7-4018-464c-807d-7e07af7de9d3", "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": "6599800639836820524", + "id": "4207133259459553257", "triggers": null }, "sensitive_values": {}, @@ -193,7 +193,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7049016876762601534", + "id": "5647997484430231619", "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 ecb4729f909b2..67da167932aa4 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -464,7 +464,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:40Z", + "timestamp": "2024-10-28T20:08:03Z", "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 04bb862e4be54..cd8edc0ae29bc 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "a777f1dc-7e43-497d-bac5-56ad5a2d7f7e", + "id": "c76ed902-d4cb-4905-9961-4d58dda135f9", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "6df4262d-7ce5-41c7-b9ad-84df6d20070e", + "token": "f1aa99ea-570d-49cf-aef9-a4241e3cb023", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "2f29a1dd-04ad-4360-bada-51a73dc1d352", + "id": "1b037439-4eb3-408e-83da-28dc93645944", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": "non-blocking", "startup_script_timeout": 30, - "token": "52549a72-6199-4fab-beb1-27131129f94d", + "token": "20d4e89e-d6de-4eb7-8877-f9186d684aa5", "troubleshooting_url": null }, "sensitive_values": { @@ -116,7 +116,7 @@ } ], "env": null, - "id": "7df8745b-3cd4-4638-a637-f370fc17973d", + "id": "453b5404-8ea4-4197-8664-3638e6a012ca", "init_script": "", "login_before_ready": true, "metadata": [], @@ -128,7 +128,7 @@ "startup_script": null, "startup_script_behavior": "blocking", "startup_script_timeout": 300, - "token": "bf843f72-6965-4000-b1ec-02f158556f5e", + "token": "0355cb42-9da0-4bad-b2aa-74db1df76fef", "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { @@ -161,7 +161,7 @@ } ], "env": null, - "id": "6a756f61-0050-4372-b458-35d38b595a79", + "id": "c0a68e9b-5b29-4d95-b664-5ac71dd633cf", "init_script": "", "login_before_ready": false, "metadata": [], @@ -173,7 +173,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "4ed633b5-eff0-48ac-8089-57ffeff02bdc", + "token": "34b78439-5d6e-431b-b06c-339f97a1e9cf", "troubleshooting_url": null }, "sensitive_values": { @@ -192,7 +192,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7329660528883337331", + "id": "5109814714394194897", "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 dd6f3b247d4b9..b156c3b5068b6 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -446,7 +446,7 @@ ] } ], - "timestamp": "2024-07-15T17:48:50Z", + "timestamp": "2024-10-28T20:08:10Z", "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 b172a050bebe3..d3fc254bf40b0 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", + "id": "b3ea3cb0-176c-4642-9bf5-cfa72e0782cc", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "eb7478f3-26ff-4c6d-b307-7c5cb78c692d", + "token": "30533677-f04a-493b-b6cb-314d9abf7769", "troubleshooting_url": null }, "sensitive_values": { @@ -57,13 +57,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", + "agent_id": "b3ea3cb0-176c-4642-9bf5-cfa72e0782cc", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "ae194f56-c14c-4d04-a05b-7cd9c4a95dbe", + "id": "537e9069-492b-4721-96dd-cffba275ecd9", "name": null, "order": null, "relative_path": null, @@ -87,7 +87,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", + "agent_id": "b3ea3cb0-176c-4642-9bf5-cfa72e0782cc", "command": null, "display_name": null, "external": false, @@ -99,7 +99,7 @@ } ], "icon": null, - "id": "8254828f-8582-497a-8f9d-c2bc2b3495cc", + "id": "3a4c78a0-7ea3-44aa-9ea8-4e08e387b4b6", "name": null, "order": null, "relative_path": null, @@ -125,13 +125,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "af75acda-ef6d-4f1f-97e3-31133118b1b9", + "agent_id": "b3ea3cb0-176c-4642-9bf5-cfa72e0782cc", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "ec4dea85-191b-4543-b19c-90f298c514fb", + "id": "23555681-0ecb-4962-8e85-367d3a9d0228", "name": null, "order": null, "relative_path": null, @@ -155,7 +155,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7610101534452317567", + "id": "2905101599123333983", "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 e2ccff05866b0..3b7881701038c 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -432,7 +432,7 @@ ] } ], - "timestamp": "2024-07-15T17:48:54Z", + "timestamp": "2024-10-28T20:08:13Z", "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 569f348ec6c3a..170630d0e3103 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "8a6eab74-3f83-4551-ab7c-6e2fbae32099", + "id": "0cbc2449-fbaa-447a-8487-6c47367af0be", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "c90854c9-a5a6-4794-9470-ef05bbc51491", + "token": "b03606cc-1ed3-4187-964d-389cf2ef223f", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "77c46f95-fee8-4587-b6db-5da8d7d562a8", + "id": "d6c33b98-addd-4d97-8659-405350bc06c1", "item": [ { "is_null": false, @@ -86,7 +86,7 @@ "value": "" } ], - "resource_id": "5995054412151645025" + "resource_id": "5673227143105805783" }, "sensitive_values": { "item": [ @@ -110,7 +110,7 @@ "daily_cost": 20, "hide": true, "icon": "/icon/server.svg", - "id": "20faad5d-8891-4ec8-8a94-46967240127f", + "id": "76594f08-2261-4114-a61f-e07107a86f89", "item": [ { "is_null": false, @@ -119,7 +119,7 @@ "value": "world" } ], - "resource_id": "5995054412151645025" + "resource_id": "5673227143105805783" }, "sensitive_values": { "item": [ @@ -139,7 +139,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5995054412151645025", + "id": "5673227143105805783", "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 09639c0768fe1..f9c24830c6ef3 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -384,7 +384,7 @@ ] } ], - "timestamp": "2024-07-15T17:48:52Z", + "timestamp": "2024-10-28T20:08:11Z", "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 3efef1ac379e8..a41aff216b11c 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "cbffc18b-d2e5-4826-b202-5b7158917307", + "id": "3bcbc547-b434-4dbd-b5ed-551edfba1b5c", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "3ccecdc6-6947-44f8-bede-f3c8ee8f7afe", + "token": "2d25fcc3-a355-4e92-98c6-ab780894ffee", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "bee16745-291f-4209-937f-e8198beefbb2", + "id": "d9ce721c-dff3-44fd-92d1-155f37c84a56", "item": [ { "is_null": false, @@ -98,7 +98,7 @@ "value": "squirrel" } ], - "resource_id": "23022633153502273" + "resource_id": "4099397325680267994" }, "sensitive_values": { "item": [ @@ -121,7 +121,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "23022633153502273", + "id": "4099397325680267994", "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 5a9754c6eb8ef..72120dfaabeec 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "2505d55b-a9f4-4aaa-90fd-b4f36079e2fd", + "id": "e8805d7c-1636-4416-9520-b83234d68ddc", "mutable": false, "name": "Example", "option": null, @@ -163,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ad73ddbc-2c11-45a1-913c-b73cdd3b9b0f", + "id": "df43829a-49ce-4911-97ef-2fca78456c9f", "mutable": false, "name": "Sample", "option": null, @@ -269,7 +269,7 @@ ] } }, - "timestamp": "2024-07-15T17:48:58Z", + "timestamp": "2024-10-28T20:08:17Z", "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 b3fed19aaa61c..1d675d685a37c 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "84da03d3-81af-43bd-bdc0-6fc2f34e3f4b", + "id": "81ada233-3a30-49d3-a56f-aca92f19c411", "mutable": false, "name": "Example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "eeb97e5f-1186-422f-b6db-95b3d4257636", + "id": "4dc1049f-0d54-408a-a412-95629ae5cd84", "mutable": false, "name": "Sample", "option": null, @@ -80,7 +80,7 @@ } ], "env": null, - "id": "ba82266f-8b63-4a31-9158-94b5ca51ceeb", + "id": "86cc4d6e-23b3-4632-9bc9-d3a321e8b906", "init_script": "", "login_before_ready": true, "metadata": [], @@ -92,7 +92,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "e8177f3a-5ce1-41ea-b709-cc8c3624c298", + "token": "0c3e7639-bafc-4e62-8e38-cb4e1b44e3f3", "troubleshooting_url": null }, "sensitive_values": { @@ -111,7 +111,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8146132740199712825", + "id": "2501594036325466407", "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 fb308658d78f1..66153605ee4a0 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "0c018669-159f-4444-a3ca-3f80c9bb3ce3", + "id": "df8ad066-047d-434d-baa3-e19517ee7395", "mutable": true, "name": "number_example", "option": null, @@ -163,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "78ced97f-753b-45e1-b176-5f7f37956363", + "id": "7d9658aa-ff69-477a-9063-e9fd49fd9a9b", "mutable": false, "name": "number_example_max", "option": null, @@ -202,7 +202,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "df27d2cd-6feb-4106-bc0d-dacb33da8547", + "id": "bd6fcaac-db7f-4c4d-a664-fe7f47fad28a", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -241,7 +241,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "35584863-347b-4dc0-8618-b2f7f0e42bbf", + "id": "8d42942d-5a10-43c9-a31d-d3fe9a7814e8", "mutable": false, "name": "number_example_min", "option": null, @@ -280,7 +280,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "cafe4351-a64b-481d-9a0d-e2c9cf057b25", + "id": "695301d0-8325-4685-824d-1ca9591689e3", "mutable": false, "name": "number_example_min_max", "option": null, @@ -319,7 +319,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "41659f9c-8934-4763-8285-9ec401f5ef6b", + "id": "cd921934-d1b1-4370-8a73-2d43658ea877", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -551,7 +551,7 @@ ] } }, - "timestamp": "2024-07-15T17:49:00Z", + "timestamp": "2024-10-28T20:08:18Z", "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 3e18e55b2a735..35b981c3a9b54 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "d82331f3-56ce-43f5-a6f6-d818c916ac7a", + "id": "e09e9110-2f11-4a45-bc9f-dc7a12834ef0", "mutable": true, "name": "number_example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "6ee08f4e-4200-4c4c-b606-7e7d4a6a5fdb", + "id": "7ba6324d-d8fd-43b8-91d2-d970a424db8b", "mutable": false, "name": "number_example_max", "option": null, @@ -83,7 +83,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f879ade0-27ba-45c8-84dd-d2393a7cdad0", + "id": "64e12007-8479-43bf-956b-86fe7ae73066", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -122,7 +122,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "8d057664-79e1-4f0e-a24e-72b2ac5e3306", + "id": "32681b2b-682f-4a5f-9aa6-c05be9d41a89", "mutable": false, "name": "number_example_min", "option": null, @@ -161,7 +161,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0249146a-ba5e-4d59-bbd2-48d1027ebb42", + "id": "03b67b89-0d35-449d-8997-f5ce4b7c1518", "mutable": false, "name": "number_example_min_max", "option": null, @@ -200,7 +200,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "edeb33bb-b8d4-4770-9c41-e0e94a4886af", + "id": "2201fc53-38c6-4a68-b3b9-4f6ef3390962", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -248,7 +248,7 @@ } ], "env": null, - "id": "7c672b0d-41f4-45ae-9596-9be1455505a9", + "id": "060ffd05-39a9-4fa3-81a3-7d9d8e655bf8", "init_script": "", "login_before_ready": true, "metadata": [], @@ -260,7 +260,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "4938f98a-bc70-4dae-8825-27d41ba34842", + "token": "58ed35b2-6124-4183-a493-40cb0174f4d2", "troubleshooting_url": null }, "sensitive_values": { @@ -279,7 +279,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8043802126847197223", + "id": "4610812354433374355", "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 a37148f2b4d24..1ec2927a40ad1 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.9.2", + "terraform_version": "1.9.8", "planned_values": { "root_module": { "resources": [ @@ -119,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "b0837593-03d9-4039-87d3-9170a6513751", + "id": "cbec5bff-b81a-4815-99c0-40c0629779fb", "mutable": false, "name": "Example", "option": [ @@ -180,7 +180,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "aff9e428-f431-4ca1-8c2f-3c1adf662ed7", + "id": "dd1c36b7-a961-4eb2-9687-c32b5ee54fbc", "mutable": false, "name": "number_example", "option": null, @@ -207,7 +207,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "15371ea5-9ffc-4672-8c7b-338eed974655", + "id": "f1bcac54-a58c-44b2-94f5-243a0b1492d3", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -246,7 +246,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "2e77000c-d96f-4110-ad55-3a733fef768c", + "id": "79c76ac1-8e71-4872-9107-d7a9529f7dce", "mutable": false, "name": "number_example_min_max", "option": null, @@ -285,7 +285,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "2c9f5877-7df8-42a8-9d34-20d7a74832e0", + "id": "da7a8aff-ffe3-402f-bf7e-b369ae04b041", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -324,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d9eb4625-889c-4eb7-87d4-80644c5ee57a", + "id": "5fe2dad0-e11f-46f0-80ae-c0c3a29cd1fd", "mutable": false, "name": "Sample", "option": null, @@ -355,7 +355,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7549ee27-b944-46e8-89c7-66ce22285efc", + "id": "920f98a1-3a6f-4602-8c87-ebbbef0310c5", "mutable": true, "name": "First parameter from module", "option": null, @@ -382,7 +382,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c5fd9f8a-f83f-450a-b93a-4f4267be580a", + "id": "f438d9ad-6c3e-44f3-95cd-1d423a9b09e5", "mutable": true, "name": "Second parameter from module", "option": null, @@ -414,7 +414,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "1b819f45-1451-45d8-bdf6-80c067be383b", + "id": "b2c53701-be53-4591-aacf-1c83f75bcf15", "mutable": true, "name": "First parameter from child module", "option": null, @@ -441,7 +441,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "103f609f-e7d4-4060-b9dc-cc59afbcc2ad", + "id": "038b18d4-d430-4703-886a-b7e10e01f856", "mutable": true, "name": "Second parameter from child module", "option": null, @@ -794,7 +794,7 @@ } } }, - "timestamp": "2024-07-15T17:48:56Z", + "timestamp": "2024-10-28T20:08:15Z", "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 f3011a94e387c..1bfc1835dfcaf 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.9.2", + "terraform_version": "1.9.8", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "6de72459-12d0-493b-a6de-849e08a80231", + "id": "8586d419-7e61-4e67-b8df-d98d8ac7ffd3", "mutable": false, "name": "Example", "option": [ @@ -61,7 +61,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4c531563-c935-41ad-8cca-f417c16e5278", + "id": "0cc54450-13a6-486c-b542-6e23a9f3596b", "mutable": false, "name": "number_example", "option": null, @@ -88,7 +88,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0c77e023-ebfd-4868-a25b-2f6b131c52a3", + "id": "0c0b913a-0bde-4b9e-8a70-06d9b6d38a26", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -127,7 +127,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d5415c63-b007-4409-8715-8750fcd014c5", + "id": "37fd5372-2741-49dd-bf01-6ba29a24c9dd", "mutable": false, "name": "number_example_min_max", "option": null, @@ -166,7 +166,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "27846e1e-1ea4-463d-a0f1-2f06bd2767ff", + "id": "c0fd84ff-117f-442a-95f7-e8368ba7ce1d", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -205,7 +205,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e0d43ce9-3377-48ab-8917-960a39fc78aa", + "id": "ab067ffc-99de-4705-97fe-16c713d2d115", "mutable": false, "name": "Sample", "option": null, @@ -241,7 +241,7 @@ } ], "env": null, - "id": "a84d968c-98b8-49e4-878f-8afbfcfcd058", + "id": "7daab302-d00e-48d4-878c-47afbe3a13bc", "init_script": "", "login_before_ready": true, "metadata": [], @@ -253,7 +253,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "494f0e2b-0727-4833-b824-f3c5ae5ec701", + "token": "e98c452d-cbe9-4ae1-8382-a986089dccb4", "troubleshooting_url": null }, "sensitive_values": { @@ -272,7 +272,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6676147453513335498", + "id": "2355126481625628137", "triggers": null }, "sensitive_values": {}, @@ -297,7 +297,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "28bbdb1b-bbfd-448e-a90d-667372384184", + "id": "0978cc7c-f787-406c-a050-9272bbb52085", "mutable": true, "name": "First parameter from module", "option": null, @@ -324,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "edaafb64-16d1-4abc-9016-aa30d7ee3ed1", + "id": "cd01d7da-9f56-460d-b163-e88a0a9a5f67", "mutable": true, "name": "Second parameter from module", "option": null, @@ -356,7 +356,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "85b4aa9c-206a-4708-b12b-f80e8905d178", + "id": "528e845a-843b-48b3-a421-a22340726d5a", "mutable": true, "name": "First parameter from child module", "option": null, @@ -383,7 +383,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "913d7ffb-d406-4a2e-9368-106e0af12d34", + "id": "f486efbb-2fc6-4091-9eca-0088ac6cd3cc", "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 8fdcf3869464a..66beabb5795e7 100644 --- a/provisioner/terraform/testdata/version.txt +++ b/provisioner/terraform/testdata/version.txt @@ -1 +1 @@ -1.9.2 +1.9.8 diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 1ad37edf20360..33c9f551346a6 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.9.2/terraform_1.9.2_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.8/terraform_1.9.8_linux_${ARCH}.zip" && \ busybox unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \