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

Merge pull request #9320 from hashicorp/fix_checksum_fixer

Browse Source 
actually run the fixer
This commit is contained in:
Wilken Rivera 2020-05-29 11:38:00 -04:00 committed by GitHub
commit 37df64873f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fix/fixer.go
View File

@ -50,6 +50,7 @@ func init() {
"ssh-wait-timeout": new(FixerSSHTimout), "ssh-wait-timeout": new(FixerSSHTimout),
"docker-tag-tags": new(FixerDockerTagtoTags), "docker-tag-tags": new(FixerDockerTagtoTags),
"vsphere-iso-net-disk": new(FixerVSphereNetworkDisk), "vsphere-iso-net-disk": new(FixerVSphereNetworkDisk),
"iso-checksum-type-and-url": new(FixerISOChecksumTypeAndURL),
} }
FixerOrder = []string{ FixerOrder = []string{
@ -83,5 +84,6 @@ func init() {
"comm-config", "comm-config",
"ssh-wait-timeout", "ssh-wait-timeout",
"vsphere-iso-net-disk", "vsphere-iso-net-disk",
"iso-checksum-type-and-url",
} }
} }

4
fix/fixer_iso_checksum_type_and_url.go
View File

@ -27,7 +27,9 @@ func (FixerISOChecksumTypeAndURL) Fix(input map[string]interface{}) (map[string]
checksum := stringValue(builder["iso_checksum"]) checksum := stringValue(builder["iso_checksum"])
delete(builder, "iso_checksum_url") delete(builder, "iso_checksum_url")
delete(builder, "iso_checksum_type") delete(builder, "iso_checksum_type")
if checksum == "" && checksumUrl == "" {
continue
}
if checksumUrl != "" { if checksumUrl != "" {
checksum = "file:" + checksumUrl checksum = "file:" + checksumUrl
} else if checksumType != "" { } else if checksumType != "" {