upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-04-22 06:37:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix

Browse source
This commit is contained in:
Adrien Delorme 2021-11-04 14:14:54 +01:00
parent 8b16de3f54
commit fc88e89fbb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hcl2template/types.build.go
View file

@ -146,7 +146,7 @@ func (p *Parser) decodeBuildConfig(block *hcl.Block, cfg *PackerConfig) (*BuildB
}
hcpPackerRegistry, moreDiags := p.decodeHCPRegistry(block)
diags = append(diags, moreDiags...)
if moreDiags.HasErrors() {
if moreDiags.HasErrors() || hcpPackerRegistry == nil {
continue
}
build.HCPPackerRegistry = hcpPackerRegistry
@ -160,7 +160,7 @@ func (p *Parser) decodeBuildConfig(block *hcl.Block, cfg *PackerConfig) (*BuildB
case buildProvisionerLabel:
p, moreDiags := p.decodeProvisioner(block, cfg)
diags = append(diags, moreDiags...)
if moreDiags.HasErrors() {
if moreDiags.HasErrors() || p == nil {
continue
}
build.ProvisionerBlocks = append(build.ProvisionerBlocks, p)
@ -175,14 +175,14 @@ func (p *Parser) decodeBuildConfig(block *hcl.Block, cfg *PackerConfig) (*BuildB
}
p, moreDiags := p.decodeProvisioner(block, cfg)
diags = append(diags, moreDiags...)
if moreDiags.HasErrors() {
if moreDiags.HasErrors() || p == nil {
continue
}
build.ErrorCleanupProvisionerBlock = p
case buildPostProcessorLabel:
pp, moreDiags := p.decodePostProcessor(block, cfg)
diags = append(diags, moreDiags...)
if moreDiags.HasErrors() {
if moreDiags.HasErrors() || pp == nil {
continue
}
build.PostProcessorsLists = append(build.PostProcessorsLists, []*PostProcessorBlock{pp})