From aa3069eb7693f7541cf3156d84e5b377caf4c3e3 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 24 Mar 2025 22:29:59 +0000 Subject: [PATCH 1/2] chore: update Terraform version from 1.11.0 to 1.11.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update Terraform version across the codebase to the latest patch release. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .github/actions/setup-tf/action.yaml | 2 +- install.sh | 2 +- provisioner/terraform/install.go | 2 +- provisioner/terraform/testdata/version.txt | 2 +- scripts/Dockerfile.base | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml index a5e6dec0b7adc..6e0a4d7528d5e 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.11.0 + terraform_version: 1.11.2 terraform_wrapper: false diff --git a/install.sh b/install.sh index 7838388ad111f..4600bdc1fa686 100755 --- a/install.sh +++ b/install.sh @@ -273,7 +273,7 @@ EOF main() { MAINLINE=1 STABLE=0 - TERRAFORM_VERSION="1.11.0" + TERRAFORM_VERSION="1.11.2" if [ "${TRACE-}" ]; then set -x diff --git a/provisioner/terraform/install.go b/provisioner/terraform/install.go index f3f2f232aeac1..15a75f139fde1 100644 --- a/provisioner/terraform/install.go +++ b/provisioner/terraform/install.go @@ -22,7 +22,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.11.0")) + TerraformVersion = version.Must(version.NewVersion("1.11.2")) minTerraformVersion = version.Must(version.NewVersion("1.1.0")) maxTerraformVersion = version.Must(version.NewVersion("1.11.9")) // use .9 to automatically allow patch releases diff --git a/provisioner/terraform/testdata/version.txt b/provisioner/terraform/testdata/version.txt index 1cac385c6cb86..ca7176690dd6f 100644 --- a/provisioner/terraform/testdata/version.txt +++ b/provisioner/terraform/testdata/version.txt @@ -1 +1 @@ -1.11.0 +1.11.2 diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 683e51514f2cc..df879adb064c1 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.11.0/terraform_1.11.0_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.11.2/terraform_1.11.2_linux_${ARCH}.zip" && \ busybox unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \ From 4133eedc9f1d1c49dfa60d0d0112e20782ad4eb1 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 24 Mar 2025 22:35:34 +0000 Subject: [PATCH 2/2] chore: update Terraform version in dogfood Dockerfile and regenerate testdata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the Terraform version in dogfood/coder/Dockerfile and run the generate.sh script to regenerate testdata with the updated Terraform version. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- dogfood/coder/Dockerfile | 4 ++-- .../terraform/testdata/resources/presets/presets.tfplan.json | 5 ----- .../testdata/resources/presets/presets.tfstate.json | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile index 9fbc673bcb52b..a22b5fe467970 100644 --- a/dogfood/coder/Dockerfile +++ b/dogfood/coder/Dockerfile @@ -196,9 +196,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.10.5. +# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.11.2. # Installing the same version here to match. -RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.11.0/terraform_1.11.0_linux_amd64.zip" && \ +RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.11.2/terraform_1.11.2_linux_amd64.zip" && \ unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \ diff --git a/provisioner/terraform/testdata/resources/presets/presets.tfplan.json b/provisioner/terraform/testdata/resources/presets/presets.tfplan.json index afa9d68579194..c88d977479106 100644 --- a/provisioner/terraform/testdata/resources/presets/presets.tfplan.json +++ b/provisioner/terraform/testdata/resources/presets/presets.tfplan.json @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -71,7 +69,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -82,14 +79,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/resources/presets/presets.tfstate.json b/provisioner/terraform/testdata/resources/presets/presets.tfstate.json index 40f8763ffbfcf..cf8b1f8743316 100644 --- a/provisioner/terraform/testdata/resources/presets/presets.tfstate.json +++ b/provisioner/terraform/testdata/resources/presets/presets.tfstate.json @@ -77,7 +77,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -89,7 +88,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy