Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop exporting exec.Cmd versions of methods #25

Merged
merged 1 commit into from
Jul 13, 2020
Merged

Stop exporting exec.Cmd versions of methods #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tfexec/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (opt *DirOrPlanOption) configureApply(conf *applyConfig) {
}

func (tf *Terraform) Apply(ctx context.Context, opts ...ApplyOption) error {
applyCmd := tf.ApplyCmd(ctx, opts...)
applyCmd := tf.applyCmd(ctx, opts...)

var errBuf strings.Builder
applyCmd.Stderr = &errBuf
Expand All @@ -94,7 +94,7 @@ func (tf *Terraform) Apply(ctx context.Context, opts ...ApplyOption) error {
return nil
}

func (tf *Terraform) ApplyCmd(ctx context.Context, opts ...ApplyOption) *exec.Cmd {
func (tf *Terraform) applyCmd(ctx context.Context, opts ...ApplyOption) *exec.Cmd {
c := defaultApplyOptions

for _, o := range opts {
Expand Down
2 changes: 1 addition & 1 deletion tfexec/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestApplyCmd(t *testing.T) {
t.Fatal(err)
}

applyCmd := tf.ApplyCmd(context.Background(), Backup("testbackup"), LockTimeout("200s"), State("teststate"), StateOut("teststateout"), VarFile("testvarfile"), Lock(false), Parallelism(99), Refresh(false), Target("target1"), Target("target2"), Var("var1=foo"), Var("var2=bar"), DirOrPlan("testfile"))
applyCmd := tf.applyCmd(context.Background(), Backup("testbackup"), LockTimeout("200s"), State("teststate"), StateOut("teststateout"), VarFile("testvarfile"), Lock(false), Parallelism(99), Refresh(false), Target("target1"), Target("target2"), Var("var1=foo"), Var("var2=bar"), DirOrPlan("testfile"))

actual := strings.TrimPrefix(cmdString(applyCmd), applyCmd.Path+" ")

Expand Down
4 changes: 2 additions & 2 deletions tfexec/destroy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (opt *VarOption) configureDestroy(conf *destroyConfig) {
}

func (tf *Terraform) Destroy(ctx context.Context, opts ...DestroyOption) error {
destroyCmd := tf.DestroyCmd(ctx, opts...)
destroyCmd := tf.destroyCmd(ctx, opts...)

var errBuf strings.Builder
destroyCmd.Stderr = &errBuf
Expand All @@ -90,7 +90,7 @@ func (tf *Terraform) Destroy(ctx context.Context, opts ...DestroyOption) error {
return nil
}

func (tf *Terraform) DestroyCmd(ctx context.Context, opts ...DestroyOption) *exec.Cmd {
func (tf *Terraform) destroyCmd(ctx context.Context, opts ...DestroyOption) *exec.Cmd {
c := defaultDestroyOptions

for _, o := range opts {
Expand Down
4 changes: 2 additions & 2 deletions tfexec/destroy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestDestroyCmd(t *testing.T) {
}

// defaults
destroyCmd := tf.DestroyCmd(context.Background())
destroyCmd := tf.destroyCmd(context.Background())

actual := strings.TrimPrefix(cmdString(destroyCmd), destroyCmd.Path+" ")

Expand All @@ -28,7 +28,7 @@ func TestDestroyCmd(t *testing.T) {
}

// override all defaults
destroyCmd = tf.DestroyCmd(context.Background(), Backup("testbackup"), LockTimeout("200s"), State("teststate"), StateOut("teststateout"), VarFile("testvarfile"), Lock(false), Parallelism(99), Refresh(false), Target("target1"), Target("target2"), Var("var1=foo"), Var("var2=bar"))
destroyCmd = tf.destroyCmd(context.Background(), Backup("testbackup"), LockTimeout("200s"), State("teststate"), StateOut("teststateout"), VarFile("testvarfile"), Lock(false), Parallelism(99), Refresh(false), Target("target1"), Target("target2"), Var("var1=foo"), Var("var2=bar"))

actual = strings.TrimPrefix(cmdString(destroyCmd), destroyCmd.Path+" ")

Expand Down
4 changes: 2 additions & 2 deletions tfexec/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (opt *VarFileOption) configureImport(conf *importConfig) {
}

func (t *Terraform) Import(ctx context.Context, address, id string, opts ...ImportOption) error {
importCmd := t.ImportCmd(ctx, address, id, opts...)
importCmd := t.importCmd(ctx, address, id, opts...)

var errBuf strings.Builder
importCmd.Stderr = &errBuf
Expand All @@ -81,7 +81,7 @@ func (t *Terraform) Import(ctx context.Context, address, id string, opts ...Impo
return nil
}

func (tf *Terraform) ImportCmd(ctx context.Context, address, id string, opts ...ImportOption) *exec.Cmd {
func (tf *Terraform) importCmd(ctx context.Context, address, id string, opts ...ImportOption) *exec.Cmd {
c := defaultImportOptions

for _, o := range opts {
Expand Down
4 changes: 2 additions & 2 deletions tfexec/import_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func TestImportCmd(t *testing.T) {
}

// defaults
importCmd := tf.ImportCmd(context.Background(), "my-addr", "my-id")
importCmd := tf.importCmd(context.Background(), "my-addr", "my-id")

actual := strings.TrimPrefix(cmdString(importCmd), importCmd.Path+" ")

Expand All @@ -97,7 +97,7 @@ func TestImportCmd(t *testing.T) {
}

// override all defaults
importCmd = tf.ImportCmd(context.Background(), "my-addr2", "my-id2",
importCmd = tf.importCmd(context.Background(), "my-addr2", "my-id2",
Backup("testbackup"),
LockTimeout("200s"),
State("teststate"),
Expand Down
4 changes: 2 additions & 2 deletions tfexec/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func (opt *VerifyPluginsOption) configureInit(conf *initConfig) {
}

func (t *Terraform) Init(ctx context.Context, opts ...InitOption) error {
initCmd := t.InitCmd(ctx, opts...)
initCmd := t.initCmd(ctx, opts...)

var errBuf strings.Builder
initCmd.Stderr = &errBuf
Expand All @@ -96,7 +96,7 @@ func (t *Terraform) Init(ctx context.Context, opts ...InitOption) error {
return nil
}

func (tf *Terraform) InitCmd(ctx context.Context, opts ...InitOption) *exec.Cmd {
func (tf *Terraform) initCmd(ctx context.Context, opts ...InitOption) *exec.Cmd {
c := defaultInitOptions

for _, o := range opts {
Expand Down
4 changes: 2 additions & 2 deletions tfexec/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestInitCmd(t *testing.T) {
}

// defaults
initCmd := tf.InitCmd(context.Background())
initCmd := tf.initCmd(context.Background())

actual := strings.TrimPrefix(cmdString(initCmd), initCmd.Path+" ")

Expand All @@ -28,7 +28,7 @@ func TestInitCmd(t *testing.T) {
}

// override all defaults
initCmd = tf.InitCmd(context.Background(), Backend(false), BackendConfig("confpath1"), BackendConfig("confpath2"), FromModule("testsource"), Get(false), GetPlugins(false), Lock(false), LockTimeout("999s"), PluginDir("testdir1"), PluginDir("testdir2"), Reconfigure(true), Upgrade(true), VerifyPlugins(false))
initCmd = tf.initCmd(context.Background(), Backend(false), BackendConfig("confpath1"), BackendConfig("confpath2"), FromModule("testsource"), Get(false), GetPlugins(false), Lock(false), LockTimeout("999s"), PluginDir("testdir1"), PluginDir("testdir2"), Reconfigure(true), Upgrade(true), VerifyPlugins(false))

actual = strings.TrimPrefix(cmdString(initCmd), initCmd.Path+" ")

Expand Down
4 changes: 2 additions & 2 deletions tfexec/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type OutputMeta struct {
}

func (tf *Terraform) Output(ctx context.Context, opts ...OutputOption) (map[string]OutputMeta, error) {
outputCmd := tf.OutputCmd(ctx, opts...)
outputCmd := tf.outputCmd(ctx, opts...)

var errBuf strings.Builder
var outBuf bytes.Buffer
Expand All @@ -57,7 +57,7 @@ func (tf *Terraform) Output(ctx context.Context, opts ...OutputOption) (map[stri
return outputs, nil
}

func (tf *Terraform) OutputCmd(ctx context.Context, opts ...OutputOption) *exec.Cmd {
func (tf *Terraform) outputCmd(ctx context.Context, opts ...OutputOption) *exec.Cmd {
c := defaultOutputOptions

for _, o := range opts {
Expand Down
4 changes: 2 additions & 2 deletions tfexec/output_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestOutputCmd(t *testing.T) {
}

// defaults
outputCmd := tf.OutputCmd(context.Background())
outputCmd := tf.outputCmd(context.Background())

actual := strings.TrimPrefix(cmdString(outputCmd), outputCmd.Path+" ")

Expand All @@ -28,7 +28,7 @@ func TestOutputCmd(t *testing.T) {
}

// override all defaults
outputCmd = tf.OutputCmd(context.Background(),
outputCmd = tf.outputCmd(context.Background(),
State("teststate"))

actual = strings.TrimPrefix(cmdString(outputCmd), outputCmd.Path+" ")
Expand Down
4 changes: 2 additions & 2 deletions tfexec/plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (opt *DestroyFlagOption) configurePlan(conf *planConfig) {
}

func (tf *Terraform) Plan(ctx context.Context, opts ...PlanOption) error {
planCmd := tf.PlanCmd(ctx, opts...)
planCmd := tf.planCmd(ctx, opts...)

var errBuf strings.Builder
planCmd.Stderr = &errBuf
Expand All @@ -87,7 +87,7 @@ func (tf *Terraform) Plan(ctx context.Context, opts ...PlanOption) error {
return nil
}

func (tf *Terraform) PlanCmd(ctx context.Context, opts ...PlanOption) *exec.Cmd {
func (tf *Terraform) planCmd(ctx context.Context, opts ...PlanOption) *exec.Cmd {
c := defaultPlanOptions

for _, o := range opts {
Expand Down
4 changes: 2 additions & 2 deletions tfexec/plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestPlanCmd(t *testing.T) {
}

// defaults
planCmd := tf.PlanCmd(context.Background())
planCmd := tf.planCmd(context.Background())

actual := strings.TrimPrefix(cmdString(planCmd), planCmd.Path+" ")

Expand All @@ -28,7 +28,7 @@ func TestPlanCmd(t *testing.T) {
}

// override all defaults
planCmd = tf.PlanCmd(context.Background(), Destroy(true), Lock(false), LockTimeout("22s"), Out("whale"), Parallelism(42), Refresh(false), State("marvin"), Target("zaphod"), Target("beeblebrox"), Var("android=paranoid"), Var("brain_size=planet"), VarFile("trillian"))
planCmd = tf.planCmd(context.Background(), Destroy(true), Lock(false), LockTimeout("22s"), Out("whale"), Parallelism(42), Refresh(false), State("marvin"), Target("zaphod"), Target("beeblebrox"), Var("android=paranoid"), Var("brain_size=planet"), VarFile("trillian"))

actual = strings.TrimPrefix(cmdString(planCmd), planCmd.Path+" ")

Expand Down
4 changes: 2 additions & 2 deletions tfexec/providers_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (tf *Terraform) ProvidersSchema(ctx context.Context) (*tfjson.ProviderSchem
var errBuf strings.Builder
var outBuf bytes.Buffer

schemaCmd := tf.ProvidersSchemaCmd(ctx)
schemaCmd := tf.providersSchemaCmd(ctx)

schemaCmd.Stderr = &errBuf
schemaCmd.Stdout = &outBuf
Expand All @@ -39,7 +39,7 @@ func (tf *Terraform) ProvidersSchema(ctx context.Context) (*tfjson.ProviderSchem
return &ret, nil
}

func (tf *Terraform) ProvidersSchemaCmd(ctx context.Context, args ...string) *exec.Cmd {
func (tf *Terraform) providersSchemaCmd(ctx context.Context, args ...string) *exec.Cmd {
allArgs := []string{"providers", "schema", "-json", "-no-color"}
allArgs = append(allArgs, args...)

Expand Down
2 changes: 1 addition & 1 deletion tfexec/providers_schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestProvidersSchemaCmd(t *testing.T) {
}

// defaults
schemaCmd := tf.ProvidersSchemaCmd(context.Background())
schemaCmd := tf.providersSchemaCmd(context.Background())

actual := strings.TrimPrefix(cmdString(schemaCmd), schemaCmd.Path+" ")

Expand Down
4 changes: 2 additions & 2 deletions tfexec/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (tf *Terraform) StateShow(ctx context.Context) (*tfjson.State, error) {
var errBuf strings.Builder
var outBuf bytes.Buffer

showCmd := tf.StateShowCmd(ctx)
showCmd := tf.stateShowCmd(ctx)

showCmd.Stderr = &errBuf
showCmd.Stdout = &outBuf
Expand All @@ -39,7 +39,7 @@ func (tf *Terraform) StateShow(ctx context.Context) (*tfjson.State, error) {
return &ret, nil
}

func (tf *Terraform) StateShowCmd(ctx context.Context, args ...string) *exec.Cmd {
func (tf *Terraform) stateShowCmd(ctx context.Context, args ...string) *exec.Cmd {
allArgs := []string{"show", "-json", "-no-color"}
allArgs = append(allArgs, args...)

Expand Down
2 changes: 1 addition & 1 deletion tfexec/show_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func TestStateShowCmd(t *testing.T) {
}

// defaults
showCmd := tf.StateShowCmd(context.Background())
showCmd := tf.stateShowCmd(context.Background())

actual := strings.TrimPrefix(cmdString(showCmd), showCmd.Path+" ")

Expand Down
4 changes: 2 additions & 2 deletions tfexec/terraform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestCheckpointDisablePropagation(t *testing.T) {
tf.SetEnv(map[string]string{
"FOOBAR": "1",
})
initCmd := tf.InitCmd(context.Background())
initCmd := tf.initCmd(context.Background())
expected := []string{"FOOBAR=1", "CHECKPOINT_DISABLE=1", "TF_LOG="}
actual := initCmd.Env

Expand All @@ -57,7 +57,7 @@ func TestCheckpointDisablePropagation(t *testing.T) {
"CHECKPOINT_DISABLE": "",
"FOOBAR": "1",
})
initCmd = tf.InitCmd(context.Background())
initCmd = tf.initCmd(context.Background())
expected = []string{"CHECKPOINT_DISABLE=", "FOOBAR=1", "TF_LOG="}
actual = initCmd.Env

Expand Down