iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7512 from hashicorp/step_download_dont_enforce_checksum 

step download: don't fail when checksum_type/checksum are empty
This commit is contained in:
Megan Marsh 2019-04-16 13:08:47 -07:00 committed by GitHub
parent 8315be7e19 5f0259fe89
commit 29e608e505
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/step_download.go
View File

@ -105,8 +105,6 @@ func (s *StepDownload) download(ctx context.Context, ui packer.Ui, source string
q := u.Query() q := u.Query()
q.Set("checksum", s.Checksum) q.Set("checksum", s.Checksum)
u.RawQuery = q.Encode() u.RawQuery = q.Encode()
} else if s.ChecksumType != "none" {
return "", fmt.Errorf("empty checksum, a checksum or a 'none' checksum type must be set")
} }
targetPath := s.TargetPath targetPath := s.TargetPath

9
common/step_download_test.go
View File

@ -63,10 +63,13 @@ func TestStepDownload_Run(t *testing.T) {
want multistep.StepAction want multistep.StepAction
wantFiles []string wantFiles []string
}{ }{
{"not passing a checksum fails", {"not passing a checksum passes",
fields{Url: []string{abs(t, "./test-fixtures/root/another.txt")}}, fields{Url: []string{abs(t, "./test-fixtures/root/another.txt")}},
multistep.ActionHalt, multistep.ActionContinue,
nil, []string{
toSha1(abs(t, "./test-fixtures/root/another.txt")),
toSha1(abs(t, "./test-fixtures/root/another.txt")) + ".lock",
},
}, },
{"none checksum works, without a checksum", {"none checksum works, without a checksum",
fields{Url: []string{abs(t, "./test-fixtures/root/another.txt")}, ChecksumType: "none"}, fields{Url: []string{abs(t, "./test-fixtures/root/another.txt")}, ChecksumType: "none"},