From 345ca9e9771fb5b6f210b14ac99b17ecf73d48bd Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Fri, 31 May 2024 22:34:43 +0000 Subject: [PATCH] chore: upgrade terraform to `v1.8.5` --- .github/actions/setup-tf/action.yaml | 2 +- .github/workflows/typos.toml | 1 + docs/install/offline.md | 2 +- dogfood/Dockerfile | 2 +- install.sh | 2 +- provisioner/terraform/install.go | 4 +-- .../calling-module/calling-module.tfplan.json | 9 ++++-- .../calling-module.tfstate.json | 10 +++--- .../chaining-resources.tfplan.json | 9 ++++-- .../chaining-resources.tfstate.json | 10 +++--- .../conflicting-resources.tfplan.json | 9 ++++-- .../conflicting-resources.tfstate.json | 10 +++--- .../display-apps-disabled.tfplan.json | 9 ++++-- .../display-apps-disabled.tfstate.json | 8 ++--- .../display-apps/display-apps.tfplan.json | 9 ++++-- .../display-apps/display-apps.tfstate.json | 8 ++--- .../external-auth-providers.tfplan.json | 11 ++++--- .../external-auth-providers.tfstate.json | 8 ++--- .../git-auth-providers.tfplan.json | 11 ++++--- .../git-auth-providers.tfstate.json | 8 ++--- .../instance-id/instance-id.tfplan.json | 9 ++++-- .../instance-id/instance-id.tfstate.json | 12 +++---- .../mapped-apps/mapped-apps.tfplan.json | 9 ++++-- .../mapped-apps/mapped-apps.tfstate.json | 16 +++++----- .../multiple-agents.tfplan.json | 18 +++++++---- .../multiple-agents.tfstate.json | 20 ++++++------ .../multiple-apps/multiple-apps.tfplan.json | 9 ++++-- .../multiple-apps/multiple-apps.tfstate.json | 20 ++++++------ .../resource-metadata-duplicate.tfplan.json | 9 ++++-- .../resource-metadata-duplicate.tfstate.json | 16 +++++----- .../resource-metadata.tfplan.json | 9 ++++-- .../resource-metadata.tfstate.json | 12 +++---- .../rich-parameters-order.tfplan.json | 15 +++++---- .../rich-parameters-order.tfstate.json | 12 +++---- .../rich-parameters-validation.tfplan.json | 23 ++++++++------ .../rich-parameters-validation.tfstate.json | 20 ++++++------ .../rich-parameters.tfplan.json | 31 ++++++++++--------- .../rich-parameters.tfstate.json | 28 ++++++++--------- provisioner/terraform/testdata/version.txt | 2 +- scripts/Dockerfile.base | 2 +- 40 files changed, 243 insertions(+), 191 deletions(-) diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml index 0fa40bdbfdefc..e660e6f3c3f5f 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.7.5 + terraform_version: 1.8.4 terraform_wrapper: false diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml index 559260e0f7f32..7ee9554f0cdc3 100644 --- a/.github/workflows/typos.toml +++ b/.github/workflows/typos.toml @@ -33,4 +33,5 @@ extend-exclude = [ "**/pnpm-lock.yaml", "tailnet/testdata/**", "site/src/pages/SetupPage/countries.tsx", + "provisioner/terraform/testdata/**", ] diff --git a/docs/install/offline.md b/docs/install/offline.md index 120aa5c9f76b7..d4d8d24c0c111 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.7.5 +ARG TERRAFORM_VERSION=1.8.4 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/Dockerfile b/dogfood/Dockerfile index 4aa46e83c8fd7..19723853aa7ac 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -171,7 +171,7 @@ RUN apt-get update --quiet && apt-get install --yes \ # NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.7.5. # Installing the same version here to match. -RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_linux_amd64.zip" && \ +RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.8.4/terraform_1.8.4_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 cabbdc685f2c6..9b76d1b204b21 100755 --- a/install.sh +++ b/install.sh @@ -250,7 +250,7 @@ EOF main() { MAINLINE=1 STABLE=0 - TERRAFORM_VERSION="1.7.5" + TERRAFORM_VERSION="1.8.4" if [ "${TRACE-}" ]; then set -x diff --git a/provisioner/terraform/install.go b/provisioner/terraform/install.go index e3014fb8758be..7ebceb5820035 100644 --- a/provisioner/terraform/install.go +++ b/provisioner/terraform/install.go @@ -20,10 +20,10 @@ 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.7.5")) + TerraformVersion = version.Must(version.NewVersion("1.8.4")) minTerraformVersion = version.Must(version.NewVersion("1.1.0")) - maxTerraformVersion = version.Must(version.NewVersion("1.7.9")) // use .9 to automatically allow patch releases + maxTerraformVersion = version.Must(version.NewVersion("1.8.9")) // use .9 to automatically allow patch releases terraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.") ) diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index 28a2b055ecf10..e4693c3057db2 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } } ], @@ -259,6 +260,8 @@ ] } ], - "timestamp": "2024-05-22T17:02:40Z", + "timestamp": "2024-05-31T22:25:19Z", + "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 5f8a795e2a894..eed7ec7b0fe61 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "f26b1d53-799e-4fbb-9fd3-71e60b37eacd", + "id": "2941e1eb-40f5-41cf-9e08-8f0f1a80d430", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "ce663074-ebea-44cb-b6d1-321f590f7982", + "token": "3105121f-9b54-4c91-b497-9da9bb05c5b6", "troubleshooting_url": null }, "sensitive_values": { @@ -69,7 +69,7 @@ "outputs": { "script": "" }, - "random": "8031375470547649400" + "random": "3895262600016319159" }, "sensitive_values": { "inputs": {}, @@ -84,7 +84,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3370916843136140681", + "id": "5027788252939043492", "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 9717ddd34b128..8b02d13cdc75e 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -204,6 +205,8 @@ ] } }, - "timestamp": "2024-05-22T17:02:43Z", + "timestamp": "2024-05-31T22:25:20Z", + "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 304e9703b9073..95db4fc47c82c 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "9d869fc3-c185-4278-a5d2-873f809a4449", + "id": "da093356-6550-4e76-bb9e-0269cede7e31", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "418bb1d6-49d8-4340-ac84-ed6991457ff9", + "token": "ebcb7f0e-4b80-4972-b434-1a42aa650d78", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3681188688307687011", + "id": "2686005653093770315", "triggers": null }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6055360096088266226", + "id": "1732714319726388691", "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 a62fa814bea53..948ce6580b63b 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -204,6 +205,8 @@ ] } }, - "timestamp": "2024-05-22T17:02:45Z", + "timestamp": "2024-05-31T22:25:22Z", + "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 4aa66de56d2c9..15bfeec63e134 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d9c497fe-1dc4-4551-b46d-282f775e9509", + "id": "e56c4e1a-6b1a-4007-880c-875dc6400b73", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "6fa01f69-de93-4610-b942-b787118146f8", + "token": "b3666f42-cc88-454e-93bd-553f71306dbe", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2012753940926517215", + "id": "8818573993093135925", "triggers": null }, "sensitive_values": {}, @@ -73,7 +73,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2163283012438694669", + "id": "2487290649323445841", "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 de8d982bef577..e2bd6410a62c4 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -42,7 +42,8 @@ "display_apps": [ {} ], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -203,6 +204,8 @@ ] } }, - "timestamp": "2024-05-22T17:02:50Z", + "timestamp": "2024-05-31T22:25:26Z", + "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 3567c75133732..ce2facb3c5a1c 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "c55cfcad-5422-46e5-a144-e933660bacd3", + "id": "cd49cbe2-97f4-4980-9b13-4e4008f4d594", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "e170615d-a3a2-4dc4-a65e-4990ceeb79e5", + "token": "4b1c44cb-d960-42ef-b19e-60d169085657", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3512108359019802900", + "id": "6613171819431602989", "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 d41c6e03541d0..c3fe9046116ae 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -42,7 +42,8 @@ "display_apps": [ {} ], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -203,6 +204,8 @@ ] } }, - "timestamp": "2024-05-22T17:02:48Z", + "timestamp": "2024-05-31T22:25:24Z", + "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 79b2e6dd6490f..3ce1d2d34a181 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "3fb63a4e-bb0e-4380-9ed9-8b1581943b1f", + "id": "dac3e164-c9d2-43e2-89ee-54ce5955e551", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "eb5720a7-91fd-4e37-8085-af3c8205702c", + "token": "99ccf297-47b1-4c7c-819e-0bac896b12bd", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2929624824161973000", + "id": "5268162908997861371", "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 837d50255a3a1..77cac08ba071d 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -118,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -227,6 +228,8 @@ ] } }, - "timestamp": "2024-05-22T17:02:52Z", + "timestamp": "2024-05-31T22:25:28Z", + "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 125cea74bcc3c..481e197946226 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -54,7 +54,7 @@ } ], "env": null, - "id": "923df4d0-cf96-4cf8-aaff-426e58927a81", + "id": "2fcac464-b22b-4567-8391-7cdf592dae14", "init_script": "", "login_before_ready": true, "metadata": [], @@ -66,7 +66,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "f5328221-90c7-4056-83b4-7b76d6f46580", + "token": "57bcc78a-ed9b-46f9-9901-ffbdfb325871", "troubleshooting_url": null }, "sensitive_values": { @@ -85,7 +85,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4621387386750422041", + "id": "7076770981685522602", "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 bd9286692d328..ca6e7765c7a5b 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -118,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -222,6 +223,8 @@ ] } }, - "timestamp": "2024-05-22T17:02:55Z", + "timestamp": "2024-05-31T22:25:30Z", + "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 509c6d5a9d7fc..ae548c8f97f82 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -52,7 +52,7 @@ } ], "env": null, - "id": "48a24332-1a90-48d9-9e03-b4e9f09c6eab", + "id": "c924e5b7-e2cb-4eb5-993e-3cc489ed5213", "init_script": "", "login_before_ready": true, "metadata": [], @@ -64,7 +64,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "6a2ae93f-3f25-423d-aa97-b2f1c5d9c20b", + "token": "cc8ceb98-822f-4b8f-b645-2162fada1dfb", "troubleshooting_url": null }, "sensitive_values": { @@ -83,7 +83,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8095584601893320918", + "id": "7049248910828562611", "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 fe875367359c0..2cdfdcf13345a 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -224,6 +225,8 @@ ] } ], - "timestamp": "2024-05-22T17:02:57Z", + "timestamp": "2024-05-31T22:25:32Z", + "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 ef5346a2ac822..40519b8266850 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "3bc8e20f-2024-4014-ac11-806e7e1a1e24", + "id": "b691d6a2-76de-4441-ac90-3260282dc1fb", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "6ef0492b-8dbe-4c61-8eb8-a37acb671278", + "token": "244bf23b-b483-46f9-b2ff-7a6e746c836f", "troubleshooting_url": null }, "sensitive_values": { @@ -57,8 +57,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "3bc8e20f-2024-4014-ac11-806e7e1a1e24", - "id": "7ba714fa-f2b8-4d33-8987-f67466505033", + "agent_id": "b691d6a2-76de-4441-ac90-3260282dc1fb", + "id": "66ce959f-b821-4657-9bdb-6290c3b3a0b9", "instance_id": "example" }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4065206823139127011", + "id": "3867175311980978156", "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 9fad4b322a02d..2d63b29fac5e4 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -326,6 +327,8 @@ ] } ], - "timestamp": "2024-05-22T17:02:59Z", + "timestamp": "2024-05-31T22:25:34Z", + "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 e19a8b484bf6a..dc78ba27d9f46 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d8d2ed23-193d-4784-9ce5-7bc0d879bb14", + "id": "d3eece5c-3d36-4e77-a67c-284d6a665004", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "0555adfc-e969-4fd2-8cfd-47560bd1b5a3", + "token": "793d9e17-fe59-4e70-83ee-76397b81a5bd", "troubleshooting_url": null }, "sensitive_values": { @@ -58,13 +58,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d8d2ed23-193d-4784-9ce5-7bc0d879bb14", + "agent_id": "d3eece5c-3d36-4e77-a67c-284d6a665004", "command": null, "display_name": "app1", "external": false, "healthcheck": [], "icon": null, - "id": "11fa3ff2-d6ba-41ca-b1df-6c98d395c0b8", + "id": "02a5c323-badd-4a9d-bb5e-6926b8c3f317", "name": null, "order": null, "relative_path": null, @@ -89,13 +89,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d8d2ed23-193d-4784-9ce5-7bc0d879bb14", + "agent_id": "d3eece5c-3d36-4e77-a67c-284d6a665004", "command": null, "display_name": "app2", "external": false, "healthcheck": [], "icon": null, - "id": "cd1a2e37-adbc-49f0-bd99-033c62a1533e", + "id": "3f9b0fb0-fc06-49ed-b869-27b570b86b47", "name": null, "order": null, "relative_path": null, @@ -119,7 +119,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4490911212417021152", + "id": "6739553050203442390", "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 7f44aa45ca7d9..8a27774498541 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -61,7 +62,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -91,7 +93,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -121,7 +124,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -460,6 +464,8 @@ ] } }, - "timestamp": "2024-05-22T17:03:01Z", + "timestamp": "2024-05-31T22:25:36Z", + "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 0bbd45fa5a3df..023f6ab52f0fc 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "0ffc6582-b017-404e-b83f-48e4a5ab38bc", + "id": "2cd8a28d-b73c-4801-8748-5681512b99ed", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "b7f0a913-ecb1-4c80-8559-fbcb435d53d0", + "token": "68c874c4-2f0d-4dff-9fd7-67209e9a08c7", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "1780ae95-844c-4d5c-94fb-6ccfe4a7656d", + "id": "2e773a6e-0e57-428d-bdf8-414c2aaa55fc", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": "non-blocking", "startup_script_timeout": 30, - "token": "695f8765-3d3d-4da0-9a5a-bb7b1f568bde", + "token": "98944f07-1265-4329-8fd3-c92aac95855c", "troubleshooting_url": null }, "sensitive_values": { @@ -116,7 +116,7 @@ } ], "env": null, - "id": "333b7856-24ac-46be-9ae3-e4981b25481d", + "id": "9568f00b-0bd8-4982-a502-7b37562b1fa3", "init_script": "", "login_before_ready": true, "metadata": [], @@ -128,7 +128,7 @@ "startup_script": null, "startup_script_behavior": "blocking", "startup_script_timeout": 300, - "token": "50ddfb93-264f-4f64-8c8d-db7d8d37c0a1", + "token": "8bf8789b-9efc-4517-aa30-89b99c46dd75", "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { @@ -161,7 +161,7 @@ } ], "env": null, - "id": "90736626-71c9-4b76-bdfc-f6ce9b3dda05", + "id": "403e5299-2f3e-499c-b90a-2fa6fc9e44e6", "init_script": "", "login_before_ready": false, "metadata": [], @@ -173,7 +173,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "8c4ae7b9-12b7-4a9c-a55a-a98cfb049103", + "token": "a10e5bfb-9756-4210-a112-877f2cfbdc0a", "troubleshooting_url": null }, "sensitive_values": { @@ -192,7 +192,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6980014108785645805", + "id": "2053669122262711043", "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 eee1d09317ba1..4a07ac904a675 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -445,6 +446,8 @@ ] } ], - "timestamp": "2024-05-22T17:03:03Z", + "timestamp": "2024-05-31T22:25:38Z", + "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 3ed04ae6ecab0..e5a64a6928388 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "c950352c-7c4a-41cc-9049-ad07ded85c47", + "id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "143c3974-49f5-4898-815b-c4044283ebc8", + "token": "3be506a9-b085-4bd8-a6e9-ac1769aedac5", "troubleshooting_url": null }, "sensitive_values": { @@ -57,13 +57,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "c950352c-7c4a-41cc-9049-ad07ded85c47", + "agent_id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "23135384-0e9f-4efc-b74c-d3e5e878ed67", + "id": "cbfb480c-49f0-41dc-a5e5-fa8ab21514e7", "name": null, "order": null, "relative_path": null, @@ -87,7 +87,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "c950352c-7c4a-41cc-9049-ad07ded85c47", + "agent_id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", "command": null, "display_name": null, "external": false, @@ -99,7 +99,7 @@ } ], "icon": null, - "id": "01e73639-0fd1-4bcb-bd88-d22eb8244627", + "id": "6cc74cc4-edd4-482a-be9c-46243008081d", "name": null, "order": null, "relative_path": null, @@ -125,13 +125,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "c950352c-7c4a-41cc-9049-ad07ded85c47", + "agent_id": "26bc229a-d911-4d91-8b18-c59a2f2939f4", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "058c9054-9714-4a5f-9fde-8a451ab58620", + "id": "7b2131ed-3850-439e-8942-6c83fe02ce0c", "name": null, "order": null, "relative_path": null, @@ -155,7 +155,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "9051436019409847411", + "id": "6270198559972381862", "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 6084ae4435990..70379dc90d732 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -42,7 +42,8 @@ "display_apps": [], "metadata": [ {} - ] + ], + "token": true } }, { @@ -431,6 +432,8 @@ ] } ], - "timestamp": "2024-05-22T17:03:06Z", + "timestamp": "2024-05-31T22:25:42Z", + "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 e617f565156ab..264edcf513f81 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "8352a117-1250-44ef-bba2-0abdb2a77665", + "id": "15b21cea-46cb-4e70-b648-56dceff97236", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "b46fd197-3be4-42f8-9c47-5a9e71a76ef6", + "token": "3308a570-7944-4238-aca8-fbc3644d7548", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "1f7911d4-5b64-4e20-af9b-b6ee2aff602b", + "id": "28db1106-e6f0-41ff-b707-3100a99cadff", "item": [ { "is_null": false, @@ -86,7 +86,7 @@ "value": "" } ], - "resource_id": "7229373774865666851" + "resource_id": "3221770356529482934" }, "sensitive_values": { "item": [ @@ -110,7 +110,7 @@ "daily_cost": 20, "hide": true, "icon": "/icon/server.svg", - "id": "34fe7a46-2a2f-4628-8946-ef80a7ffdb5e", + "id": "a30b56a6-c122-485a-a128-4210600ad17f", "item": [ { "is_null": false, @@ -119,7 +119,7 @@ "value": "world" } ], - "resource_id": "7229373774865666851" + "resource_id": "3221770356529482934" }, "sensitive_values": { "item": [ @@ -139,7 +139,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7229373774865666851", + "id": "3221770356529482934", "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 a03346a724115..8e06a483749ac 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -42,7 +42,8 @@ "display_apps": [], "metadata": [ {} - ] + ], + "token": true } }, { @@ -383,6 +384,8 @@ ] } ], - "timestamp": "2024-05-22T17:03:05Z", + "timestamp": "2024-05-31T22:25:40Z", + "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 f8abe064ec94b..80cb793a44704 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "847150eb-c3b6-497d-9dad-8e62d478cfff", + "id": "5d102462-7646-4aae-bdac-c8b9906fb5b3", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "a0c4f2f5-cc40-4731-9028-636033229c9c", + "token": "1d1ccced-ce84-4cbf-a80f-f17a59e948a0", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "3feec3a3-6f9e-4cfb-b122-2273e345def0", + "id": "35194a0a-0012-4da3-9e3a-a4d7bdcc9638", "item": [ { "is_null": false, @@ -98,7 +98,7 @@ "value": "squirrel" } ], - "resource_id": "160324296641913729" + "resource_id": "2094194534443319186" }, "sensitive_values": { "item": [ @@ -121,7 +121,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "160324296641913729", + "id": "2094194534443319186", "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 12a6aaccdd7b7..240c9affe23e0 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -118,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -135,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7fb346d2-b8c2-4f2a-99d1-a8fd54cc479e", + "id": "5f79d935-c5bc-47e4-8152-eed302afc455", "mutable": false, "name": "Example", "option": null, @@ -162,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0581cc2a-9e6d-4f04-93a6-88fcbd0757f0", + "id": "e8af506e-91e7-457a-8e68-f33109f30e6a", "mutable": false, "name": "Sample", "option": null, @@ -268,6 +269,8 @@ ] } }, - "timestamp": "2024-05-22T17:03:11Z", + "timestamp": "2024-05-31T22:25:46Z", + "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 ce08e87bce074..4505699adf299 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5c9f037b-3cc1-4616-b4ba-9e7322856575", + "id": "487e2328-8fa1-472f-a35d-5c017f5a2621", "mutable": false, "name": "Example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "71a4bcc8-bbcb-4619-9641-df3bc296f58e", + "id": "c85ec281-458c-4932-a10d-049be7e1b8f8", "mutable": false, "name": "Sample", "option": null, @@ -80,7 +80,7 @@ } ], "env": null, - "id": "327e8ab1-90be-4c87-ac7d-09630ae46827", + "id": "3d98abaf-7a38-450f-9fc9-eaebbebb1f1f", "init_script": "", "login_before_ready": true, "metadata": [], @@ -92,7 +92,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "794a8a86-3bb9-4b3d-bbea-acff8b513964", + "token": "3000e759-60df-4470-8f51-50ea4bc6a1ad", "troubleshooting_url": null }, "sensitive_values": { @@ -111,7 +111,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3735840255017039964", + "id": "4580074114866058503", "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 d4f402ce40102..0535ccd50bb59 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -118,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -135,7 +136,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "1e85f9f5-54c2-4a6b-ba7f-8627386b94b7", + "id": "c2d5292e-1dea-434b-b5cc-dc288c2a512b", "mutable": true, "name": "number_example", "option": null, @@ -162,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9908f4c5-87f5-496c-9479-d0f7d49f0fdf", + "id": "689418c1-935c-40ad-aa9f-37ab4f8d9501", "mutable": false, "name": "number_example_max", "option": null, @@ -201,7 +202,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "3f2d0054-0440-4a00-98f6-befa9475a5f4", + "id": "bc7db79f-d6ef-45a2-9bbf-50710eb1db8c", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -240,7 +241,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "29abca17-5bd3-4ae3-9bd3-1e45301fc509", + "id": "5e88eade-4255-4693-86bf-2c0331ca2a06", "mutable": false, "name": "number_example_min", "option": null, @@ -279,7 +280,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "95630cc0-8040-4126-92bb-967dbf8eb2ed", + "id": "26c34bb9-535d-45d7-bebd-1dcb2300f242", "mutable": false, "name": "number_example_min_max", "option": null, @@ -318,7 +319,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c256c60a-fdfe-42f1-bbaa-27880816a7bf", + "id": "3b55387f-0117-4d34-b585-14959f4a9267", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -550,6 +551,8 @@ ] } }, - "timestamp": "2024-05-22T17:03:12Z", + "timestamp": "2024-05-31T22:25:48Z", + "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 a09880e54e903..e8415b0959bfa 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "f7cabe8c-f091-4ced-bc9b-873f54edf61b", + "id": "1f836366-337f-47a9-bc49-f4810b2f1078", "mutable": true, "name": "number_example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "13b33312-d49b-4df3-af89-5d6ec840a6e4", + "id": "d58e721b-0134-42b6-b4b9-bb012f43a439", "mutable": false, "name": "number_example_max", "option": null, @@ -83,7 +83,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d5ff002b-d039-42e6-b638-6bc2e3d54c2b", + "id": "4c3ff771-15ab-4a33-8067-45d5d44a5f7e", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -122,7 +122,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f382fcba-2634-44e7-ab26-866228d0679a", + "id": "11f8f368-f829-403a-8ad9-3a10df1db0bf", "mutable": false, "name": "number_example_min", "option": null, @@ -161,7 +161,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7f1c3032-1ed9-4602-80f8-cc84489bafc9", + "id": "9de03421-e747-4084-b808-90464beb8ab4", "mutable": false, "name": "number_example_min_max", "option": null, @@ -200,7 +200,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c474219f-f1e7-4eca-921a-1ace9a8391ee", + "id": "eb75256a-66d6-45d6-a0f5-331a885742e4", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -248,7 +248,7 @@ } ], "env": null, - "id": "138f6db3-bd8d-4a9a-8e61-abc1fdf3c3af", + "id": "e6810890-032b-4a01-9562-b9a8428dcc97", "init_script": "", "login_before_ready": true, "metadata": [], @@ -260,7 +260,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "1ef5dec0-3339-4e24-b781-0166cc6a9820", + "token": "c162e35d-a066-472c-a469-91d6b116fa6f", "troubleshooting_url": null }, "sensitive_values": { @@ -279,7 +279,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5975950266738511043", + "id": "8464994280406150541", "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 a881255a41e12..393acb59fe5a2 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.7.5", + "terraform_version": "1.8.4", "planned_values": { "root_module": { "resources": [ @@ -31,7 +31,8 @@ }, "sensitive_values": { "display_apps": [], - "metadata": [] + "metadata": [], + "token": true } }, { @@ -118,7 +119,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -135,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "2be3cd75-c44b-482e-8f78-679067d8e0a4", + "id": "e5891365-ddf0-417c-a5d7-9ae7cdc76754", "mutable": false, "name": "Example", "option": [ @@ -179,7 +180,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5a2f0407-8f11-4ac8-980d-75f919959f08", + "id": "b95cd221-cdca-4d6e-98d0-e4fb6d90dc32", "mutable": false, "name": "number_example", "option": null, @@ -206,7 +207,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "cf4b28cf-ec3c-4f53-ae27-4733a9f7d71a", + "id": "e1e5bce0-ea22-401d-8253-1b9175077abc", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -245,7 +246,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "70d63380-2020-4377-ae05-cecb12c0d709", + "id": "26a6eaca-c9ae-4130-a734-6c290637b250", "mutable": false, "name": "number_example_min_max", "option": null, @@ -284,7 +285,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ec5827c2-2511-4f16-bd85-6249517c9e5b", + "id": "ad985f1d-21fe-4ce1-988d-903084016cb4", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -323,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "eec8845e-4316-450a-a5b7-eaa9567f469a", + "id": "9465cc3a-703a-4218-8fa4-d16a1631e648", "mutable": false, "name": "Sample", "option": null, @@ -354,7 +355,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "3b860d24-85ac-4540-b309-9321e732dfc4", + "id": "547f8420-0630-4c4d-9507-e2d63640d0d9", "mutable": true, "name": "First parameter from module", "option": null, @@ -381,7 +382,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "b36105e3-9bf1-43c7-a857-078ef1e8f95d", + "id": "5c32dcad-d54a-474f-97f0-fbcc8aaba9bd", "mutable": true, "name": "Second parameter from module", "option": null, @@ -413,7 +414,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "a2bee9f2-8a3c-404c-839b-01b6cd840707", + "id": "2362ba5e-0779-472c-bd3c-22446fd14075", "mutable": true, "name": "First parameter from child module", "option": null, @@ -440,7 +441,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "deb13c45-ed6d-45b6-b6eb-d319143fa8f2", + "id": "0a8f6df4-364f-4d5f-b935-7dee8c568e10", "mutable": true, "name": "Second parameter from child module", "option": null, @@ -793,6 +794,8 @@ } } }, - "timestamp": "2024-05-22T17:03:08Z", + "timestamp": "2024-05-31T22:25:44Z", + "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 a82bb9ea1925c..eeec6ba4ea9c9 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.7.5", + "terraform_version": "1.8.4", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7fa1e2f7-36a4-49cd-b92a-b3fc8732d359", + "id": "9f041124-ccf3-4b7b-9e0d-4d37335a6f98", "mutable": false, "name": "Example", "option": [ @@ -61,7 +61,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "86a60580-7221-4bab-b229-9cb61bdb56a0", + "id": "ab5035e4-8dab-453d-92bc-9b866af26c78", "mutable": false, "name": "number_example", "option": null, @@ -88,7 +88,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ed6bc6e5-b4ff-48b9-88b0-df5faa74ae66", + "id": "bdf84ab6-1029-4645-a2df-cd897f30c145", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -127,7 +127,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "340b19e1-f651-4321-96b1-7908c2c66914", + "id": "b283766e-7e58-459d-a81f-aa71a95bbc0b", "mutable": false, "name": "number_example_min_max", "option": null, @@ -166,7 +166,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f19c6763-2e55-40dd-9b49-82e9181e5b1b", + "id": "7a4f8f6d-d81a-4b15-9d5b-6f221f2a6b07", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -205,7 +205,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "02169810-8080-4dc6-a656-5fbda745659e", + "id": "fd12f0d0-87dc-4d88-bcdc-352c11bd2144", "mutable": false, "name": "Sample", "option": null, @@ -241,7 +241,7 @@ } ], "env": null, - "id": "42edc650-ddb6-4ed9-9624-7788d60d1507", + "id": "a20d4cf7-2d49-4ab8-8858-a9e1531e7033", "init_script": "", "login_before_ready": true, "metadata": [], @@ -253,7 +253,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "c767a648-e670-4c6b-a28b-8559033e92a7", + "token": "0d8692b3-746f-4f2e-b0cc-7952ee240ba4", "troubleshooting_url": null }, "sensitive_values": { @@ -272,7 +272,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7506678111935039701", + "id": "9033341587141190203", "triggers": null }, "sensitive_values": {}, @@ -297,7 +297,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "11b1ae03-cf81-4f60-9be1-bd4c0586516d", + "id": "6be6ebff-574c-4ab6-b314-a65f4f20446e", "mutable": true, "name": "First parameter from module", "option": null, @@ -324,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "79d87261-bfda-46ee-958d-7d62252101ad", + "id": "d7e3d42e-dc51-47f2-ae5f-1b1bdaa85e25", "mutable": true, "name": "Second parameter from module", "option": null, @@ -356,7 +356,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "30c4c518-116a-4591-a571-886101cfcdfa", + "id": "69f71896-5cc4-44d0-ae7a-b7a5514a07ae", "mutable": true, "name": "First parameter from child module", "option": null, @@ -383,7 +383,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4c7d9f15-da45-453e-85eb-1d22c9baa54c", + "id": "9a2b177e-8f3c-4d6b-b302-3ba2f0e6c76b", "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 6a126f402d53d..bfa363e76ed71 100644 --- a/provisioner/terraform/testdata/version.txt +++ b/provisioner/terraform/testdata/version.txt @@ -1 +1 @@ -1.7.5 +1.8.4 diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index df6cb4637a366..1099e52e01a48 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.7.5/terraform_1.7.5_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.8.4/terraform_1.8.4_linux_${ARCH}.zip" && \ busybox unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \