From 518e3b8bdef302b5d20b01c60482defe6e0492a1 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Thu, 26 Nov 2015 14:07:29 +0100 Subject: [PATCH 1/3] Rename to rawDriver Signed-off-by: David Gageot --- commands/create.go | 8 ++++---- libmachine/drivers/rpc/client_driver.go | 4 ++-- libmachine/persist/plugin_store.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/commands/create.go b/commands/create.go index ab397cc443..f8f3faa25c 100644 --- a/commands/create.go +++ b/commands/create.go @@ -145,7 +145,7 @@ func cmdCreateInner(c CommandLine, api libmachine.API) error { } // TODO: Fix hacky JSON solution - bareDriverData, err := json.Marshal(&drivers.BaseDriver{ + rawDriver, err := json.Marshal(&drivers.BaseDriver{ MachineName: name, StorePath: c.GlobalString("storage-path"), }) @@ -153,7 +153,7 @@ func cmdCreateInner(c CommandLine, api libmachine.API) error { return fmt.Errorf("Error attempting to marshal bare driver data: %s", err) } - driver, err := api.NewPluginDriver(driverName, bareDriverData) + driver, err := api.NewPluginDriver(driverName, rawDriver) if err != nil { return fmt.Errorf("Error loading driver %q: %s", driverName, err) } @@ -281,14 +281,14 @@ func cmdCreateOuter(c CommandLine, api libmachine.API) error { } // TODO: Fix hacky JSON solution - bareDriverData, err := json.Marshal(&drivers.BaseDriver{ + rawDriver, err := json.Marshal(&drivers.BaseDriver{ MachineName: flagLookupMachineName, }) if err != nil { return fmt.Errorf("Error attempting to marshal bare driver data: %s", err) } - driver, err := api.NewPluginDriver(driverName, bareDriverData) + driver, err := api.NewPluginDriver(driverName, rawDriver) if err != nil { return fmt.Errorf("Error loading driver %q: %s", driverName, err) } diff --git a/libmachine/drivers/rpc/client_driver.go b/libmachine/drivers/rpc/client_driver.go index 25f90b135b..c423ac1d84 100644 --- a/libmachine/drivers/rpc/client_driver.go +++ b/libmachine/drivers/rpc/client_driver.go @@ -79,7 +79,7 @@ func NewInternalClient(rpcclient *rpc.Client) *InternalClient { } } -func NewRPCClientDriver(rawDriverData []byte, driverName string) (*RPCClientDriver, error) { +func NewRPCClientDriver(driverName string, rawDriver []byte) (*RPCClientDriver, error) { mcnName := "" p, err := localbinary.NewPlugin(driverName) @@ -136,7 +136,7 @@ func NewRPCClientDriver(rawDriverData []byte, driverName string) (*RPCClientDriv } log.Debug("Using API Version ", serverVersion) - if err := c.SetConfigRaw(rawDriverData); err != nil { + if err := c.SetConfigRaw(rawDriver); err != nil { return nil, err } diff --git a/libmachine/persist/plugin_store.go b/libmachine/persist/plugin_store.go index 1cb8af63c3..4a94f253c8 100644 --- a/libmachine/persist/plugin_store.go +++ b/libmachine/persist/plugin_store.go @@ -9,7 +9,7 @@ import ( ) type PluginDriverFactory interface { - NewPluginDriver(string, []byte) (drivers.Driver, error) + NewPluginDriver(driverName string, rawDriver []byte) (drivers.Driver, error) } type RPCPluginDriverFactory struct{} @@ -19,8 +19,8 @@ type PluginStore struct { PluginDriverFactory } -func (factory RPCPluginDriverFactory) NewPluginDriver(driverName string, rawContent []byte) (drivers.Driver, error) { - d, err := rpcdriver.NewRPCClientDriver(rawContent, driverName) +func (factory RPCPluginDriverFactory) NewPluginDriver(driverName string, rawDriver []byte) (drivers.Driver, error) { + d, err := rpcdriver.NewRPCClientDriver(driverName, rawDriver) if err != nil { // Not being able to find a driver binary is a "known error" if _, ok := err.(localbinary.ErrPluginBinaryNotFound); ok { From cfe3972d1811e73a2ef209afe0971c5e4b1b6ce0 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Thu, 26 Nov 2015 14:10:47 +0100 Subject: [PATCH 2/3] Minor Signed-off-by: David Gageot --- commands/create.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/commands/create.go b/commands/create.go index f8f3faa25c..a9eb1badd9 100644 --- a/commands/create.go +++ b/commands/create.go @@ -133,8 +133,6 @@ func cmdCreateInner(c CommandLine, api libmachine.API) error { return errNoMachineName } - driverName := c.String("driver") - validName := host.ValidateHostName(name) if !validName { return fmt.Errorf("Error creating machine: %s", mcnerror.ErrInvalidHostname) @@ -153,6 +151,7 @@ func cmdCreateInner(c CommandLine, api libmachine.API) error { return fmt.Errorf("Error attempting to marshal bare driver data: %s", err) } + driverName := c.String("driver") driver, err := api.NewPluginDriver(driverName, rawDriver) if err != nil { return fmt.Errorf("Error loading driver %q: %s", driverName, err) @@ -272,9 +271,9 @@ func cmdCreateOuter(c CommandLine, api libmachine.API) error { const ( flagLookupMachineName = "flag-lookup" ) - driverName := flagHackLookup("--driver") // We didn't recognize the driver name. + driverName := flagHackLookup("--driver") if driverName == "" { c.ShowHelp() return nil // ? From 515bdad0f6eab45d82247700214239d7aaf10189 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Fri, 27 Nov 2015 08:40:14 +0100 Subject: [PATCH 3/3] Remove redundant log Signed-off-by: David Gageot --- drivers/virtualbox/virtualbox.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go index 6ddcfb7b0d..a2e8777c5c 100644 --- a/drivers/virtualbox/virtualbox.go +++ b/drivers/virtualbox/virtualbox.go @@ -398,8 +398,6 @@ func (d *Driver) Create() error { } } - log.Infof("Starting VirtualBox VM...") - return d.Start() }