fix(tft): plumb GetJsonOutput() key (#2385)

GoogleCloudPlatform · May 24, 2024 · 1b04124 · 1b04124
1 parent 05c5a97
commit 1b04124
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/infra/blueprint-test/go.mod b/infra/blueprint-test/go.mod
@@ -2,6 +2,8 @@ module github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-t
 
 go 1.22
 
+toolchain go1.22.3
+
 require (
 	github.com/GoogleContainerTools/kpt-functions-sdk/go/api v0.0.0-20230427202446-3255accc518d
 	github.com/alexflint/go-filemutex v1.3.0

diff --git a/infra/blueprint-test/pkg/tft/terraform.go b/infra/blueprint-test/pkg/tft/terraform.go
@@ -369,14 +369,15 @@ func (b *TFBlueprintTest) GetStringOutputList(name string) []string {
 	return terraform.OutputList(b.t, b.GetTFOptions(), name)
 }
 
-// GetJsonOutput returns all TF output as gjson.Result.
+// GetJsonOutput returns TF output for key as gjson.Result.
+// An empty string for key can be used to return all values
 // It fails test on invalid JSON.
-func (b *TFBlueprintTest) GetJsonOutput() gjson.Result {
+func (b *TFBlueprintTest) GetJsonOutput(key string) gjson.Result {
 	// allow only parallel reads as Terraform plugin cache isn't concurrent safe
 	rUnlockFn := b.rLockFn()
 	defer rUnlockFn()
 
-	jsonString := terraform.OutputJson(b.t, b.GetTFOptions(), "")
+	jsonString := terraform.OutputJson(b.t, b.GetTFOptions(), key)
 	if !gjson.Valid(jsonString) {
 		b.t.Fatalf("Invalid JSON: %s", jsonString)
 	}