mirror of
https://github.com/coder/coder.git
synced 2025-07-12 00:14:10 +00:00
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>
This commit is contained in:
2
.github/actions/setup-tf/action.yaml
vendored
2
.github/actions/setup-tf/action.yaml
vendored
@ -7,5 +7,5 @@ runs:
|
|||||||
- name: Install Terraform
|
- name: Install Terraform
|
||||||
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
|
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
|
||||||
with:
|
with:
|
||||||
terraform_version: 1.11.4
|
terraform_version: 1.12.2
|
||||||
terraform_wrapper: false
|
terraform_wrapper: false
|
||||||
|
@ -204,9 +204,9 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirrors.edge.kernel.org/u
|
|||||||
# Configure FIPS-compliant policies
|
# Configure FIPS-compliant policies
|
||||||
update-crypto-policies --set FIPS
|
update-crypto-policies --set FIPS
|
||||||
|
|
||||||
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.11.4.
|
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.12.2.
|
||||||
# Installing the same version here to match.
|
# Installing the same version here to match.
|
||||||
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.11.4/terraform_1.11.4_linux_amd64.zip" && \
|
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.12.2/terraform_1.12.2_linux_amd64.zip" && \
|
||||||
unzip /tmp/terraform.zip -d /usr/local/bin && \
|
unzip /tmp/terraform.zip -d /usr/local/bin && \
|
||||||
rm -f /tmp/terraform.zip && \
|
rm -f /tmp/terraform.zip && \
|
||||||
chmod +x /usr/local/bin/terraform && \
|
chmod +x /usr/local/bin/terraform && \
|
||||||
|
@ -273,7 +273,7 @@ EOF
|
|||||||
main() {
|
main() {
|
||||||
MAINLINE=1
|
MAINLINE=1
|
||||||
STABLE=0
|
STABLE=0
|
||||||
TERRAFORM_VERSION="1.11.4"
|
TERRAFORM_VERSION="1.12.2"
|
||||||
|
|
||||||
if [ "${TRACE-}" ]; then
|
if [ "${TRACE-}" ]; then
|
||||||
set -x
|
set -x
|
||||||
|
@ -22,10 +22,10 @@ var (
|
|||||||
// when Terraform is not available on the system.
|
// 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 scripts/Dockerfile.base.
|
||||||
// NOTE: Keep this in sync with the version in install.sh.
|
// NOTE: Keep this in sync with the version in install.sh.
|
||||||
TerraformVersion = version.Must(version.NewVersion("1.11.4"))
|
TerraformVersion = version.Must(version.NewVersion("1.12.2"))
|
||||||
|
|
||||||
minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
|
minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
|
||||||
maxTerraformVersion = version.Must(version.NewVersion("1.11.9")) // use .9 to automatically allow patch releases
|
maxTerraformVersion = version.Must(version.NewVersion("1.12.9")) // use .9 to automatically allow patch releases
|
||||||
|
|
||||||
errTerraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.")
|
errTerraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.")
|
||||||
)
|
)
|
||||||
|
4
provisioner/terraform/testdata/resources/presets/presets.tfplan.json
generated
vendored
4
provisioner/terraform/testdata/resources/presets/presets.tfplan.json
generated
vendored
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"format_version": "1.2",
|
"format_version": "1.2",
|
||||||
"terraform_version": "1.11.4",
|
"terraform_version": "1.12.2",
|
||||||
"planned_values": {
|
"planned_values": {
|
||||||
"root_module": {
|
"root_module": {
|
||||||
"resources": [
|
"resources": [
|
||||||
@ -120,7 +120,7 @@
|
|||||||
],
|
],
|
||||||
"prior_state": {
|
"prior_state": {
|
||||||
"format_version": "1.0",
|
"format_version": "1.0",
|
||||||
"terraform_version": "1.11.4",
|
"terraform_version": "1.12.2",
|
||||||
"values": {
|
"values": {
|
||||||
"root_module": {
|
"root_module": {
|
||||||
"resources": [
|
"resources": [
|
||||||
|
2
provisioner/terraform/testdata/resources/presets/presets.tfstate.json
generated
vendored
2
provisioner/terraform/testdata/resources/presets/presets.tfstate.json
generated
vendored
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"format_version": "1.0",
|
"format_version": "1.0",
|
||||||
"terraform_version": "1.11.4",
|
"terraform_version": "1.12.2",
|
||||||
"values": {
|
"values": {
|
||||||
"root_module": {
|
"root_module": {
|
||||||
"resources": [
|
"resources": [
|
||||||
|
2
provisioner/terraform/testdata/version.txt
vendored
2
provisioner/terraform/testdata/version.txt
vendored
@ -1 +1 @@
|
|||||||
1.11.4
|
1.12.2
|
||||||
|
@ -26,7 +26,7 @@ RUN apk add --no-cache \
|
|||||||
# Terraform was disabled in the edge repo due to a build issue.
|
# Terraform was disabled in the edge repo due to a build issue.
|
||||||
# https://gitlab.alpinelinux.org/alpine/aports/-/commit/f3e263d94cfac02d594bef83790c280e045eba35
|
# https://gitlab.alpinelinux.org/alpine/aports/-/commit/f3e263d94cfac02d594bef83790c280e045eba35
|
||||||
# Using wget for now. Note that busybox unzip doesn't support streaming.
|
# 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.11.4/terraform_1.11.4_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.12.2/terraform_1.12.2_linux_${ARCH}.zip" && \
|
||||||
busybox unzip /tmp/terraform.zip -d /usr/local/bin && \
|
busybox unzip /tmp/terraform.zip -d /usr/local/bin && \
|
||||||
rm -f /tmp/terraform.zip && \
|
rm -f /tmp/terraform.zip && \
|
||||||
chmod +x /usr/local/bin/terraform && \
|
chmod +x /usr/local/bin/terraform && \
|
||||||
|
Reference in New Issue
Block a user