Skip to content

Commit 7e9a9e0

Browse files
blink-so[bot]sreya
andauthored
chore: update Terraform to 1.12.2 (#18407)
Updates Terraform from 1.11.4 to 1.12.2 across all relevant files. Changes include: - GitHub Actions setup-tf configuration - Dockerfile configurations (dogfood and base) - Install script - Provisioner install.go with version constants - Test data files (tfstate.json, tfplan.json, version.txt) Follows the same pattern as PR #17323 which updated to 1.11.4. Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com> Co-authored-by: sreya <4856196+sreya@users.noreply.github.com>
1 parent 1a69338 commit 7e9a9e0

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

.github/actions/setup-tf/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ runs:
77
- name: Install Terraform
88
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
99
with:
10-
terraform_version: 1.11.4
10+
terraform_version: 1.12.2
1111
terraform_wrapper: false

dogfood/coder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirrors.edge.kernel.org/u
204204
# Configure FIPS-compliant policies
205205
update-crypto-policies --set FIPS
206206

207-
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.11.4.
207+
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.12.2.
208208
# Installing the same version here to match.
209-
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.11.4/terraform_1.11.4_linux_amd64.zip" && \
209+
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.12.2/terraform_1.12.2_linux_amd64.zip" && \
210210
unzip /tmp/terraform.zip -d /usr/local/bin && \
211211
rm -f /tmp/terraform.zip && \
212212
chmod +x /usr/local/bin/terraform && \

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ EOF
273273
main() {
274274
MAINLINE=1
275275
STABLE=0
276-
TERRAFORM_VERSION="1.11.4"
276+
TERRAFORM_VERSION="1.12.2"
277277

278278
if [ "${TRACE-}" ]; then
279279
set -x

provisioner/terraform/install.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ var (
2222
// when Terraform is not available on the system.
2323
// NOTE: Keep this in sync with the version in scripts/Dockerfile.base.
2424
// NOTE: Keep this in sync with the version in install.sh.
25-
TerraformVersion = version.Must(version.NewVersion("1.11.4"))
25+
TerraformVersion = version.Must(version.NewVersion("1.12.2"))
2626

2727
minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
28-
maxTerraformVersion = version.Must(version.NewVersion("1.11.9")) // use .9 to automatically allow patch releases
28+
maxTerraformVersion = version.Must(version.NewVersion("1.12.9")) // use .9 to automatically allow patch releases
2929

3030
errTerraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.")
3131
)

provisioner/terraform/testdata/resources/presets/presets.tfplan.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provisioner/terraform/testdata/resources/presets/presets.tfstate.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.4
1+
1.12.2

scripts/Dockerfile.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apk add --no-cache \
2626
# Terraform was disabled in the edge repo due to a build issue.
2727
# https://gitlab.alpinelinux.org/alpine/aports/-/commit/f3e263d94cfac02d594bef83790c280e045eba35
2828
# Using wget for now. Note that busybox unzip doesn't support streaming.
29-
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.11.4/terraform_1.11.4_linux_${ARCH}.zip" && \
29+
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.12.2/terraform_1.12.2_linux_${ARCH}.zip" && \
3030
busybox unzip /tmp/terraform.zip -d /usr/local/bin && \
3131
rm -f /tmp/terraform.zip && \
3232
chmod +x /usr/local/bin/terraform && \

0 commit comments

Comments
 (0)