grim/convey

Add environment support to login and logout tasks

2017-09-21, Gary Kramlich
df9894c04929
Parents c75b9de2a113
Children 7ad47db70844
Add environment support to login and logout tasks
3 files changed, 11 insertions(+), 5 deletions(-)
  • +1 -1
    ChangeLog
  • +6 -3
    docker/login.go
  • +4 -1
    docker/logout.go
    • --- a/ChangeLog Sun Sep 17 19:18:56 2017 -0500
    +++ b/ChangeLog Thu Sep 21 15:28:02 2017 -0500
    @@ -1,5 +1,5 @@
    0.9.1:
    - * Nothing yet... Be the first!!
    + * Added environment mapping support to the login and logout tasks.
    0.9.0: 20170917
    * Updated the import and export tasks to allow a string for the files field
    --- a/docker/login.go Sun Sep 17 19:18:56 2017 -0500
    +++ b/docker/login.go Thu Sep 21 15:28:02 2017 -0500
    @@ -20,6 +20,7 @@
    import (
    "github.com/aphistic/gomol"
    + "bitbucket.org/rw_grim/convey/environment"
    "bitbucket.org/rw_grim/convey/state"
    "bitbucket.org/rw_grim/convey/tasks"
    )
    @@ -33,10 +34,12 @@
    const loginTemplate = `login -u {{.username}} -p {{.password}}{{if .server}} {{.server}}{{end}}`
    func (l *Login) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    + fullEnv := environment.Merge(env, st.Environment)
    +
    params := map[string]interface{}{
    - "username": l.Username,
    - "password": l.Password,
    - "server": l.Server,
    + "username": environment.Mapper(l.Username, fullEnv),
    + "password": environment.Mapper(l.Password, fullEnv),
    + "server": environment.Mapper(l.Server, fullEnv),
    }
    return Docker(name, loginTemplate, params, st)
    --- a/docker/logout.go Sun Sep 17 19:18:56 2017 -0500
    +++ b/docker/logout.go Thu Sep 21 15:28:02 2017 -0500
    @@ -20,6 +20,7 @@
    import (
    "github.com/aphistic/gomol"
    + "bitbucket.org/rw_grim/convey/environment"
    "bitbucket.org/rw_grim/convey/state"
    "bitbucket.org/rw_grim/convey/tasks"
    )
    @@ -31,8 +32,10 @@
    const logoutTemplate = `logout{{if .server}} {{.server}}{{end}}`
    func (l *Logout) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    + fullEnv := environment.Merge(env, st.Environment)
    +
    params := map[string]interface{}{
    - "server": l.Server,
    + "server": environment.Mapper(l.Server, fullEnv),
    }
    return Docker(name, logoutTemplate, params, st)