grim/convey

Update docker login/logout for the multiple values that environment.Mapper returns now

2017-09-25, Gary Kramlich
49b41128f034
Parents 4fd7caa7c563
Children d491f3afc9c4
Update docker login/logout for the multiple values that environment.Mapper returns now
2 files changed, 24 insertions(+), 4 deletions(-)
  • +18 -3
    docker/login.go
  • +6 -1
    docker/logout.go
    • --- a/docker/login.go Mon Sep 25 20:54:30 2017 -0500
    +++ b/docker/login.go Mon Sep 25 21:01:59 2017 -0500
    @@ -36,10 +36,25 @@
    func (l *Login) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    + username, err := environment.Mapper(l.Username, fullEnv)
    + if err != nil {
    + return err
    + }
    +
    + password, err := environment.Mapper(l.Password, fullEnv)
    + if err != nil {
    + return err
    + }
    +
    + server, err := environment.Mapper(l.Server, fullEnv)
    + if err != nil {
    + return err
    + }
    +
    params := map[string]interface{}{
    - "username": environment.Mapper(l.Username, fullEnv),
    - "password": environment.Mapper(l.Password, fullEnv),
    - "server": environment.Mapper(l.Server, fullEnv),
    + "username": username,
    + "password": password,
    + "server": server,
    }
    return Docker(name, loginTemplate, params, st)
    --- a/docker/logout.go Mon Sep 25 20:54:30 2017 -0500
    +++ b/docker/logout.go Mon Sep 25 21:01:59 2017 -0500
    @@ -34,8 +34,13 @@
    func (l *Logout) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    + server, err := environment.Mapper(l.Server, fullEnv)
    + if err != nil {
    + return err
    + }
    +
    params := map[string]interface{}{
    - "server": environment.Mapper(l.Server, fullEnv),
    + "server": server,
    }
    return Docker(name, logoutTemplate, params, st)