mirror of
https://github.com/hashicorp/packer.git
synced 2026-09-25 09:14:01 -04:00
Adrien Delorme
2af40c762b
* sets `packer_build_name` and `packer_builder_type` variables for builder provisioners and post-processors in HCL2
* allows to use the new `${source.type}` and `${source.name}` variables in HCL2
* fixes #8932
Note that the common.PackerConfig is used everywhere and was not set for HCL2, this had some implications:
For #8923 you can see the issue here:
https://github.com/hashicorp/packer/blob/dde74232f251434715cb76664426d9c1e1c91bd8/builder/lxd/config.go#L61-L63
More random examples of where this could cause an issue :
https://github.com/hashicorp/packer/blob/0785c2f6fca9c22bf25528e0176042799dd79df9/provisioner/ansible-local/provisioner.go#L380-L381
https://github.com/hashicorp/packer/blob/b4efd13a4d69a937a22caa5dd84eb98f7fdce5cf/builder/amazon/ebs/builder.go#L232-L236
* [All references to PackerConfig.PackerBuildName](https://sourcegraph.com/github.com/hashicorp/packer@ff6a039d5bb45e34ff761d9c52e8b98972288447/-/blob/common/packer_config.go#L7:2&tab=references)
* [All references to PackerConfig.PackerBuilderType](https://sourcegraph.com/github.com/hashicorp/packer@ff6a039d5bb45e34ff761d9c52e8b98972288447/-/blob/common/packer_config.go#L8:2&tab=references)
79 lines
2.2 KiB
Go
79 lines
2.2 KiB
Go
package hcl2template
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/hcl/v2"
|
|
"github.com/hashicorp/hcl/v2/gohcl"
|
|
"github.com/hashicorp/packer/packer"
|
|
)
|
|
|
|
// ProvisionerBlock references a detected but unparsed post processor
|
|
type PostProcessorBlock struct {
|
|
PType string
|
|
PName string
|
|
|
|
HCL2Ref
|
|
}
|
|
|
|
func (p *PostProcessorBlock) String() string {
|
|
return fmt.Sprintf(buildPostProcessorLabel+"-block %q %q", p.PType, p.PName)
|
|
}
|
|
|
|
func (p *Parser) decodePostProcessor(block *hcl.Block) (*PostProcessorBlock, hcl.Diagnostics) {
|
|
var b struct {
|
|
Name string `hcl:"name,optional"`
|
|
Rest hcl.Body `hcl:",remain"`
|
|
}
|
|
diags := gohcl.DecodeBody(block.Body, nil, &b)
|
|
if diags.HasErrors() {
|
|
return nil, diags
|
|
}
|
|
|
|
postProcessor := &PostProcessorBlock{
|
|
PType: block.Labels[0],
|
|
PName: b.Name,
|
|
HCL2Ref: newHCL2Ref(block, b.Rest),
|
|
}
|
|
|
|
if !p.PostProcessorsSchemas.Has(postProcessor.PType) {
|
|
diags = append(diags, &hcl.Diagnostic{
|
|
Summary: fmt.Sprintf("Unknown "+buildPostProcessorLabel+" type %q", postProcessor.PType),
|
|
Subject: block.LabelRanges[0].Ptr(),
|
|
Detail: fmt.Sprintf("known "+buildPostProcessorLabel+"s: %v", p.PostProcessorsSchemas.List()),
|
|
Severity: hcl.DiagError,
|
|
})
|
|
return nil, diags
|
|
}
|
|
|
|
return postProcessor, diags
|
|
}
|
|
|
|
func (p *Parser) startPostProcessor(source *SourceBlock, pp *PostProcessorBlock, ectx *hcl.EvalContext, generatedVars map[string]string) (packer.PostProcessor, hcl.Diagnostics) {
|
|
// ProvisionerBlock represents a detected but unparsed provisioner
|
|
var diags hcl.Diagnostics
|
|
|
|
postProcessor, err := p.PostProcessorsSchemas.Start(pp.PType)
|
|
if err != nil {
|
|
diags = append(diags, &hcl.Diagnostic{
|
|
Summary: fmt.Sprintf("Failed loading %s", pp.PType),
|
|
Subject: pp.DefRange.Ptr(),
|
|
Detail: err.Error(),
|
|
})
|
|
return nil, diags
|
|
}
|
|
flatProvisinerCfg, moreDiags := decodeHCL2Spec(pp.Rest, ectx, postProcessor)
|
|
diags = append(diags, moreDiags...)
|
|
err = postProcessor.Configure(source.builderVariables(), flatProvisinerCfg, generatedVars)
|
|
if err != nil {
|
|
diags = append(diags, &hcl.Diagnostic{
|
|
Severity: hcl.DiagError,
|
|
Summary: fmt.Sprintf("Failed preparing %s", pp),
|
|
Detail: err.Error(),
|
|
Subject: pp.DefRange.Ptr(),
|
|
})
|
|
return nil, diags
|
|
}
|
|
return postProcessor, diags
|
|
}
|