docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename to rawDriver 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2015-11-26 14:07:29 +01:00
parent 5caed51a00
commit 518e3b8bde
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commands/create.go
View File

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

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 {