From eef09f3d98e8b16fbd76a01aa8c61c49d75aeb79 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 7 May 2026 11:07:19 -0500 Subject: [PATCH] chore: update terraform to v1.15.2 (#25045) --- .github/actions/setup-tf/action.yaml | 2 +- dogfood/coder/ubuntu-22.04/Dockerfile | 4 ++-- dogfood/coder/ubuntu-26.04/Dockerfile | 4 ++-- flake.nix | 10 +++++----- install.sh | 2 +- provisioner/terraform/testdata/version.txt | 2 +- scripts/Dockerfile.base | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml index 29f4771c61..abcf9d7a22 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.14.5 + terraform_version: 1.15.2 terraform_wrapper: false diff --git a/dogfood/coder/ubuntu-22.04/Dockerfile b/dogfood/coder/ubuntu-22.04/Dockerfile index d984a5bd37..697885c27a 100644 --- a/dogfood/coder/ubuntu-22.04/Dockerfile +++ b/dogfood/coder/ubuntu-22.04/Dockerfile @@ -208,9 +208,9 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \ sh -s -- -y --default-toolchain stable --profile minimal ENV PATH=$CARGO_HOME/bin:$PATH -# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.14.5. +# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.15.2. # Installing the same version here to match. -RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.14.5/terraform_1.14.5_linux_amd64.zip" && \ +RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.15.2/terraform_1.15.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/dogfood/coder/ubuntu-26.04/Dockerfile b/dogfood/coder/ubuntu-26.04/Dockerfile index 118ac2fd28..feb8ca87cd 100644 --- a/dogfood/coder/ubuntu-26.04/Dockerfile +++ b/dogfood/coder/ubuntu-26.04/Dockerfile @@ -215,9 +215,9 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \ sh -s -- -y --default-toolchain stable --profile minimal ENV PATH=$CARGO_HOME/bin:$PATH -# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.14.5. +# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.15.2. # Installing the same version here to match. -RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.14.5/terraform_1.14.5_linux_amd64.zip" && \ +RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.15.2/terraform_1.15.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/flake.nix b/flake.nix index 0484cbcfe9..f8e8568769 100644 --- a/flake.nix +++ b/flake.nix @@ -111,13 +111,13 @@ # Keep Terraform aligned with provisioner/terraform/testdata/version.txt # so `make gen` remains deterministic in Nix shells. - terraform_1_14_1 = + terraform_1_15_2 = if pkgs.stdenv.isLinux && pkgs.stdenv.hostPlatform.isx86_64 then - pkgs.runCommand "terraform-1.14.1" { + pkgs.runCommand "terraform-1.15.2" { nativeBuildInputs = [ pkgs.unzip ]; src = pkgs.fetchurl { - url = "https://releases.hashicorp.com/terraform/1.14.1/terraform_1.14.1_linux_amd64.zip"; - hash = "sha256-n1MHDuYm354VeIfB0/mvPYEHobZUNxzZkEBinu1piyc="; + url = "https://releases.hashicorp.com/terraform/1.15.2/terraform_1.15.2_linux_amd64.zip"; + hash = "sha256-xW/yvH5s6bOHmlA5KwPC6gdLR2iL9QP/lmyH+wGyqrg="; }; } '' mkdir -p "$out/bin" @@ -209,7 +209,7 @@ # sqlc sqlc-custom syft - terraform_1_14_1 + terraform_1_15_2 typos which # Needed for many LD system libs! diff --git a/install.sh b/install.sh index 11ff394ddc..cbb74248fc 100755 --- a/install.sh +++ b/install.sh @@ -276,7 +276,7 @@ EOF main() { MAINLINE=1 STABLE=0 - TERRAFORM_VERSION="1.14.5" + TERRAFORM_VERSION="1.15.2" if [ "${TRACE-}" ]; then set -x diff --git a/provisioner/terraform/testdata/version.txt b/provisioner/terraform/testdata/version.txt index 24a57f28a4..42cf0675c5 100644 --- a/provisioner/terraform/testdata/version.txt +++ b/provisioner/terraform/testdata/version.txt @@ -1 +1 @@ -1.14.5 +1.15.2 diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 7892c8746e..337ee5a84f 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -27,7 +27,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"; elif [ "${ARCH}" == "armv7l" ]; then ARCH="arm"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.14.5/terraform_1.14.5_linux_${ARCH}.zip" && \ +RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; elif [ "${ARCH}" == "aarch64" ]; then ARCH="arm64"; elif [ "${ARCH}" == "armv7l" ]; then ARCH="arm"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.15.2/terraform_1.15.2_linux_${ARCH}.zip" && \ busybox unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \