Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
packer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
packer
Commits
44bd56c3
Commit
44bd56c3
authored
May 10, 2013
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
go fmt
parent
368ccab8
Changes
28
Show whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
53 additions
and
58 deletions
+53
-58
builder/amazonebs/builder.go
builder/amazonebs/builder.go
+4
-4
builder/amazonebs/builder_test.go
builder/amazonebs/builder_test.go
+2
-2
command/build/command_test.go
command/build/command_test.go
+0
-1
packer.go
packer.go
+1
-1
packer/build.go
packer/build.go
+2
-2
packer/build_test.go
packer/build_test.go
+5
-5
packer/builder.go
packer/builder.go
+0
-1
packer/command_test.go
packer/command_test.go
+2
-2
packer/environment.go
packer/environment.go
+4
-4
packer/plugin/builder.go
packer/plugin/builder.go
+2
-3
packer/plugin/builder_test.go
packer/plugin/builder_test.go
+0
-1
packer/plugin/client.go
packer/plugin/client.go
+2
-2
packer/plugin/command.go
packer/plugin/command.go
+2
-2
packer/plugin/plugin.go
packer/plugin/plugin.go
+1
-1
packer/plugin/plugin_test.go
packer/plugin/plugin_test.go
+1
-1
packer/rpc/build.go
packer/rpc/build.go
+1
-1
packer/rpc/build_test.go
packer/rpc/build_test.go
+3
-3
packer/rpc/builder_test.go
packer/rpc/builder_test.go
+3
-3
packer/rpc/command.go
packer/rpc/command.go
+1
-1
packer/rpc/command_test.go
packer/rpc/command_test.go
+2
-2
packer/rpc/environment_test.go
packer/rpc/environment_test.go
+4
-4
packer/rpc/port_test.go
packer/rpc/port_test.go
+1
-1
packer/rpc/server_test.go
packer/rpc/server_test.go
+0
-1
packer/rpc/ui.go
packer/rpc/ui.go
+1
-1
packer/rpc/ui_test.go
packer/rpc/ui_test.go
+4
-4
packer/template.go
packer/template.go
+2
-2
packer/template_test.go
packer/template_test.go
+2
-2
packer/ui.go
packer/ui.go
+1
-1
No files found.
builder/amazonebs/builder.go
View file @
44bd56c3
builder/amazonebs/builder_test.go
View file @
44bd56c3
...
@@ -17,7 +17,7 @@ func TestBuilder_Prepare_BadType(t *testing.T) {
...
@@ -17,7 +17,7 @@ func TestBuilder_Prepare_BadType(t *testing.T) {
assert
:=
asserts
.
NewTestingAsserts
(
t
,
true
)
assert
:=
asserts
.
NewTestingAsserts
(
t
,
true
)
b
:=
&
Builder
{}
b
:=
&
Builder
{}
c
:=
map
[
string
]
interface
{}
{
c
:=
map
[
string
]
interface
{}{
"access_key"
:
[]
string
{},
"access_key"
:
[]
string
{},
}
}
...
@@ -29,7 +29,7 @@ func TestBuilder_Prepare_Good(t *testing.T) {
...
@@ -29,7 +29,7 @@ func TestBuilder_Prepare_Good(t *testing.T) {
assert
:=
asserts
.
NewTestingAsserts
(
t
,
true
)
assert
:=
asserts
.
NewTestingAsserts
(
t
,
true
)
b
:=
&
Builder
{}
b
:=
&
Builder
{}
c
:=
map
[
string
]
interface
{}
{
c
:=
map
[
string
]
interface
{}{
"access_key"
:
"foo"
,
"access_key"
:
"foo"
,
"secret_key"
:
"bar"
,
"secret_key"
:
"bar"
,
"source_ami"
:
"123456"
,
"source_ami"
:
"123456"
,
...
...
command/build/command_test.go
View file @
44bd56c3
package
build
package
build
import
(
import
(
"bytes"
"bytes"
"cgl.tideland.biz/asserts"
"cgl.tideland.biz/asserts"
...
...
packer.go
View file @
44bd56c3
...
@@ -2,9 +2,9 @@
...
@@ -2,9 +2,9 @@
package
main
package
main
import
(
import
(
"fmt"
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/packer/plugin"
"github.com/mitchellh/packer/packer/plugin"
"fmt"
"io/ioutil"
"io/ioutil"
"log"
"log"
"os"
"os"
...
...
packer/build.go
View file @
44bd56c3
packer/build_test.go
View file @
44bd56c3
packer/builder.go
View file @
44bd56c3
...
@@ -13,4 +13,3 @@ type Builder interface {
...
@@ -13,4 +13,3 @@ type Builder interface {
Prepare
(
config
interface
{})
error
Prepare
(
config
interface
{})
error
Run
(
build
Build
,
ui
Ui
)
Run
(
build
Build
,
ui
Ui
)
}
}
packer/command_test.go
View file @
44bd56c3
packer/environment.go
View file @
44bd56c3
packer/plugin/builder.go
View file @
44bd56c3
...
@@ -2,10 +2,10 @@ package plugin
...
@@ -2,10 +2,10 @@ package plugin
import
(
import
(
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/packer"
packrpc
"github.com/mitchellh/packer/packer/rpc"
"log"
"log"
"net/rpc"
"net/rpc"
"os/exec"
"os/exec"
packrpc
"github.com/mitchellh/packer/packer/rpc"
)
)
type
cmdBuilder
struct
{
type
cmdBuilder
struct
{
...
@@ -39,7 +39,6 @@ func (c *cmdBuilder) checkExit(p interface{}, cb func()) {
...
@@ -39,7 +39,6 @@ func (c *cmdBuilder) checkExit(p interface{}, cb func()) {
}
}
}
}
// Returns a valid packer.Builder where the builder is executed via RPC
// Returns a valid packer.Builder where the builder is executed via RPC
// to a plugin that is within a subprocess.
// to a plugin that is within a subprocess.
//
//
...
...
packer/plugin/builder_test.go
View file @
44bd56c3
...
@@ -28,4 +28,3 @@ func TestBuilder_Good(t *testing.T) {
...
@@ -28,4 +28,3 @@ func TestBuilder_Good(t *testing.T) {
_
,
err
:=
Builder
(
helperProcess
(
"builder"
))
_
,
err
:=
Builder
(
helperProcess
(
"builder"
))
assert
.
Nil
(
err
,
"should start builder properly"
)
assert
.
Nil
(
err
,
"should start builder properly"
)
}
}
packer/plugin/client.go
View file @
44bd56c3
packer/plugin/command.go
View file @
44bd56c3
...
@@ -2,10 +2,10 @@ package plugin
...
@@ -2,10 +2,10 @@ package plugin
import
(
import
(
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/packer"
packrpc
"github.com/mitchellh/packer/packer/rpc"
"log"
"log"
"net/rpc"
"net/rpc"
"os/exec"
"os/exec"
packrpc
"github.com/mitchellh/packer/packer/rpc"
)
)
type
cmdCommand
struct
{
type
cmdCommand
struct
{
...
...
packer/plugin/plugin.go
View file @
44bd56c3
...
@@ -10,11 +10,11 @@ package plugin
...
@@ -10,11 +10,11 @@ package plugin
import
(
import
(
"fmt"
"fmt"
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/packer"
packrpc
"github.com/mitchellh/packer/packer/rpc"
"log"
"log"
"net"
"net"
"net/rpc"
"net/rpc"
"os"
"os"
packrpc
"github.com/mitchellh/packer/packer/rpc"
"strconv"
"strconv"
"strings"
"strings"
)
)
...
...
packer/plugin/plugin_test.go
View file @
44bd56c3
...
@@ -8,7 +8,7 @@ import (
...
@@ -8,7 +8,7 @@ import (
"time"
"time"
)
)
func
helperProcess
(
s
...
string
)
*
exec
.
Cmd
{
func
helperProcess
(
s
...
string
)
*
exec
.
Cmd
{
cs
:=
[]
string
{
"-test.run=TestHelperProcess"
,
"--"
}
cs
:=
[]
string
{
"-test.run=TestHelperProcess"
,
"--"
}
cs
=
append
(
cs
,
s
...
)
cs
=
append
(
cs
,
s
...
)
env
:=
[]
string
{
env
:=
[]
string
{
...
...
packer/rpc/build.go
View file @
44bd56c3
...
@@ -42,7 +42,7 @@ func (b *Build) Run(ui packer.Ui) {
...
@@ -42,7 +42,7 @@ func (b *Build) Run(ui packer.Ui) {
b
.
client
.
Call
(
"Build.Run"
,
args
,
new
(
interface
{}))
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
()
*
reply
=
b
.
build
.
Name
()
return
nil
return
nil
}
}
...
...
packer/rpc/build_test.go
View file @
44bd56c3
packer/rpc/builder_test.go
View file @
44bd56c3
packer/rpc/command.go
View file @
44bd56c3
packer/rpc/command_test.go
View file @
44bd56c3
packer/rpc/environment_test.go
View file @
44bd56c3
packer/rpc/port_test.go
View file @
44bd56c3
...
@@ -9,7 +9,7 @@ import (
...
@@ -9,7 +9,7 @@ import (
func
addrPort
(
address
net
.
Addr
)
string
{
func
addrPort
(
address
net
.
Addr
)
string
{
parts
:=
strings
.
Split
(
address
.
String
(),
":"
)
parts
:=
strings
.
Split
(
address
.
String
(),
":"
)
return
parts
[
len
(
parts
)
-
1
]
return
parts
[
len
(
parts
)
-
1
]
}
}
func
Test_netListenerInRange
(
t
*
testing
.
T
)
{
func
Test_netListenerInRange
(
t
*
testing
.
T
)
{
...
...
packer/rpc/server_test.go
View file @
44bd56c3
package
rpc
package
rpc
packer/rpc/ui.go
View file @
44bd56c3
packer/rpc/ui_test.go
View file @
44bd56c3
packer/template.go
View file @
44bd56c3
packer/template_test.go
View file @
44bd56c3
...
@@ -178,7 +178,7 @@ func TestTemplate_Build(t *testing.T) {
...
@@ -178,7 +178,7 @@ func TestTemplate_Build(t *testing.T) {
}
}
`
`
expectedConfig
:=
map
[
string
]
interface
{}
{
expectedConfig
:=
map
[
string
]
interface
{}{
"name"
:
"test1"
,
"name"
:
"test1"
,
"type"
:
"test-builder"
,
"type"
:
"test-builder"
,
}
}
...
@@ -187,7 +187,7 @@ func TestTemplate_Build(t *testing.T) {
...
@@ -187,7 +187,7 @@ func TestTemplate_Build(t *testing.T) {
assert
.
Nil
(
err
,
"should not error"
)
assert
.
Nil
(
err
,
"should not error"
)
builder
:=
testBuilder
()
builder
:=
testBuilder
()
builderMap
:=
map
[
string
]
Builder
{
builderMap
:=
map
[
string
]
Builder
{
"test-builder"
:
builder
,
"test-builder"
:
builder
,
}
}
...
...
packer/ui.go
View file @
44bd56c3
...
@@ -8,7 +8,7 @@ import "io"
...
@@ -8,7 +8,7 @@ import "io"
// is formatted and various levels of output.
// is formatted and various levels of output.
type
Ui
interface
{
type
Ui
interface
{
Say
(
format
string
,
a
...
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
// The ReaderWriterUi is a UI that writes and reads from standard Go
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment