refactor: pass escapeHTML parameter to UnifiedDiffRenderer directly

reproio · Sep 13, 2023 · 24596a8 · 24596a8
1 parent 1d31e1b
commit 24596a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/cmd/terraform-j2md/main.go b/cmd/terraform-j2md/main.go
@@ -27,7 +27,7 @@ func run() int {
 		fmt.Fprintf(os.Stderr, "cannot parse input as Terraform plan JSON: %v", err)
 		return 1
 	}
-	if err = planData.Render(os.Stdout, escapeHTML); err != nil {
+	if err = planData.Render(os.Stdout); err != nil {
 		fmt.Fprintf(os.Stderr, "cannot render: %v", err)
 		return 1
 	}

diff --git a/internal/terraform/plan.go b/internal/terraform/plan.go
@@ -60,8 +60,6 @@ type Config struct {
 	EscapeHTML bool
 }
 
-var config Config
-
 type ResourceChangeData struct {
 	ResourceChange *tfjson.ResourceChange
 	Renderer       ResourceChangeDataRenderer
@@ -75,8 +73,7 @@ func (r ResourceChangeData) Header() string {
 	return r.Renderer.Header()
 }
 
-func (plan *PlanData) Render(w io.Writer, escapeHTML bool) error {
-	config.EscapeHTML = escapeHTML
+func (plan *PlanData) Render(w io.Writer) error {
 	funcMap := template.FuncMap{
 		"codeFence": func() string {
 			return "````````"

diff --git a/test/plan_test/plan_test.go b/test/plan_test/plan_test.go
@@ -83,7 +83,7 @@ func Test_render(t *testing.T) {
 				}
 
 				got := bytes.Buffer{}
-				err = plan.Render(&got, true)
+				err = plan.Render(&got)
 				if (err != nil) != tt.wantErr {
 					t.Errorf("render() error = %v, wantErr %v", err, tt.wantErr)
 					return
@@ -127,7 +127,7 @@ func Test_render(t *testing.T) {
 				}
 
 				got := bytes.Buffer{}
-				err = plan.Render(&got, false)
+				err = plan.Render(&got)
 				if (err != nil) != tt.wantErr {
 					t.Errorf("render() error = %v, wantErr %v", err, tt.wantErr)
 					return