Commit 6aef1143 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

go fmt

parent ccbb109d
...@@ -316,7 +316,7 @@ func (d *ESX5Driver) checkGuestIPHackEnabled() error { ...@@ -316,7 +316,7 @@ func (d *ESX5Driver) checkGuestIPHackEnabled() error {
if record["IntValue"] != "1" { if record["IntValue"] != "1" {
return errors.New( return errors.New(
"GuestIPHack is required, enable by running this on the ESX machine:\n" + "GuestIPHack is required, enable by running this on the ESX machine:\n" +
"esxcli system settings advanced set -o /Net/GuestIPHack -i 1") "esxcli system settings advanced set -o /Net/GuestIPHack -i 1")
} }
return nil return nil
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
// over an RPC connection. // over an RPC connection.
type build struct { type build struct {
client *rpc.Client client *rpc.Client
mux *MuxConn mux *MuxConn
} }
// BuildServer wraps a packer.Build implementation and makes it exportable // BuildServer wraps a packer.Build implementation and makes it exportable
......
...@@ -10,14 +10,14 @@ import ( ...@@ -10,14 +10,14 @@ import (
// over an RPC connection. // over an RPC connection.
type builder struct { type builder struct {
client *rpc.Client client *rpc.Client
mux *MuxConn mux *MuxConn
} }
// BuilderServer wraps a packer.Builder implementation and makes it exportable // BuilderServer wraps a packer.Builder implementation and makes it exportable
// as part of a Golang RPC server. // as part of a Golang RPC server.
type BuilderServer struct { type BuilderServer struct {
builder packer.Builder builder packer.Builder
mux *MuxConn mux *MuxConn
} }
type BuilderPrepareArgs struct { type BuilderPrepareArgs struct {
......
...@@ -9,19 +9,19 @@ import ( ...@@ -9,19 +9,19 @@ import (
// command is actually executed over an RPC connection. // command is actually executed over an RPC connection.
type command struct { type command struct {
client *rpc.Client client *rpc.Client
mux *MuxConn mux *MuxConn
} }
// A CommandServer wraps a packer.Command and makes it exportable as part // A CommandServer wraps a packer.Command and makes it exportable as part
// of a Golang RPC server. // of a Golang RPC server.
type CommandServer struct { type CommandServer struct {
command packer.Command command packer.Command
mux *MuxConn mux *MuxConn
} }
type CommandRunArgs struct { type CommandRunArgs struct {
Args []string Args []string
StreamId uint32 StreamId uint32
} }
type CommandSynopsisArgs byte type CommandSynopsisArgs byte
...@@ -42,7 +42,7 @@ func (c *command) Run(env packer.Environment, args []string) (result int) { ...@@ -42,7 +42,7 @@ func (c *command) Run(env packer.Environment, args []string) (result int) {
go server.Serve() go server.Serve()
rpcArgs := &CommandRunArgs{ rpcArgs := &CommandRunArgs{
Args: args, Args: args,
StreamId: nextId, StreamId: nextId,
} }
err := c.client.Call("Command.Run", rpcArgs, &result) err := c.client.Call("Command.Run", rpcArgs, &result)
......
...@@ -147,7 +147,7 @@ func (c *communicator) Download(path string, w io.Writer) (err error) { ...@@ -147,7 +147,7 @@ func (c *communicator) Download(path string, w io.Writer) (err error) {
return return
} }
func (c *CommunicatorServer) Start(args *CommunicatorStartArgs, reply *interface{}) (error) { func (c *CommunicatorServer) Start(args *CommunicatorStartArgs, reply *interface{}) error {
// Build the RemoteCmd on this side so that it all pipes over // Build the RemoteCmd on this side so that it all pipes over
// to the remote side. // to the remote side.
var cmd packer.RemoteCmd var cmd packer.RemoteCmd
...@@ -197,7 +197,6 @@ func (c *CommunicatorServer) Start(args *CommunicatorStartArgs, reply *interface ...@@ -197,7 +197,6 @@ func (c *CommunicatorServer) Start(args *CommunicatorStartArgs, reply *interface
cmd.Stderr = conn cmd.Stderr = conn
} }
// Connect to the response address so we can write our result to it // Connect to the response address so we can write our result to it
// when ready. // when ready.
responseC, err := c.mux.Dial(args.ResponseStreamId) responseC, err := c.mux.Dial(args.ResponseStreamId)
......
...@@ -13,7 +13,7 @@ var endpointId uint64 ...@@ -13,7 +13,7 @@ var endpointId uint64
const ( const (
DefaultArtifactEndpoint string = "Artifact" DefaultArtifactEndpoint string = "Artifact"
DefaultBuildEndpoint = "Build" DefaultBuildEndpoint = "Build"
DefaultBuilderEndpoint = "Builder" DefaultBuilderEndpoint = "Builder"
DefaultCacheEndpoint = "Cache" DefaultCacheEndpoint = "Cache"
DefaultCommandEndpoint = "Command" DefaultCommandEndpoint = "Command"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment