Skip to content

Commit b04e687

Browse files
jdomeracki-coderdeansheather
jdomeracki-coder
and
deansheather
authored
chore: upgrade bundled terraform binary version (#21092)
Closes: coder/internal#1172 --------- Co-authored-by: Dean Sheather <dean@deansheather.com>
1 parent ce9e7ad commit b04e687

33 files changed

+117
-38
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.13.4
10+
terraform_version: 1.14.1
1111
terraform_wrapper: false

‎dogfood/coder/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirrors.edge.kernel.org/u
214214

215215
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.12.2.
216216
# Installing the same version here to match.
217-
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.13.4/terraform_1.13.4_linux_amd64.zip" && \
217+
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.14.1/terraform_1.14.1_linux_amd64.zip" && \
218218
unzip /tmp/terraform.zip -d /usr/local/bin && \
219219
rm -f /tmp/terraform.zip && \
220220
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.13.4"
276+
TERRAFORM_VERSION="1.14.1"
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.13.4"))
25+
TerraformVersion = version.Must(version.NewVersion("1.14.1"))
2626

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

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

‎provisioner/terraform/install_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (p *terraformProxy) handleGet(w http.ResponseWriter, r *http.Request) {
102102
require.NoError(p.t, err)
103103

104104
// update index.json so urls in it point to proxy by making them relative
105-
// "https://releases.hashicorp.com/terraform/1.13.4/terraform_1.13.4_windows_amd64.zip" -> "/terraform/1.13.4/terraform_1.13.4_windows_amd64.zip"
105+
// "https://releases.hashicorp.com/terraform/1.14.1/terraform_1.14.1_windows_amd64.zip" -> "/terraform/1.14.1/terraform_1.14.1_windows_amd64.zip"
106106
if strings.HasSuffix(r.URL.Path, "index.json") {
107107
body = []byte(strings.ReplaceAll(string(body), terraformURL, ""))
108108
}

‎provisioner/terraform/testdata/generate.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
set -euo pipefail
44
cd "$(dirname "${BASH_SOURCE[0]}")/resources"
55

6+
# These environment variables influence the coder provider.
7+
for v in $(env | grep -E '^CODER_' | cut -d= -f1); do
8+
unset "$v"
9+
done
10+
611
generate() {
712
local name="$1"
813

‎provisioner/terraform/testdata/resources/ai-tasks-app/ai-tasks-app.tfplan.json‎

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

‎provisioner/terraform/testdata/resources/ai-tasks-app/ai-tasks-app.tfstate.json‎

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

‎provisioner/terraform/testdata/resources/ai-tasks-multiple/ai-tasks-multiple.tfplan.json‎

Lines changed: 6 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/ai-tasks-multiple/ai-tasks-multiple.tfstate.json‎

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

0 commit comments

Comments
 (0)