github/wp-opentofu
0
0
Fork 0
mirror of https://github.com/thegeeklab/wp-opentofu.git synced 2024-11-22 00:30:40 +00:00
Code Issues Releases Activity

fix: apply no_log option only to sensitive commands (#4)

Browse Source
This commit is contained in:
Robert Kaussow 2024-02-06 10:41:11 +01:00 committed by GitHub
parent 88744f2ca2
commit 1a93881a53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/wp-opentofu/flags.go
View File

@ -45,14 +45,14 @@ func settingsFlags(settings *plugin.Settings, category string) []cli.Flag {
},
&cli.BoolFlag{
Name: "no-log",
Usage: "suppress tofu command output",
Usage: "suppress tofu command output for `plan`, `apply` and `destroy` action",
EnvVars: []string{"PLUGIN_NO_LOG"},
Destination: &settings.NoLog,
Category: category,
},
&cli.StringSliceFlag{
Name: "targets",
Usage: "targets to run `apply` or `plan` action on",
Usage: "targets to run `plan` or `apply` action on",
EnvVars: []string{"PLUGIN_TARGETS"},
Destination: &settings.Targets,
Category: category,

4
docs/data/data.yaml
View File

@ -21,7 +21,7 @@ properties:
- name: no_log
description: |
Suppress tofu command output.
Suppress tofu command output for `plan`, `apply` and `destroy` action.
type: bool
defaultValue: false
required: false
@ -48,7 +48,7 @@ properties:
- name: targets
description: |
Targets to run `apply` or `plan` action on.
Targets to run `plan` or `apply` action on.
type: list
required: false

5
plugin/impl.go
View File

@ -6,7 +6,6 @@ import (
"fmt"
"os"
"github.com/thegeeklab/wp-plugin-go/trace"
"golang.org/x/sys/execabs"
)
@ -99,10 +98,6 @@ func (p *Plugin) Execute() error {
cmd.Env = os.Environ()
if !p.Settings.NoLog {
trace.Cmd(cmd)
}
if err := cmd.Run(); err != nil {
return err
}

25
plugin/tofu.go
View File

@ -3,6 +3,7 @@ package plugin
import (
"fmt"
"github.com/thegeeklab/wp-plugin-go/trace"
"golang.org/x/sys/execabs"
)
@ -111,10 +112,16 @@ func (p *Plugin) planCommand(destroy bool) *execabs.Cmd {
args = append(args, "-refresh=false")
}
return execabs.Command(
cmd := execabs.Command(
tofuBin,
args...,
)
if !p.Settings.NoLog {
trace.Cmd(cmd)
}
return cmd
}
func (p *Plugin) applyCommand() *execabs.Cmd {
@ -144,10 +151,16 @@ func (p *Plugin) applyCommand() *execabs.Cmd {
args = append(args, p.Settings.OutFile)
return execabs.Command(
cmd := execabs.Command(
tofuBin,
args...,
)
if !p.Settings.NoLog {
trace.Cmd(cmd)
}
return cmd
}
func (p *Plugin) destroyCommand() *execabs.Cmd {
@ -173,8 +186,14 @@ func (p *Plugin) destroyCommand() *execabs.Cmd {
args = append(args, "-auto-approve")
return execabs.Command(
cmd := execabs.Command(
tofuBin,
args...,
)
if !p.Settings.NoLog {
trace.Cmd(cmd)
}
return cmd
}