Removing redundant struct (#426)

hashicorp · Dec 14, 2023 · ddc87e4 · ddc87e4
1 parent d64e88d
commit ddc87e4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/tfexec/internal/e2etest/show_test.go b/tfexec/internal/e2etest/show_test.go
@@ -823,7 +823,7 @@ func TestShowFloat64(t *testing.T) {
 			t.Fatalf("error running Apply in test directory: %s", err)
 		}
 
-		actual, err := tf.Show(context.Background(), tfexec.JSONNumber(tfexec.UseJSONNumber{UseJSONNumber: false}))
+		actual, err := tf.Show(context.Background(), tfexec.JSONNumber(false))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -959,7 +959,7 @@ func TestShowStateFileFloat64(t *testing.T) {
 			t.Fatalf("error running Apply in test directory: %s", err)
 		}
 
-		actual, err := tf.ShowStateFile(context.Background(), filepath.Join(tf.WorkingDir(), "terraform.tfstate"), tfexec.JSONNumber(tfexec.UseJSONNumber{UseJSONNumber: false}))
+		actual, err := tf.ShowStateFile(context.Background(), filepath.Join(tf.WorkingDir(), "terraform.tfstate"), tfexec.JSONNumber(false))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -1069,7 +1069,7 @@ func TestShowPlanFileBigInt(t *testing.T) {
 			t.Fatalf("error running Plan in test directory: %s", err)
 		}
 
-		actual, err := tf.ShowPlanFile(context.Background(), filepath.Join(tf.WorkingDir(), "tfplan"), tfexec.JSONNumber(tfexec.UseJSONNumber{UseJSONNumber: true}))
+		actual, err := tf.ShowPlanFile(context.Background(), filepath.Join(tf.WorkingDir(), "tfplan"), tfexec.JSONNumber(true))
 		if err != nil {
 			t.Fatal(err)
 		}

diff --git a/tfexec/options.go b/tfexec/options.go
@@ -243,17 +243,13 @@ func GraphPlan(file string) *GraphPlanOption {
 	return &GraphPlanOption{file}
 }
 
-// UseJSONNumber determines how numerical values are handled when JSON is decoded.
 type UseJSONNumber struct {
-	UseJSONNumber bool
+	useJSONNumber bool
 }
 
-type UseJSONNumberOption struct {
-	useJSONNumber UseJSONNumber
-}
-
-func JSONNumber(config UseJSONNumber) *UseJSONNumberOption {
-	return &UseJSONNumberOption{config}
+// JSONNumber determines how numerical values are handled during JSON decoding.
+func JSONNumber(useJSONNumber bool) *UseJSONNumber {
+	return &UseJSONNumber{useJSONNumber}
 }
 
 type PlatformOption struct {

diff --git a/tfexec/show.go b/tfexec/show.go
@@ -14,7 +14,7 @@ import (
 
 type showConfig struct {
 	reattachInfo ReattachInfo
-	jsonConfig   *UseJSONNumber
+	jsonNumber   *UseJSONNumber
 }
 
 var defaultShowOptions = showConfig{}
@@ -23,14 +23,14 @@ type ShowOption interface {
 	configureShow(*showConfig)
 }
 
-func (opt *UseJSONNumberOption) configureShow(conf *showConfig) {
-	conf.jsonConfig = &opt.useJSONNumber
-}
-
 func (opt *ReattachOption) configureShow(conf *showConfig) {
 	conf.reattachInfo = opt.info
 }
 
+func (opt *UseJSONNumber) configureShow(conf *showConfig) {
+	conf.jsonNumber = opt
+}
+
 // Show reads the default state path and outputs the state.
 // To read a state or plan file, ShowState or ShowPlan must be used instead.
 func (tf *Terraform) Show(ctx context.Context, opts ...ShowOption) (*tfjson.State, error) {
@@ -59,8 +59,8 @@ func (tf *Terraform) Show(ctx context.Context, opts ...ShowOption) (*tfjson.Stat
 	var ret tfjson.State
 	ret.UseJSONNumber(true)
 
-	if c.jsonConfig != nil {
-		ret.UseJSONNumber(c.jsonConfig.UseJSONNumber)
+	if c.jsonNumber != nil {
+		ret.UseJSONNumber(c.jsonNumber.useJSONNumber)
 	}
 
 	err = tf.runTerraformCmdJSON(ctx, showCmd, &ret)
@@ -107,8 +107,8 @@ func (tf *Terraform) ShowStateFile(ctx context.Context, statePath string, opts .
 	var ret tfjson.State
 	ret.UseJSONNumber(true)
 
-	if c.jsonConfig != nil {
-		ret.UseJSONNumber(c.jsonConfig.UseJSONNumber)
+	if c.jsonNumber != nil {
+		ret.UseJSONNumber(c.jsonNumber.useJSONNumber)
 	}
 
 	err = tf.runTerraformCmdJSON(ctx, showCmd, &ret)
@@ -154,8 +154,8 @@ func (tf *Terraform) ShowPlanFile(ctx context.Context, planPath string, opts ...
 
 	var ret tfjson.Plan
 
-	if c.jsonConfig != nil {
-		ret.UseJSONNumber(c.jsonConfig.UseJSONNumber)
+	if c.jsonNumber != nil {
+		ret.UseJSONNumber(c.jsonNumber.useJSONNumber)
 	}
 
 	err = tf.runTerraformCmdJSON(ctx, showCmd, &ret)