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

WIP

Browse Source
This commit is contained in:
Adrien Delorme 2020-07-02 15:56:49 +02:00
parent 7969b690de
commit 284d46a1e0
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hcl2template/internal/mock.go
View File

@ -74,7 +74,7 @@ var _ packer.Builder = new(MockBuilder)
func (b *MockBuilder) ConfigSpec() hcldec.ObjectSpec { return b.Config.FlatMapstructure().HCL2Spec() } func (b *MockBuilder) ConfigSpec() hcldec.ObjectSpec { return b.Config.FlatMapstructure().HCL2Spec() }
func (b *MockBuilder) Prepare(raws ...interface{}) ([]string, []string, error) { func (b *MockBuilder) Prepare(raws ...interface{}) ([]string, []string, error) {
return nil, nil, b.Config.Prepare(raws...) return []string{"ID"}, nil, b.Config.Prepare(raws...)
} }
func (b *MockBuilder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) { func (b *MockBuilder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {

2
hcl2template/testdata/complete/build.pkr.hcl vendored
View File

@ -11,7 +11,7 @@ build {
provisioner "shell" { provisioner "shell" {
name = "provisioner that does something" name = "provisioner that does something"
not_squashed = var.foo not_squashed = "${var.foo} ${lower(build.ID)}"
string = "string" string = "string"
int = "${41 + 1}" int = "${41 + 1}"
int64 = "${42 + 1}" int64 = "${42 + 1}"

26
hcl2template/types.packer_config.go
View File

@ -51,6 +51,7 @@ const (
inputVariablesAccessor = "var" inputVariablesAccessor = "var"
localsAccessor = "local" localsAccessor = "local"
sourcesAccessor = "source" sourcesAccessor = "source"
buildAccessor = "build"
) )
// EvalContext returns the *hcl.EvalContext that will be passed to an hcl // EvalContext returns the *hcl.EvalContext that will be passed to an hcl
@ -354,24 +355,25 @@ func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packer.Build
continue continue
} }
variables := map[string]cty.Value{
sourcesAccessor: cty.ObjectVal(map[string]cty.Value{
"type": cty.StringVal(src.Type),
"name": cty.StringVal(src.Name),
}),
}
// If the builder has provided a list of to-be-generated variables that // If the builder has provided a list of to-be-generated variables that
// should be made accessible to provisioners, pass that list into // should be made accessible to provisioners, pass that list into
// the provisioner prepare() so that the provisioner can appropriately // the provisioner prepare() so that the provisioner can appropriately
// validate user input against what will become available. Otherwise, // validate user input against what will become available. Otherwise,
// only pass the default variables, using the basic placeholder data. // only pass the default variables, using the basic placeholder data.
generatedPlaceholderMap := packer.BasicPlaceholderData() generatedPlaceholderMap := packer.BasicPlaceholderData()
if generatedVars != nil { unknownBuildValues := map[string]cty.Value{}
for _, k := range generatedVars { for _, k := range generatedVars {
generatedPlaceholderMap[k] = fmt.Sprintf("Build_%s. "+ generatedPlaceholderMap[k] = fmt.Sprintf("Build_%s. "+
common.PlaceholderMsg, k) common.PlaceholderMsg, k)
} unknownBuildValues[k] = cty.StringVal("<unknown_value>")
}
variables := map[string]cty.Value{
sourcesAccessor: cty.ObjectVal(map[string]cty.Value{
"type": cty.StringVal(src.Type),
"name": cty.StringVal(src.Name),
}),
buildAccessor: cty.ObjectVal(unknownBuildValues),
} }
provisioners, moreDiags := cfg.getCoreBuildProvisioners(src, build.ProvisionerBlocks, cfg.EvalContext(variables), generatedPlaceholderMap) provisioners, moreDiags := cfg.getCoreBuildProvisioners(src, build.ProvisionerBlocks, cfg.EvalContext(variables), generatedPlaceholderMap)