docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #2431 from dgageot/code-quality

Browse Source 
Code quality
This commit is contained in:
Jean-Laurent de Morlhon
2015-11-27 09:50:33 +01:00
parent 03abd8575a 515bdad0f6
commit 0a1a67345f
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
commands/create.go
View File

@@ -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)
@@ -145,7 +143,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 +151,8 @@ 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)
driverName := c.String("driver")
driver, err := api.NewPluginDriver(driverName, rawDriver)
if err != nil {
return fmt.Errorf("Error loading driver %q: %s", driverName, err)
}
@@ -272,23 +271,23 @@ 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 // ?
}
// 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)
}

2
drivers/virtualbox/virtualbox.go
View File

@@ -398,8 +398,6 @@ func (d *Driver) Create() error {
}
}
log.Infof("Starting VirtualBox VM...")
return d.Start()
}

4
libmachine/drivers/rpc/client_driver.go
View File

@@ -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
}

6
libmachine/persist/plugin_store.go
View File

@@ -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 {