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
64397f21
Commit
64397f21
authored
Dec 08, 2014
by
Seth Vargo
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1730 from ceh/issue-801
post-processor/vagrant: check if vagrantfile_template exists
parents
a6375568
53b1db16
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
4 deletions
+36
-4
post-processor/vagrant/post-processor.go
post-processor/vagrant/post-processor.go
+7
-0
post-processor/vagrant/post-processor_test.go
post-processor/vagrant/post-processor_test.go
+29
-4
No files found.
post-processor/vagrant/post-processor.go
View file @
64397f21
...
...
@@ -210,6 +210,13 @@ func (p *PostProcessor) configureSingle(config *Config, raws ...interface{}) err
"vagrantfile_template"
:
&
config
.
VagrantfileTemplate
,
}
if
config
.
VagrantfileTemplate
!=
""
{
_
,
err
:=
os
.
Stat
(
config
.
VagrantfileTemplate
)
if
err
!=
nil
{
errs
=
packer
.
MultiErrorAppend
(
errs
,
fmt
.
Errorf
(
"vagrantfile_template '%s' does not exist"
,
config
.
VagrantfileTemplate
))
}
}
for
n
,
ptr
:=
range
validates
{
if
err
:=
config
.
tpl
.
Validate
(
*
ptr
);
err
!=
nil
{
errs
=
packer
.
MultiErrorAppend
(
...
...
post-processor/vagrant/post-processor_test.go
View file @
64397f21
...
...
@@ -84,16 +84,22 @@ func TestPostProcessorPrepare_outputPath(t *testing.T) {
func
TestPostProcessorPrepare_subConfigs
(
t
*
testing
.
T
)
{
var
p
PostProcessor
f
,
err
:=
ioutil
.
TempFile
(
""
,
"packer"
)
if
err
!=
nil
{
t
.
Fatalf
(
"err: %s"
,
err
)
}
defer
os
.
Remove
(
f
.
Name
())
// Default
c
:=
testConfig
()
c
[
"compression_level"
]
=
42
c
[
"vagrantfile_template"
]
=
"foo"
c
[
"vagrantfile_template"
]
=
f
.
Name
()
c
[
"override"
]
=
map
[
string
]
interface
{}{
"aws"
:
map
[
string
]
interface
{}{
"compression_level"
:
7
,
},
}
err
:
=
p
.
Configure
(
c
)
err
=
p
.
Configure
(
c
)
if
err
!=
nil
{
t
.
Fatalf
(
"err: %s"
,
err
)
}
...
...
@@ -102,7 +108,7 @@ func TestPostProcessorPrepare_subConfigs(t *testing.T) {
t
.
Fatalf
(
"bad: %#v"
,
p
.
configs
[
""
]
.
CompressionLevel
)
}
if
p
.
configs
[
""
]
.
VagrantfileTemplate
!=
"foo"
{
if
p
.
configs
[
""
]
.
VagrantfileTemplate
!=
f
.
Name
()
{
t
.
Fatalf
(
"bad: %#v"
,
p
.
configs
[
""
]
.
VagrantfileTemplate
)
}
...
...
@@ -110,11 +116,30 @@ func TestPostProcessorPrepare_subConfigs(t *testing.T) {
t
.
Fatalf
(
"bad: %#v"
,
p
.
configs
[
"aws"
]
.
CompressionLevel
)
}
if
p
.
configs
[
"aws"
]
.
VagrantfileTemplate
!=
"foo"
{
if
p
.
configs
[
"aws"
]
.
VagrantfileTemplate
!=
f
.
Name
()
{
t
.
Fatalf
(
"bad: %#v"
,
p
.
configs
[
"aws"
]
.
VagrantfileTemplate
)
}
}
func
TestPostProcessorPrepare_vagrantfileTemplateExists
(
t
*
testing
.
T
)
{
var
p
PostProcessor
f
,
err
:=
ioutil
.
TempFile
(
""
,
"packer"
)
if
err
!=
nil
{
t
.
Fatalf
(
"err: %s"
,
err
)
}
c
:=
testConfig
()
c
[
"vagrantfile_template"
]
=
f
.
Name
()
os
.
Remove
(
f
.
Name
())
err
=
p
.
Configure
(
c
)
if
err
==
nil
{
t
.
Fatal
(
"expected an error since vagrantfile_template does not exist"
)
}
}
func
TestPostProcessorPostProcess_badId
(
t
*
testing
.
T
)
{
artifact
:=
&
packer
.
MockArtifact
{
BuilderIdValue
:
"invalid.packer"
,
...
...
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