WIP

Author: radeksimko

tfexec/cmd.go

@@ -18,6 +18,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform-exec/internal/version"
+	tfjson "github.com/hashicorp/terraform-json"
 )
 
 const (
@@ -216,6 +217,41 @@ func (tf *Terraform) runTerraformCmdJSON(ctx context.Context, cmd *exec.Cmd, v i
 	return dec.Decode(v)
 }
 
+func (tf *Terraform) runTerraformCmdJSONLog(ctx context.Context, cmd *exec.Cmd) *LogMsgEmitter {
+	pr, pw := io.Pipe()
+	tf.SetStdout(pw)
+
+	go func() {
+		_ = tf.runTerraformCmd(ctx, cmd)
+		// TODO: handle error
+		_ = pw.Close()
+		// TODO: handle error
+	}()
+
+	return newLogMsgEmitter(pr)
+}
+
+func newLogMsgEmitter(stdout io.ReadCloser) *LogMsgEmitter {
+	return &LogMsgEmitter{
+		scanner:            bufio.NewScanner(stdout),
+		stdoutReaderCloser: stdout,
+	}
+}
+
+type LogMsgEmitter struct {
+	scanner            *bufio.Scanner
+	stdoutReaderCloser io.Closer
+}
+
+func (e *LogMsgEmitter) NextMessage() (tfjson.LogMsg, bool, error) {
+	scanned := e.scanner.Scan()
+	if !scanned {
+		return nil, scanned, e.stdoutReaderCloser.Close()
+	}
+	msg, err := tfjson.UnmarshalLogMessage(e.scanner.Bytes())
+	return msg, true, err
+}
+
 // mergeUserAgent does some minor deduplication to ensure we aren't
 // just using the same append string over and over.
 func mergeUserAgent(uas ...string) string {

tfexec/internal/e2etest/query_test.go

@@ -8,9 +8,11 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-exec/tfexec"
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
+	tfjson "github.com/hashicorp/terraform-json"
 )
 
 func TestQueryJSON_TF112(t *testing.T) {
@@ -45,14 +47,34 @@ func TestQueryJSON_TF114(t *testing.T) {
 			t.Fatalf("error running Query: %s", err)
 		}
 
-		_, err = le.NextMessage()
-		if err != nil {
-			t.Fatalf("error getting next message: %s", err)
+		results := 0
+		var completeData tfjson.ListCompleteData
+		for {
+			msg, ok, err := le.NextMessage()
+			if !ok {
+				break
+			}
+			if err != nil {
+				t.Fatalf("error getting next message: %s", err)
+			}
+			switch m := msg.(type) {
+			case tfjson.ListResourceFoundMessage:
+				results++
+			case tfjson.ListCompleteMessage:
+				completeData = m.ListComplete
+			}
 		}
 
-		// results := strings.Count(output.String(), "list.concept_pet.pets: Result found")
-		// if results != 5 {
-		// 	t.Fatalf("expected 5 query results, but got %d", results)
-		// }
+		if results != 5 {
+			t.Fatalf("expected 5 query results, but got %d", results)
+		}
+		expectedData := tfjson.ListCompleteData{
+			Address:      "list.concept_pet.pets",
+			ResourceType: "concept_pet",
+			Total:        5,
+		}
+		if diff := cmp.Diff(expectedData, completeData); diff != "" {
+			t.Fatalf("unexpected complete message data: %s", diff)
+		}
 	})
 }

tfexec/internal/testutil/tfcache.go

@@ -36,7 +36,7 @@ const (
 	Latest_Alpha_v1_10 = "1.10.0-alpha20240926"
 	Latest_v1_11       = "1.11.4"
 	Latest_v1_12       = "1.12.2"
-	Latest_Alpha_v1_14 = "1.14.0-alpha20250716"
+	Latest_Alpha_v1_14 = "1.14.0-alpha20250827"
 )
 
 const appendUserAgent = "tfexec-testutil"

tfexec/query.go

@@ -4,13 +4,9 @@
 package tfexec
 
 import (
-	"bufio"
 	"context"
 	"fmt"
-	"io"
 	"os/exec"
-
-	tfjson "github.com/hashicorp/terraform-json"
 )
 
 type queryConfig struct {
@@ -66,36 +62,12 @@ func (tf *Terraform) QueryJSON(ctx context.Context, opts ...QueryOption) (*LogMs
 		return nil, fmt.Errorf("terraform query -json was added in 1.14.0: %w", err)
 	}
 
-	pr, pw := io.Pipe()
-	defer pw.Close()
-	defer pr.Close()
-	tf.SetStdout(pw)
-
-	cmd, err := tf.queryJSONCmd(ctx, opts...)
+	queryCmd, err := tf.queryJSONCmd(ctx, opts...)
 	if err != nil {
 		return nil, err
 	}
 
-	err = tf.runTerraformCmd(ctx, cmd)
-	if err != nil {
-		return nil, err
-	}
-
-	return &LogMsgEmitter{
-		r: bufio.NewReader(pr),
-	}, nil
-}
-
-type LogMsgEmitter struct {
-	r *bufio.Reader
-}
-
-func (e *LogMsgEmitter) NextMessage() (tfjson.LogMsg, error) {
-	rawMessage, err := e.r.ReadBytes('\n')
-	if err != nil {
-		return nil, err
-	}
-	return tfjson.UnmarshalLogMessage(rawMessage)
+	return tf.runTerraformCmdJSONLog(ctx, queryCmd), nil
 }
 
 func (tf *Terraform) queryJSONCmd(ctx context.Context, opts ...QueryOption) (*exec.Cmd, error) {