Skip to content

Commit 9c5fc3b

Browse files
kylecarbscoadler
kylecarbs
and
coadler
committed
fix: properly detect agent resouces in terraform (coder#13343)
Terraform changed the default output of the `terraform graph` command. You must put `-type=plan` to keep the prior behavior. (cherry picked from commit 3364abe) Co-authored-by: Colin Adler <colin1adler@gmail.com>
1 parent d565144 commit 9c5fc3b

File tree

88 files changed

+878
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+878
-332
lines changed

‎.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ jobs:
183183
- name: Setup sqlc
184184
uses: ./.github/actions/setup-sqlc
185185

186+
- name: Setup Terraform
187+
uses: ./.github/actions/setup-tf
188+
186189
- name: go install tools
187190
run: |
188191
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30

‎Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ gen: \
489489
coderd/apidoc/swagger.json \
490490
.prettierignore.include \
491491
.prettierignore \
492+
provisioner/terraform/testdata/version \
492493
site/.prettierrc.yaml \
493494
site/.prettierignore \
494495
site/.eslintignore \
@@ -674,6 +675,12 @@ provisioner/terraform/testdata/.gen-golden: $(wildcard provisioner/terraform/tes
674675
go test ./provisioner/terraform -run="Test.*Golden$$" -update
675676
touch "$@"
676677

678+
provisioner/terraform/testdata/version:
679+
if [[ "$(shell cat provisioner/terraform/testdata/version.txt)" != "$(shell terraform version -json | jq -r '.terraform_version')" ]]; then
680+
./provisioner/terraform/testdata/generate.sh
681+
fi
682+
.PHONY: provisioner/terraform/testdata/version
683+
677684
scripts/ci-report/testdata/.gen-golden: $(wildcard scripts/ci-report/testdata/*) $(wildcard scripts/ci-report/*.go)
678685
go test ./scripts/ci-report -run=TestOutputMatchesGoldenFile -update
679686
touch "$@"

‎provisioner/terraform/executor.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
"github.com/coder/coder/v2/provisionersdk/proto"
2525
)
2626

27+
var version170 = version.Must(version.NewVersion("1.7.0"))
28+
2729
type executor struct {
2830
logger slog.Logger
2931
server *server
@@ -346,8 +348,16 @@ func (e *executor) graph(ctx, killCtx context.Context) (string, error) {
346348
return "", ctx.Err()
347349
}
348350

351+
ver, err := e.version(ctx)
352+
if err != nil {
353+
return "", err
354+
}
355+
args := []string{"graph"}
356+
if ver.GreaterThanOrEqual(version170) {
357+
args = append(args, "-type=plan")
358+
}
349359
var out strings.Builder
350-
cmd := exec.CommandContext(killCtx, e.binaryPath, "graph") // #nosec
360+
cmd := exec.CommandContext(killCtx, e.binaryPath, args...) // #nosec
351361
cmd.Stdout = &out
352362
cmd.Dir = e.workdir
353363
cmd.Env = e.basicEnv()
@@ -356,7 +366,7 @@ func (e *executor) graph(ctx, killCtx context.Context) (string, error) {
356366
slog.F("binary_path", e.binaryPath),
357367
slog.F("args", "graph"),
358368
)
359-
err := cmd.Start()
369+
err = cmd.Start()
360370
if err != nil {
361371
return "", err
362372
}

‎provisioner/terraform/testdata/calling-module/calling-module.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
coder = {
44
source = "coder/coder"
5-
version = "0.6.1"
5+
version = "0.22.0"
66
}
77
}
88
}

‎provisioner/terraform/testdata/calling-module/calling-module.tfplan.dot

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

‎provisioner/terraform/testdata/calling-module/calling-module.tfplan.json

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

‎provisioner/terraform/testdata/calling-module/calling-module.tfstate.dot

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

‎provisioner/terraform/testdata/calling-module/calling-module.tfstate.json

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

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
coder = {
44
source = "coder/coder"
5-
version = "0.6.1"
5+
version = "0.22.0"
66
}
77
}
88
}

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.dot

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

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json

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

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.dot

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

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json

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

0 commit comments

Comments
 (0)