tfextract -> tfparse

johnstcn · johnstcn · commit 2320dcc2e680 · 2024-10-25T14:27:24.000+01:00
diff --git a/provisioner/terraform/parse.go b/provisioner/terraform/parse.go
@@ -9,7 +9,7 @@ import (
 	"github.com/mitchellh/go-wordwrap"
 
 	"github.com/coder/coder/v2/coderd/tracing"
-	"github.com/coder/coder/v2/provisioner/terraform/tfextract"
+	"github.com/coder/coder/v2/provisioner/terraform/tfparse"
 	"github.com/coder/coder/v2/provisionersdk"
 	"github.com/coder/coder/v2/provisionersdk/proto"
 )
@@ -26,12 +26,12 @@ func (s *server) Parse(sess *provisionersdk.Session, _ *proto.ParseRequest, _ <-
 		return provisionersdk.ParseErrorf("load module: %s", formatDiagnostics(sess.WorkDirectory, diags))
 	}
 
-	workspaceTags, err := tfextract.WorkspaceTags(ctx, s.logger, module)
+	workspaceTags, err := tfparse.WorkspaceTags(ctx, s.logger, module)
 	if err != nil {
 		return provisionersdk.ParseErrorf("can't load workspace tags: %v", err)
 	}
 
-	templateVariables, err := tfextract.LoadTerraformVariables(module)
+	templateVariables, err := tfparse.LoadTerraformVariables(module)
 	if err != nil {
 		return provisionersdk.ParseErrorf("can't load template variables: %v", err)
 	}
diff --git a/provisioner/terraform/tfparse/tfextract.go b/provisioner/terraform/tfparse/tfextract.go
@@ -1,4 +1,4 @@
-package tfextract
+package tfparse
 
 import (
 	"context"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/mitchellh/go-wordwrap"`
`10`	`10`
`11`	`11`	`"github.com/coder/coder/v2/coderd/tracing"`
`12`		`- "github.com/coder/coder/v2/provisioner/terraform/tfextract"`
	`12`	`+ "github.com/coder/coder/v2/provisioner/terraform/tfparse"`
`13`	`13`	`"github.com/coder/coder/v2/provisionersdk"`
`14`	`14`	`"github.com/coder/coder/v2/provisionersdk/proto"`
`15`	`15`	`)`
`@@ -26,12 +26,12 @@ func (s server) Parse(sess provisionersdk.Session, _ *proto.ParseRequest, _ <-`
`26`	`26`	`return provisionersdk.ParseErrorf("load module: %s", formatDiagnostics(sess.WorkDirectory, diags))`
`27`	`27`	`}`
`28`	`28`
`29`		`- workspaceTags, err := tfextract.WorkspaceTags(ctx, s.logger, module)`
	`29`	`+ workspaceTags, err := tfparse.WorkspaceTags(ctx, s.logger, module)`
`30`	`30`	`if err != nil {`
`31`	`31`	`return provisionersdk.ParseErrorf("can't load workspace tags: %v", err)`
`32`	`32`	`}`
`33`	`33`
`34`		`- templateVariables, err := tfextract.LoadTerraformVariables(module)`
	`34`	`+ templateVariables, err := tfparse.LoadTerraformVariables(module)`
`35`	`35`	`if err != nil {`
`36`	`36`	`return provisionersdk.ParseErrorf("can't load template variables: %v", err)`
`37`	`37`	`}`