mirror of
https://github.com/appleboy/drone-ssh.git
synced 2025-05-09 18:23:21 +08:00
refactor: set default environment variables format in plugin (#253)
- Add `INPUT_ENVS_FORMAT` to the list of environment variables in `main.go` - Define `envsFormat` variable in `plugin.go` - Add default value for `Config.EnvsFormat` in `plugin.go` `Exec()` function fix https://github.com/appleboy/drone-ssh/pull/235
This commit is contained in:
parent
6464d9999f
commit
49542638c6
4
main.go
4
main.go
@ -199,8 +199,8 @@ func main() {
|
|||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
Name: "envs.format",
|
Name: "envs.format",
|
||||||
Usage: "",
|
Usage: "",
|
||||||
EnvVars: []string{"PLUGIN_ENVS_FORMAT"},
|
EnvVars: []string{"PLUGIN_ENVS_FORMAT", "INPUT_ENVS_FORMAT"},
|
||||||
Value: "export {NAME}={VALUE}",
|
Value: envsFormat,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ var (
|
|||||||
errMissingHost = errors.New("Error: missing server host")
|
errMissingHost = errors.New("Error: missing server host")
|
||||||
errMissingPasswordOrKey = errors.New("Error: can't connect without a private SSH key or password")
|
errMissingPasswordOrKey = errors.New("Error: can't connect without a private SSH key or password")
|
||||||
errCommandTimeOut = errors.New("Error: command timeout")
|
errCommandTimeOut = errors.New("Error: command timeout")
|
||||||
|
envsFormat = "export {NAME}={VALUE}"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@ -179,6 +180,10 @@ func (p Plugin) Exec() error {
|
|||||||
return errMissingPasswordOrKey
|
return errMissingPasswordOrKey
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if p.Config.EnvsFormat == "" {
|
||||||
|
p.Config.EnvsFormat = envsFormat
|
||||||
|
}
|
||||||
|
|
||||||
wg := sync.WaitGroup{}
|
wg := sync.WaitGroup{}
|
||||||
wg.Add(len(p.Config.Host))
|
wg.Add(len(p.Config.Host))
|
||||||
errChannel := make(chan error)
|
errChannel := make(chan error)
|
||||||
|
Loading…
Reference in New Issue
Block a user