- Clear out some cruft tightly coupling libmachine to filestore - Comment out drivers other than virtualbox for now - Change way too many things - Mostly, break out the code to be more modular. - Destroy all traces of "provider" in its current form. It will be brought back as something more sensible, instead of something which overlaps in function with both Host and Store. - Fix mis-managed config passthru - Remove a few instances of state stored in env vars - This should be explicitly communicated in Go-land, not through the shell. - Rename "store" module to "persist" - This is done mostly to avoid confusion about the fact that a concrete instance of a "Store" interface is oftentimes referred to as "store" in the code. - Rip out repetitive antipattern for getting store - This replaces the previous repetive idiom for getting the cert info, and consequently the store, with a much less repetitive idiom. - Also, some redundant methods in commands.go for accessing hosts have either been simplified or removed entirely. - First steps towards fixing up tests - Test progress continues - Replace unit tests with integration tests - MAKE ALL UNIT TESTS PASS YAY - Add helper test files - Don't write to disk in libmachine/host - Heh.. coverage check strikes again - Fix remove code - Move cert code around - Continued progress: simplify Driver - Fixups and make creation work with new model - Move drivers module inside of libmachine - Move ssh module inside of libmachine - Move state module to libmachine - Move utils module to libmachine - Move version module to libmachine - Move log module to libmachine - Modify some constructor methods around - Change Travis build dep structure - Boring gofmt fix - Add version module - Move NewHost to store - Update some boring cert path infos to make API easier to use - Fix up some issues around the new model - Clean up some cert path stuff - Don't use shady functions to get store path :D - Continue artifact work - Fix silly machines dir bug - Continue fixing silly path issues - Change up output of vbm a bit - Continue work to make example go - Change output a little more - Last changes needed to make create finish properly - Fix config.go to use libmachine - Cut down code duplication and make both methods work with libmachine - Add pluggable logging implementation - Return error when machine already in desired state - Update example to show log method - Fix file:// bug - Fix Swarm defaults - Remove unused TLS settings from Engine and Swarm options - Remove spurious error - Correct bug detecting if migration was performed - Fix compilation errors from tests - Fix most of remaining test issues - Fix final silly bug in tests - Remove extraneous debug code - Add -race to test command - Appease the gofmt - Appease the generate coverage - Making executive decision to remove Travis coverage check In the early days I thought this would be a good idea because it would encourage people to write tests in case they added a new module. Well, in fact it has just turned into a giant nuisance and made refactoring work like this even more difficult. - Move Get to Load - Move HostListItem code to CLI Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
182 lines
4.2 KiB
Go
182 lines
4.2 KiB
Go
package host
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/docker/machine/libmachine/auth"
|
|
"github.com/docker/machine/libmachine/drivers"
|
|
"github.com/docker/machine/libmachine/engine"
|
|
"github.com/docker/machine/libmachine/log"
|
|
"github.com/docker/machine/libmachine/mcnutils"
|
|
"github.com/docker/machine/libmachine/provision"
|
|
"github.com/docker/machine/libmachine/provision/pkgaction"
|
|
"github.com/docker/machine/libmachine/provision/serviceaction"
|
|
"github.com/docker/machine/libmachine/ssh"
|
|
"github.com/docker/machine/libmachine/state"
|
|
"github.com/docker/machine/libmachine/swarm"
|
|
)
|
|
|
|
var (
|
|
validHostNameChars = `^[a-zA-Z0-9][a-zA-Z0-9\-\.]*$`
|
|
validHostNamePattern = regexp.MustCompile(validHostNameChars)
|
|
errMachineMustBeRunningForUpgrade = errors.New("Error: machine must be running to upgrade.")
|
|
)
|
|
|
|
type Host struct {
|
|
ConfigVersion int
|
|
Driver drivers.Driver
|
|
DriverName string
|
|
HostOptions *HostOptions
|
|
Name string
|
|
}
|
|
|
|
type HostOptions struct {
|
|
Driver string
|
|
Memory int
|
|
Disk int
|
|
EngineOptions *engine.EngineOptions
|
|
SwarmOptions *swarm.SwarmOptions
|
|
AuthOptions *auth.AuthOptions
|
|
}
|
|
|
|
type HostMetadata struct {
|
|
ConfigVersion int
|
|
DriverName string
|
|
HostOptions HostOptions
|
|
}
|
|
|
|
func ValidateHostName(name string) bool {
|
|
return validHostNamePattern.MatchString(name)
|
|
}
|
|
|
|
func (h *Host) RunSSHCommand(command string) (string, error) {
|
|
return drivers.RunSSHCommandFromDriver(h.Driver, command)
|
|
}
|
|
|
|
func (h *Host) CreateSSHClient() (ssh.Client, error) {
|
|
addr, err := h.Driver.GetSSHHostname()
|
|
if err != nil {
|
|
return ssh.ExternalClient{}, err
|
|
}
|
|
|
|
port, err := h.Driver.GetSSHPort()
|
|
if err != nil {
|
|
return ssh.ExternalClient{}, err
|
|
}
|
|
|
|
auth := &ssh.Auth{
|
|
Keys: []string{h.Driver.GetSSHKeyPath()},
|
|
}
|
|
|
|
return ssh.NewClient(h.Driver.GetSSHUsername(), addr, port, auth)
|
|
}
|
|
|
|
func (h *Host) CreateSSHShell() error {
|
|
client, err := h.CreateSSHClient()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return client.Shell()
|
|
}
|
|
|
|
func (h *Host) runActionForState(action func() error, desiredState state.State) error {
|
|
if drivers.MachineInState(h.Driver, desiredState)() {
|
|
return fmt.Errorf("Machine %q is already %s.", h.Name, strings.ToLower(desiredState.String()))
|
|
}
|
|
|
|
if err := action(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return mcnutils.WaitFor(drivers.MachineInState(h.Driver, desiredState))
|
|
}
|
|
|
|
func (h *Host) Start() error {
|
|
return h.runActionForState(h.Driver.Start, state.Running)
|
|
}
|
|
|
|
func (h *Host) Stop() error {
|
|
return h.runActionForState(h.Driver.Stop, state.Stopped)
|
|
}
|
|
|
|
func (h *Host) Kill() error {
|
|
return h.runActionForState(h.Driver.Kill, state.Stopped)
|
|
}
|
|
|
|
func (h *Host) Restart() error {
|
|
if drivers.MachineInState(h.Driver, state.Running)() {
|
|
if err := h.Stop(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := mcnutils.WaitFor(drivers.MachineInState(h.Driver, state.Stopped)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if err := h.Start(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := mcnutils.WaitFor(drivers.MachineInState(h.Driver, state.Running)); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (h *Host) Upgrade() error {
|
|
machineState, err := h.Driver.GetState()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if machineState != state.Running {
|
|
log.Fatal(errMachineMustBeRunningForUpgrade)
|
|
}
|
|
|
|
provisioner, err := provision.DetectProvisioner(h.Driver)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := provisioner.Package("docker", pkgaction.Upgrade); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := provisioner.Service("docker", serviceaction.Restart); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (h *Host) GetURL() (string, error) {
|
|
return h.Driver.GetURL()
|
|
}
|
|
|
|
func (h *Host) ConfigureAuth() error {
|
|
provisioner, err := provision.DetectProvisioner(h.Driver)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// TODO: This is kind of a hack (or is it? I'm not really sure until
|
|
// we have more clearly defined outlook on what the responsibilities
|
|
// and modularity of the provisioners should be).
|
|
//
|
|
// Call provision to re-provision the certs properly.
|
|
if err := provisioner.Provision(swarm.SwarmOptions{}, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func WaitForSSH(h *Host) error {
|
|
return drivers.WaitForSSH(h.Driver)
|
|
}
|