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
c2b3fa73
Commit
c2b3fa73
authored
Dec 22, 2013
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
builder/virtualbox/ovf: validate source_path
parent
89ab009c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
1 deletion
+65
-1
builder/virtualbox/ovf/config.go
builder/virtualbox/ovf/config.go
+12
-0
builder/virtualbox/ovf/config_test.go
builder/virtualbox/ovf/config_test.go
+53
-1
No files found.
builder/virtualbox/ovf/config.go
View file @
c2b3fa73
...
...
@@ -2,6 +2,8 @@ package ovf
import
(
"fmt"
"os"
vboxcommon
"github.com/mitchellh/packer/builder/virtualbox/common"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
...
...
@@ -54,6 +56,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
errs
=
packer
.
MultiErrorAppend
(
errs
,
c
.
VBoxVersionConfig
.
Prepare
(
c
.
tpl
)
...
)
templates
:=
map
[
string
]
*
string
{
"source_path"
:
&
c
.
SourcePath
,
"vm_name"
:
&
c
.
VMName
,
}
...
...
@@ -66,6 +69,15 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
}
}
if
c
.
SourcePath
==
""
{
errs
=
packer
.
MultiErrorAppend
(
errs
,
fmt
.
Errorf
(
"source_path is required"
))
}
else
{
if
_
,
err
:=
os
.
Stat
(
c
.
SourcePath
);
err
!=
nil
{
errs
=
packer
.
MultiErrorAppend
(
errs
,
fmt
.
Errorf
(
"source_path is invalid: %s"
,
err
))
}
}
// Warnings
var
warnings
[]
string
if
c
.
ShutdownCommand
==
""
{
...
...
builder/virtualbox/ovf/config_test.go
View file @
c2b3fa73
...
...
@@ -2,8 +2,60 @@ package ovf
import
(
"testing"
"io/ioutil"
"os"
)
func
testConfig
(
t
*
testing
.
T
)
map
[
string
]
interface
{}
{
return
map
[
string
]
interface
{}{}
return
map
[
string
]
interface
{}{
"ssh_username"
:
"foo"
,
"shutdown_command"
:
"foo"
,
}
}
func
testConfigErr
(
t
*
testing
.
T
,
warns
[]
string
,
err
error
)
{
if
len
(
warns
)
>
0
{
t
.
Fatalf
(
"bad: %#v"
,
warns
)
}
if
err
==
nil
{
t
.
Fatal
(
"should error"
)
}
}
func
testConfigOk
(
t
*
testing
.
T
,
warns
[]
string
,
err
error
)
{
if
len
(
warns
)
>
0
{
t
.
Fatalf
(
"bad: %#v"
,
warns
)
}
if
err
!=
nil
{
t
.
Fatalf
(
"bad: %s"
,
err
)
}
}
func
TestNewConfig_sourcePath
(
t
*
testing
.
T
)
{
// Bad
c
:=
testConfig
(
t
)
delete
(
c
,
"source_path"
)
_
,
warns
,
errs
:=
NewConfig
(
c
)
testConfigErr
(
t
,
warns
,
errs
)
// Bad
c
=
testConfig
(
t
)
c
[
"source_path"
]
=
"/i/dont/exist"
_
,
warns
,
errs
=
NewConfig
(
c
)
testConfigErr
(
t
,
warns
,
errs
)
// Good
tf
,
err
:=
ioutil
.
TempFile
(
""
,
"packer"
)
if
err
!=
nil
{
t
.
Fatalf
(
"err: %s"
,
err
)
}
tf
.
Close
()
defer
os
.
Remove
(
tf
.
Name
())
c
=
testConfig
(
t
)
c
[
"source_path"
]
=
tf
.
Name
()
_
,
warns
,
errs
=
NewConfig
(
c
)
testConfigOk
(
t
,
warns
,
errs
)
}
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