Rename structs and func (#426)

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

Hide file tree

Showing 3 changed files with 12 additions and 12 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.JSON(tfexec.JSONConfig{UseJSONNumber: false}))
+		actual, err := tf.Show(context.Background(), tfexec.JSONNumber(tfexec.UseJSONNumber{UseJSONNumber: 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.JSON(tfexec.JSONConfig{UseJSONNumber: false}))
+		actual, err := tf.ShowStateFile(context.Background(), filepath.Join(tf.WorkingDir(), "terraform.tfstate"), tfexec.JSONNumber(tfexec.UseJSONNumber{UseJSONNumber: 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.JSON(tfexec.JSONConfig{UseJSONNumber: true}))
+		actual, err := tf.ShowPlanFile(context.Background(), filepath.Join(tf.WorkingDir(), "tfplan"), tfexec.JSONNumber(tfexec.UseJSONNumber{UseJSONNumber: true}))
 		if err != nil {
 			t.Fatal(err)
 		}

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

diff --git a/tfexec/show.go b/tfexec/show.go
@@ -14,7 +14,7 @@ import (
 
 type showConfig struct {
 	reattachInfo ReattachInfo
-	jsonConfig   *JSONConfig
+	jsonConfig   *UseJSONNumber
 }
 
 var defaultShowOptions = showConfig{}
@@ -23,8 +23,8 @@ type ShowOption interface {
 	configureShow(*showConfig)
 }
 
-func (opt *JSONOption) configureShow(conf *showConfig) {
-	conf.jsonConfig = &opt.config
+func (opt *UseJSONNumberOption) configureShow(conf *showConfig) {
+	conf.jsonConfig = &opt.useJSONNumber
 }
 
 func (opt *ReattachOption) configureShow(conf *showConfig) {