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

Merge pull request #10577 from hashicorp/fix_build_run_diags 

plugin loading failure should be considered an error so build will no…
This commit is contained in:
Megan Marsh 2021-02-05 13:31:40 -08:00 committed by GitHub
parent 540effbbc0 ca123721a6
commit a63ad19b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hcl2template/types.build.post-processor.go
View File

@ -59,9 +59,10 @@ func (cfg *PackerConfig) startPostProcessor(source SourceUseBlock, pp *PostProce
postProcessor, err := cfg.parser.PluginConfig.PostProcessors.Start(pp.PType) postProcessor, err := cfg.parser.PluginConfig.PostProcessors.Start(pp.PType)
if err != nil { if err != nil {
diags = append(diags, &hcl.Diagnostic{ diags = append(diags, &hcl.Diagnostic{
Summary: fmt.Sprintf("Failed loading %s", pp.PType), Severity: hcl.DiagError,
Subject: pp.DefRange.Ptr(), Summary: fmt.Sprintf("Failed loading %s", pp.PType),
Detail: err.Error(), Subject: pp.DefRange.Ptr(),
Detail: err.Error(),
}) })
return nil, diags return nil, diags
} }

7
hcl2template/types.build.provisioners.go
View File

@ -146,9 +146,10 @@ func (cfg *PackerConfig) startProvisioner(source SourceUseBlock, pb *Provisioner
provisioner, err := cfg.parser.PluginConfig.Provisioners.Start(pb.PType) provisioner, err := cfg.parser.PluginConfig.Provisioners.Start(pb.PType)
if err != nil { if err != nil {
diags = append(diags, &hcl.Diagnostic{ diags = append(diags, &hcl.Diagnostic{
Summary: fmt.Sprintf("failed loading %s", pb.PType), Severity: hcl.DiagError,
Subject: pb.HCL2Ref.LabelsRanges[0].Ptr(), Summary: fmt.Sprintf("failed loading %s", pb.PType),
Detail: err.Error(), Subject: pb.HCL2Ref.LabelsRanges[0].Ptr(),
Detail: err.Error(),
}) })
return nil, diags return nil, diags
} }

5
hcl2template/types.source.go
View File

@ -101,8 +101,9 @@ func (cfg *PackerConfig) startBuilder(source SourceUseBlock, ectx *hcl.EvalConte
builder, err := cfg.parser.PluginConfig.Builders.Start(source.Type) builder, err := cfg.parser.PluginConfig.Builders.Start(source.Type)
if err != nil { if err != nil {
diags = append(diags, &hcl.Diagnostic{ diags = append(diags, &hcl.Diagnostic{
Summary: "Failed to load " + sourceLabel + " type", Severity: hcl.DiagError,
Detail: err.Error(), Summary: "Failed to load " + sourceLabel + " type",
Detail: err.Error(),
}) })
return builder, diags, nil return builder, diags, nil
} }