diff --git a/commands/active.go b/commands/active.go index e2d41be147..94af14e588 100644 --- a/commands/active.go +++ b/commands/active.go @@ -22,12 +22,12 @@ func cmdActive(c *cli.Context) { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } - host, err := mcn.GetActive() + host, err := provider.GetActive() if err != nil { log.Fatalf("Error getting active host: %s", err) } diff --git a/commands/commands.go b/commands/commands.go index bcfc9aeb15..9f85f051d5 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -88,7 +88,7 @@ func confirmInput(msg string) bool { return false } -func newMcn(store libmachine.Store) (*libmachine.Machine, error) { +func newProvider(store libmachine.Store) (*libmachine.Provider, error) { return libmachine.New(store) } @@ -508,12 +508,12 @@ func loadMachine(name string, c *cli.Context) (*libmachine.Host, error) { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } - host, err := mcn.Get(name) + host, err := provider.Get(name) if err != nil { return nil, err } @@ -533,19 +533,19 @@ func getHost(c *cli.Context) *libmachine.Host { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } - host, err := mcn.Get(name) + host, err := provider.Get(name) if err != nil { log.Fatalf("unable to load host: %v", err) } return host } -func getDefaultMcn(c *cli.Context) *libmachine.Machine { +func getDefaultProvider(c *cli.Context) *libmachine.Provider { certInfo := getCertPathInfo(c) defaultStore, err := getDefaultStore( c.GlobalString("storage-path"), @@ -556,12 +556,12 @@ func getDefaultMcn(c *cli.Context) *libmachine.Machine { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } - return mcn + return provider } func getMachineConfig(c *cli.Context) (*machineConfig, error) { @@ -576,12 +576,12 @@ func getMachineConfig(c *cli.Context) (*machineConfig, error) { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } - m, err := mcn.Get(name) + m, err := provider.Get(name) if err != nil { return nil, err } diff --git a/commands/config_test.go b/commands/config_test.go index 90dca426a9..b24b5269ad 100644 --- a/commands/config_test.go +++ b/commands/config_test.go @@ -34,7 +34,7 @@ func TestCmdConfig(t *testing.T) { t.Fatal(err) } - mcn, err := libmachine.New(store) + provider, err := libmachine.New(store) if err != nil { t.Fatal(err) } @@ -51,7 +51,7 @@ func TestCmdConfig(t *testing.T) { AuthOptions: &auth.AuthOptions{}, } - host, err := mcn.Create("test-a", "none", hostOptions, flags) + host, err := provider.Create("test-a", "none", hostOptions, flags) if err != nil { t.Fatal(err) } diff --git a/commands/create.go b/commands/create.go index 63bedfdb4c..0a6890bf0f 100644 --- a/commands/create.go +++ b/commands/create.go @@ -54,7 +54,7 @@ func cmdCreate(c *cli.Context) { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } @@ -89,7 +89,7 @@ func cmdCreate(c *cli.Context) { }, } - _, err = mcn.Create(name, driver, hostOptions, c) + _, err = provider.Create(name, driver, hostOptions, c) if err != nil { log.Errorf("Error creating machine: %s", err) log.Fatal("You will want to check the provider to make sure the machine and associated resources were properly removed.") diff --git a/commands/env_test.go b/commands/env_test.go index dc0b0b5554..0749579ef8 100644 --- a/commands/env_test.go +++ b/commands/env_test.go @@ -43,7 +43,7 @@ func TestCmdEnvBash(t *testing.T) { t.Fatal(sErr) } - mcn, err := libmachine.New(store) + provider, err := libmachine.New(store) if err != nil { t.Fatal(err) } @@ -59,12 +59,12 @@ func TestCmdEnvBash(t *testing.T) { AuthOptions: &auth.AuthOptions{}, } - host, err := mcn.Create("test-a", "none", hostOptions, flags) + host, err := provider.Create("test-a", "none", hostOptions, flags) if err != nil { t.Fatal(err) } - host, err = mcn.Get("test-a") + host, err = provider.Get("test-a") if err != nil { t.Fatalf("error loading host: %v", err) } @@ -142,7 +142,7 @@ func TestCmdEnvFish(t *testing.T) { t.Fatal(err) } - mcn, err := libmachine.New(store) + provider, err := libmachine.New(store) if err != nil { t.Fatal(err) } @@ -158,12 +158,12 @@ func TestCmdEnvFish(t *testing.T) { AuthOptions: &auth.AuthOptions{}, } - host, err := mcn.Create("test-a", "none", hostOptions, flags) + host, err := provider.Create("test-a", "none", hostOptions, flags) if err != nil { t.Fatal(err) } - host, err = mcn.Get("test-a") + host, err = provider.Get("test-a") if err != nil { t.Fatalf("error loading host: %v", err) } @@ -241,7 +241,7 @@ func TestCmdEnvPowerShell(t *testing.T) { t.Fatal(sErr) } - mcn, err := libmachine.New(store) + provider, err := libmachine.New(store) if err != nil { t.Fatal(err) } @@ -257,12 +257,12 @@ func TestCmdEnvPowerShell(t *testing.T) { AuthOptions: &auth.AuthOptions{}, } - host, err := mcn.Create("test-a", "none", hostOptions, flags) + host, err := provider.Create("test-a", "none", hostOptions, flags) if err != nil { t.Fatal(err) } - host, err = mcn.Get("test-a") + host, err = provider.Get("test-a") if err != nil { t.Fatalf("error loading host: %v", err) } diff --git a/commands/inspect_test.go b/commands/inspect_test.go index ac9db3746a..779095d5ca 100644 --- a/commands/inspect_test.go +++ b/commands/inspect_test.go @@ -73,7 +73,7 @@ func runInspectCommand(t *testing.T, args []string) (string, *libmachine.Host) { t.Fatal(sErr) } - mcn, err := libmachine.New(store) + provider, err := libmachine.New(store) if err != nil { t.Fatal(err) } @@ -90,7 +90,7 @@ func runInspectCommand(t *testing.T, args []string) (string, *libmachine.Host) { } flags := getTestDriverFlags() - _, err = mcn.Create("test-a", "none", hostOptions, flags) + _, err = provider.Create("test-a", "none", hostOptions, flags) if err != nil { t.Fatal(err) } diff --git a/commands/ls.go b/commands/ls.go index 8dec449ab5..18d4a606a3 100644 --- a/commands/ls.go +++ b/commands/ls.go @@ -25,8 +25,8 @@ func cmdLs(c *cli.Context) { log.Fatal(err) } - mcn := getDefaultMcn(c) - hostList, err := mcn.List() + provider := getDefaultProvider(c) + hostList, err := provider.List() if err != nil { log.Fatal(err) } diff --git a/commands/rm.go b/commands/rm.go index b8ce7ea9ee..5af17f5cb2 100644 --- a/commands/rm.go +++ b/commands/rm.go @@ -25,13 +25,13 @@ func cmdRm(c *cli.Context) { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } for _, host := range c.Args() { - if err := mcn.Remove(host, force); err != nil { + if err := provider.Remove(host, force); err != nil { log.Errorf("Error removing machine %s: %s", host, err) isError = true } else { diff --git a/commands/scp.go b/commands/scp.go index 6e4160ce70..09dea5ebc3 100644 --- a/commands/scp.go +++ b/commands/scp.go @@ -26,7 +26,7 @@ var ( } ) -func getInfoForScpArg(hostAndPath string, mcn libmachine.Machine) (*libmachine.Host, string, []string, error) { +func getInfoForScpArg(hostAndPath string, provider libmachine.Provider) (*libmachine.Host, string, []string, error) { // TODO: What to do about colon in filepath? splitInfo := strings.Split(hostAndPath, ":") @@ -38,7 +38,7 @@ func getInfoForScpArg(hostAndPath string, mcn libmachine.Machine) (*libmachine.H // Remote path. e.g. "machinename:/usr/bin/cmatrix" if len(splitInfo) == 2 { path := splitInfo[1] - host, err := mcn.Get(splitInfo[0]) + host, err := provider.Get(splitInfo[0]) if err != nil { return nil, "", nil, fmt.Errorf("Error loading host: %s", err) } @@ -64,18 +64,18 @@ func generateLocationArg(host *libmachine.Host, path string) (string, error) { return locationPrefix + path, nil } -func getScpCmd(src, dest string, sshArgs []string, mcn libmachine.Machine) (*exec.Cmd, error) { +func getScpCmd(src, dest string, sshArgs []string, provider libmachine.Provider) (*exec.Cmd, error) { cmdPath, err := exec.LookPath("scp") if err != nil { return nil, errors.New("Error: You must have a copy of the scp binary locally to use the scp feature.") } - srcHost, srcPath, srcOpts, err := getInfoForScpArg(src, mcn) + srcHost, srcPath, srcOpts, err := getInfoForScpArg(src, provider) if err != nil { return nil, err } - destHost, destPath, destOpts, err := getInfoForScpArg(dest, mcn) + destHost, destPath, destOpts, err := getInfoForScpArg(dest, provider) if err != nil { return nil, err } @@ -129,8 +129,8 @@ func cmdScp(c *cli.Context) { src := args[0] dest := args[1] - mcn := getDefaultMcn(c) - cmd, err := getScpCmd(src, dest, sshArgs, *mcn) + provider := getDefaultProvider(c) + cmd, err := getScpCmd(src, dest, sshArgs, *provider) if err != nil { log.Fatal(err) diff --git a/commands/scp_test.go b/commands/scp_test.go index 76ac8a8f0c..7e08daad77 100644 --- a/commands/scp_test.go +++ b/commands/scp_test.go @@ -157,10 +157,10 @@ func (s ScpFakeStore) Save(host *libmachine.Host) error { } func TestGetInfoForScpArg(t *testing.T) { - mcn, _ := libmachine.New(ScpFakeStore{}) + provider, _ := libmachine.New(ScpFakeStore{}) expectedPath := "/tmp/foo" - host, path, opts, err := getInfoForScpArg("/tmp/foo", *mcn) + host, path, opts, err := getInfoForScpArg("/tmp/foo", *provider) if err != nil { t.Fatalf("Unexpected error in local getInfoForScpArg call: %s", err) } @@ -174,7 +174,7 @@ func TestGetInfoForScpArg(t *testing.T) { t.Fatal("opts should be nil") } - host, path, opts, err = getInfoForScpArg("myfunhost:/home/docker/foo", *mcn) + host, path, opts, err = getInfoForScpArg("myfunhost:/home/docker/foo", *provider) if err != nil { t.Fatal("Unexpected error in machine-based getInfoForScpArg call: %s", err) } @@ -194,7 +194,7 @@ func TestGetInfoForScpArg(t *testing.T) { t.Fatalf("Expected path to be /home/docker/foo, got %s", path) } - host, path, opts, err = getInfoForScpArg("foo:bar:widget", *mcn) + host, path, opts, err = getInfoForScpArg("foo:bar:widget", *provider) if err != ErrMalformedInput { t.Fatalf("Didn't get back an error when we were expecting it for malformed args") } @@ -224,7 +224,7 @@ func TestGenerateLocationArg(t *testing.T) { } func TestGetScpCmd(t *testing.T) { - mcn, _ := libmachine.New(ScpFakeStore{}) + provider, _ := libmachine.New(ScpFakeStore{}) // TODO: This is a little "integration-ey". Perhaps // make an ScpDispatcher (name?) interface so that the reliant @@ -239,7 +239,7 @@ func TestGetScpCmd(t *testing.T) { ) expectedCmd := exec.Command("/usr/bin/scp", expectedArgs...) - cmd, err := getScpCmd("/tmp/foo", "myfunhost:/home/docker/foo", append(baseSSHArgs, "-3"), *mcn) + cmd, err := getScpCmd("/tmp/foo", "myfunhost:/home/docker/foo", append(baseSSHArgs, "-3"), *provider) if err != nil { t.Fatalf("Unexpected err getting scp command: %s", err) } diff --git a/commands/ssh.go b/commands/ssh.go index 56cafd7557..00f45a6a4e 100644 --- a/commands/ssh.go +++ b/commands/ssh.go @@ -29,12 +29,12 @@ func cmdSsh(c *cli.Context) { log.Fatal(err) } - mcn, err := newMcn(defaultStore) + provider, err := newProvider(defaultStore) if err != nil { log.Fatal(err) } - host, err := mcn.Get(name) + host, err := provider.Get(name) if err != nil { log.Fatal(err) } diff --git a/libmachine/machine.go b/libmachine/provider.go similarity index 58% rename from libmachine/machine.go rename to libmachine/provider.go index a6642a9fb9..df0199600f 100644 --- a/libmachine/machine.go +++ b/libmachine/provider.go @@ -9,22 +9,22 @@ import ( "github.com/docker/machine/utils" ) -type Machine struct { +type Provider struct { store Store } -func New(store Store) (*Machine, error) { - return &Machine{ +func New(store Store) (*Provider, error) { + return &Provider{ store: store, }, nil } -func (m *Machine) Create(name string, driverName string, hostOptions *HostOptions, driverConfig drivers.DriverOptions) (*Host, error) { +func (provider *Provider) Create(name string, driverName string, hostOptions *HostOptions, driverConfig drivers.DriverOptions) (*Host, error) { validName := ValidateHostName(name) if !validName { return nil, ErrInvalidHostname } - exists, err := m.store.Exists(name) + exists, err := provider.store.Exists(name) if err != nil { return nil, err } @@ -63,24 +63,24 @@ func (m *Machine) Create(name string, driverName string, hostOptions *HostOption return host, nil } -func (m *Machine) Exists(name string) (bool, error) { - return m.store.Exists(name) +func (provider *Provider) Exists(name string) (bool, error) { + return provider.store.Exists(name) } -func (m *Machine) GetActive() (*Host, error) { - return m.store.GetActive() +func (provider *Provider) GetActive() (*Host, error) { + return provider.store.GetActive() } -func (m *Machine) List() ([]*Host, error) { - return m.store.List() +func (provider *Provider) List() ([]*Host, error) { + return provider.store.List() } -func (m *Machine) Get(name string) (*Host, error) { - return m.store.Get(name) +func (provider *Provider) Get(name string) (*Host, error) { + return provider.store.Get(name) } -func (m *Machine) Remove(name string, force bool) error { - host, err := m.store.Get(name) +func (provider *Provider) Remove(name string, force bool) error { + host, err := provider.store.Get(name) if err != nil { return err } @@ -89,5 +89,5 @@ func (m *Machine) Remove(name string, force bool) error { return err } } - return m.store.Remove(name, force) + return provider.store.Remove(name, force) } diff --git a/libmachine/machine_test.go b/libmachine/provider_test.go similarity index 100% rename from libmachine/machine_test.go rename to libmachine/provider_test.go