grim/convey

Fix an issue where an expired timeout would cause the network and workspace to not be cleaned up. Fixed #137

2018-01-14, Gary Kramlich
2d01f20e84e7
Fix an issue where an expired timeout would cause the network and workspace to not be cleaned up. Fixed #137
// Convey
// Copyright 2016-2018 Gary Kramlich <grim@reaperworld.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package docker
import (
"github.com/aphistic/gomol"
"bitbucket.org/rw_grim/convey/environment"
"bitbucket.org/rw_grim/convey/state"
"bitbucket.org/rw_grim/convey/tasks"
)
// Login represents an login task for logging into a docker registry.
type Login struct {
Username string `yaml:"username"`
Password string `yaml:"password"`
Server string `yaml:"server"`
}
const loginTemplate = `login -u {{.username}} -p {{.password}}{{if .server}} {{.server}}{{end}}`
// Execute runs the login task.
func (l *Login) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
fullEnv := environment.Merge(env, st.GetEnv())
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": username,
"password": password,
"server": server,
}
return Docker(name, loginTemplate, params, st)
}
// New creates a new login task.
func (l *Login) New() tasks.Task {
return &Login{}
}
// Valid validate the login task.
func (l *Login) Valid() error {
if l.Server == "" {
return errNoServer
}
if l.Username == "" {
return errNoUsername
}
return nil
}