go fmt
This commit is contained in:
parent
368ccab8e8
commit
44bd56c3a8
|
@ -17,7 +17,7 @@ func TestBuilder_Prepare_BadType(t *testing.T) {
|
|||
assert := asserts.NewTestingAsserts(t, true)
|
||||
|
||||
b := &Builder{}
|
||||
c := map[string]interface{} {
|
||||
c := map[string]interface{}{
|
||||
"access_key": []string{},
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@ func TestBuilder_Prepare_Good(t *testing.T) {
|
|||
assert := asserts.NewTestingAsserts(t, true)
|
||||
|
||||
b := &Builder{}
|
||||
c := map[string]interface{} {
|
||||
c := map[string]interface{}{
|
||||
"access_key": "foo",
|
||||
"secret_key": "bar",
|
||||
"source_ami": "123456",
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package build
|
||||
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"cgl.tideland.biz/asserts"
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/mitchellh/packer/packer"
|
||||
"github.com/mitchellh/packer/packer/plugin"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"os"
|
||||
|
|
|
@ -13,4 +13,3 @@ type Builder interface {
|
|||
Prepare(config interface{}) error
|
||||
Run(build Build, ui Ui)
|
||||
}
|
||||
|
||||
|
|
|
@ -2,10 +2,10 @@ package plugin
|
|||
|
||||
import (
|
||||
"github.com/mitchellh/packer/packer"
|
||||
packrpc "github.com/mitchellh/packer/packer/rpc"
|
||||
"log"
|
||||
"net/rpc"
|
||||
"os/exec"
|
||||
packrpc "github.com/mitchellh/packer/packer/rpc"
|
||||
)
|
||||
|
||||
type cmdBuilder struct {
|
||||
|
@ -39,7 +39,6 @@ func (c *cmdBuilder) checkExit(p interface{}, cb func()) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// Returns a valid packer.Builder where the builder is executed via RPC
|
||||
// to a plugin that is within a subprocess.
|
||||
//
|
||||
|
|
|
@ -28,4 +28,3 @@ func TestBuilder_Good(t *testing.T) {
|
|||
_, err := Builder(helperProcess("builder"))
|
||||
assert.Nil(err, "should start builder properly")
|
||||
}
|
||||
|
||||
|
|
|
@ -2,10 +2,10 @@ package plugin
|
|||
|
||||
import (
|
||||
"github.com/mitchellh/packer/packer"
|
||||
packrpc "github.com/mitchellh/packer/packer/rpc"
|
||||
"log"
|
||||
"net/rpc"
|
||||
"os/exec"
|
||||
packrpc "github.com/mitchellh/packer/packer/rpc"
|
||||
)
|
||||
|
||||
type cmdCommand struct {
|
||||
|
|
|
@ -10,11 +10,11 @@ package plugin
|
|||
import (
|
||||
"fmt"
|
||||
"github.com/mitchellh/packer/packer"
|
||||
packrpc "github.com/mitchellh/packer/packer/rpc"
|
||||
"log"
|
||||
"net"
|
||||
"net/rpc"
|
||||
"os"
|
||||
packrpc "github.com/mitchellh/packer/packer/rpc"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
func helperProcess(s... string) *exec.Cmd {
|
||||
func helperProcess(s ...string) *exec.Cmd {
|
||||
cs := []string{"-test.run=TestHelperProcess", "--"}
|
||||
cs = append(cs, s...)
|
||||
env := []string{
|
||||
|
|
|
@ -42,7 +42,7 @@ func (b *Build) Run(ui packer.Ui) {
|
|||
b.client.Call("Build.Run", args, new(interface{}))
|
||||
}
|
||||
|
||||
func (b *BuildServer) Name(args *interface{}, reply*string) error {
|
||||
func (b *BuildServer) Name(args *interface{}, reply *string) error {
|
||||
*reply = b.build.Name()
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
|
||||
func addrPort(address net.Addr) string {
|
||||
parts := strings.Split(address.String(), ":")
|
||||
return parts[len(parts) - 1]
|
||||
return parts[len(parts)-1]
|
||||
}
|
||||
|
||||
func Test_netListenerInRange(t *testing.T) {
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
package rpc
|
||||
|
||||
|
|
|
@ -178,7 +178,7 @@ func TestTemplate_Build(t *testing.T) {
|
|||
}
|
||||
`
|
||||
|
||||
expectedConfig := map[string]interface{} {
|
||||
expectedConfig := map[string]interface{}{
|
||||
"name": "test1",
|
||||
"type": "test-builder",
|
||||
}
|
||||
|
@ -187,7 +187,7 @@ func TestTemplate_Build(t *testing.T) {
|
|||
assert.Nil(err, "should not error")
|
||||
|
||||
builder := testBuilder()
|
||||
builderMap := map[string]Builder {
|
||||
builderMap := map[string]Builder{
|
||||
"test-builder": builder,
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import "io"
|
|||
// is formatted and various levels of output.
|
||||
type Ui interface {
|
||||
Say(format string, a ...interface{})
|
||||
Error(format string, a...interface{})
|
||||
Error(format string, a ...interface{})
|
||||
}
|
||||
|
||||
// The ReaderWriterUi is a UI that writes and reads from standard Go
|
||||
|
|
Loading…
Reference in New Issue