github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-22 02:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

move to envsubst package

Browse Source
This commit is contained in:
Brad Rydzewski
2017-01-18 22:03:38 +07:00
parent 24ea9db99a
commit a03e962c2a
12 changed files with 442 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
agent/agent.go
View File

@@ -13,8 +13,8 @@ import (
"github.com/drone/drone/model"
"github.com/drone/drone/version"
"github.com/drone/drone/yaml"
"github.com/drone/drone/yaml/expander"
"github.com/drone/drone/yaml/transform"
"github.com/drone/envsubst"
)
type Logger interface {
@@ -93,7 +93,14 @@ func (a *Agent) Run(payload *model.Work, cancel <-chan bool) error {
func (a *Agent) prep(w *model.Work) (*yaml.Config, error) {
envs := toEnv(w)
w.Yaml = expander.ExpandString(w.Yaml, envs)
var err error
w.Yaml, err = envsubst.Eval(w.Yaml, func(s string) string {
return envs[s]
})
if err != nil {
return nil, err
}
// append secrets when verified or when a secret does not require
// verification