beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #34918 from thaJeztah/update-copy-add-error

Browse source 
Improve error message for COPY missing destination
This commit is contained in:
Sebastiaan van Stijn 2017-09-26 18:43:36 +02:00 committed by GitHub
commit 76b5ab6f43
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
builder/dockerfile/instructions/parse.go
View file

@ -235,7 +235,7 @@ func parseLabel(req parseRequest) (*LabelCommand, error) {
func parseAdd(req parseRequest) (*AddCommand, error) {
if len(req.args) < 2 {
return nil, errAtLeastTwoArguments("ADD")
return nil, errNoDestinationArgument("ADD")
}
flChown := req.flags.AddString("chown", "")
if err := req.flags.Parse(); err != nil {
@ -250,7 +250,7 @@ func parseAdd(req parseRequest) (*AddCommand, error) {
func parseCopy(req parseRequest) (*CopyCommand, error) {
if len(req.args) < 2 {
return nil, errAtLeastTwoArguments("COPY")
return nil, errNoDestinationArgument("COPY")
}
flChown := req.flags.AddString("chown", "")
flFrom := req.flags.AddString("from", "")
@ -622,8 +622,8 @@ func errExactlyOneArgument(command string) error {
return errors.Errorf("%s requires exactly one argument", command)
}
func errAtLeastTwoArguments(command string) error {
return errors.Errorf("%s requires at least two arguments", command)
func errNoDestinationArgument(command string) error {
return errors.Errorf("%s requires at least two arguments, but only one was provided. Destination could not be determined.", command)
}
func errBlankCommandNames(command string) error {

4
builder/dockerfile/instructions/parse_test.go
View file

@ -45,7 +45,7 @@ func TestCommandsAtLeastOneArgument(t *testing.T) {
}
}
func TestCommandsAtLeastTwoArgument(t *testing.T) {
func TestCommandsNoDestinationArgument(t *testing.T) {
commands := []string{
"ADD",
"COPY",
@ -55,7 +55,7 @@ func TestCommandsAtLeastTwoArgument(t *testing.T) {
ast, err := parser.Parse(strings.NewReader(command + " arg1"))
require.NoError(t, err)
_, err = ParseInstruction(ast.AST.Children[0])
assert.EqualError(t, err, errAtLeastTwoArguments(command).Error())
assert.EqualError(t, err, errNoDestinationArgument(command).Error())
}
}