Skip to content

fix: bump bundled terraform to 1.16.6 for 2.29 - #30555

Merged
droopy4096 merged 4 commits into
release/2.29from
backport/tf-1.16.5-release-2.29
Oct 15, 2026
Merged

droopy4096 merged 4 commits into
release/2.29from
backport/tf-1.16.5-release-2.29

Conversation

@coder

@coder coder Bot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Backport of #30516 to release/2.29.

Bumps the bundled Terraform binary to 1.16.6 (latest stable, released 2026-10-14) so all supported branches ship the same version. Previous pin: 1.14.5 across install.go, install.sh, scripts/Dockerfile.base, dogfood/coder/Dockerfile, .github/actions/setup-tf and both testdata version files.

This is a minor version jump, so maxTerraformVersion is raised to 1.16.9. Checksums and Nix SRI hashes come from HashiCorp's terraform_1.16.6_SHA256SUMS.

Not changed: scripts/ironbank/hardening_manifest.yaml still builds Terraform 1.14.5 from source (with a source tarball checksum). Iron Bank bumps have historically gone through separate PRs, so it is left for the Iron Bank owners.

Verified with go test ./provisioner/terraform/... on this branch.

Opened by Superblink on behalf of @droopy4096.

Updated from 1.16.5 to 1.16.6 (adds an HTTP/2 resource-exhaustion fix). Branch name still says 1.16.5. Tests not re-run locally for 1.16.6, relying on CI.

Bump the bundled Terraform binary from 1.14.5 to 1.16.5 to match main (#30516).
@github-actions github-actions Bot added the community Pull Requests and issues created by the community. label Oct 9, 2026
@github-actions

github-actions Bot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

👋 Hey @coder[bot]!

This PR is targeting the release/2.29 release branch, but its title does not start with fix: or fix(scope):.

Only bug fixes should be cherry-picked to release branches. If this is a bug fix, please update the PR title to match the conventional commit format:

fix: description of the bug fix
fix(scope): description of the bug fix

If this is not a bug fix, it likely should not target a release branch.

@coder coder Bot added cherry-pick/v2.29 Needs to be cherry-picked to the 2.29 release branch and removed community Pull Requests and issues created by the community. labels Oct 9, 2026
@coder coder Bot changed the title chore: bump bundled terraform to 1.16.5 for 2.29 fix: bump bundled terraform to 1.16.5 for 2.29 Oct 9, 2026
@coder

coder Bot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor Author

CI failures here look unrelated to the Terraform bump:

  • build_image: the dogfood image fails in the earlier apt-get update layer: apt.releases.hashicorp.com InRelease can't be verified (NO_PUBKEY FC9CA96ACA026560, stale HashiCorp apt key on this branch). That happens before the Terraform download layer this PR changes.
  • test-go-pg-17: flaky agent test. No Go logic changed here (version constant only).
  • chromatic: Failed to authenticate against the Chromatic API (credentials/client issue). This PR has no site/ changes.
  • required: aggregate of the above.

Posted on behalf of @droopy4096

@coder coder Bot changed the title fix: bump bundled terraform to 1.16.5 for 2.29 fix: bump bundled terraform to 1.16.6 for 2.29 Oct 15, 2026
@linear-code

linear-code Bot commented Oct 15, 2026

Copy link
Copy Markdown

ENT-216

@coder
coder Bot requested a review from denisra October 15, 2026 17:38
@droopy4096
droopy4096 marked this pull request as ready for review October 15, 2026 18:00
droopy4096 pushed a commit that referenced this pull request Oct 15, 2026
## Problem

`build_image` in the dogfood workflow fails on every `release/2.29` run
since at least 2026-10-09 (e.g. #30555, #30811). Two independent causes,
both forms of pinned-branch rot:

1. **"Build and push Non-Nix image"**: the Rust stage of
`dogfood/coder/Dockerfile` runs `cargo install jj-cli typos-cli
watchexec-cli@2.3.2`, two crates unpinned and none locked, so every
build resolves today's crates.io against the rustc frozen by the base
image digest (1.91.1):
   ```
error: cannot install package `jj-cli 0.46.0`, it requires rustc 1.97.1
or newer
error: cannot install package `typos-cli 1.51.1`, it requires rustc 1.95
or newer
error: could not compile `watchexec-cli` (lib) due to 1 previous error
   ```
2. **"Build Nix image"**: the nixpkgs pinned in this branch's
`flake.lock` fetches `google-chrome-stable_138.0.7204.49`, which Google
no longer serves (same as #30858 on 2.34).

`main` has neither problem: it stopped compiling these tools in the
image and removed the nix image in #26022.

## Changes

- `dogfood/coder/Dockerfile`: `cargo install --locked jj-cli@0.45.1
typos-cli@1.49.0 watchexec-cli@2.3.2`. The two pins are the newest
releases whose declared minimum rustc is at or below 1.91 (checked
against crates.io metadata); `--locked` uses each crate's own lockfile,
which is what fixes the `watchexec-cli` compile. Also corrects the stale
toolchain comment (said 1.86.0, digest is 1.91.1).
- `.github/workflows/dogfood.yaml`: drop the Nix install, Nix cache,
"Build Nix image" and "Push Nix image" steps and the `flake.*` path
triggers, mirroring the workflow part of #30858. `flake.nix`,
`nix/docker.nix` and the template's nix option are left alone to keep
the backport small, as on 2.34.

## Verification

This PR touches `dogfood/**` and the workflow, so its own `build_image`
run is the test. The first push (Dockerfile only) got "Build and push
Non-Nix image" green for the first time since October 9 and then failed
on the nix step; the second push removes that step.

Unblocks #30555 and the Go backport to 2.29.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@droopy4096
droopy4096 merged commit 36b51e2 into release/2.29 Oct 15, 2026
28 of 29 checks passed
@droopy4096
droopy4096 deleted the backport/tf-1.16.5-release-2.29 branch October 15, 2026 19:40
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 15, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cherry-pick/v2.29 Needs to be cherry-picked to the 2.29 release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants