darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update secret interpolation

Browse source
This commit is contained in:
Brad Rydzewski 2017-01-18 23:43:40 +07:00
parent cbeac5e671
commit f51a9aed84
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
agent/agent.go
View file

@ -97,7 +97,7 @@ func (a *Agent) prep(w *model.Work) (*yaml.Config, error) {
envSecrets := map[string]string{} envSecrets := map[string]string{}
if os.Getenv("DRONE_INTERPOLATE_SECRETS") != "" { if os.Getenv("DRONE_INTERPOLATE_SECRETS") != "" {
for _, secret := range w.Secrets { for _, secret := range w.Secrets {
if w.Verified || secret.SkipVerify { if (w.Verified || secret.SkipVerify) && secret.MatchEvent(w.Build.Event) {
envSecrets[secret.Name] = secret.Value envSecrets[secret.Name] = secret.Value
} }
} }
@ -109,9 +109,6 @@ func (a *Agent) prep(w *model.Work) (*yaml.Config, error) {
if !ok { if !ok {
env, ok = envs[s] env, ok = envs[s]
} }
if !ok {
return ""
}
if strings.Contains(env, "\n") { if strings.Contains(env, "\n") {
env = fmt.Sprintf("%q", env) env = fmt.Sprintf("%q", env)
} }