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

Say so when an only or an except option did not match anything (#11050) 

* Say so when an only or an except option did not match anything
This commit is contained in:
Adrien Delorme 2021-06-03 13:50:34 +02:00 committed by GitHub
parent 98990fc34e
commit 4be9dfd183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hcl2template/types.packer_config.go
View File

@ -422,6 +422,7 @@ func (cfg *PackerConfig) getCoreBuildPostProcessors(source SourceUseBlock, block
func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packersdk.Build, hcl.Diagnostics) {
res := []packersdk.Build{}
var diags hcl.Diagnostics
possibleBuildNames := []string{}
cfg.debug = opts.Debug
cfg.force = opts.Force
@ -447,6 +448,7 @@ func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packersdk.Bu
// Apply the -only and -except command-line options to exclude matching builds.
buildName := pcb.Name()
possibleBuildNames = append(possibleBuildNames, buildName)
// -only
if len(opts.Only) > 0 {
onlyGlobs, diags := convertFilterOption(opts.Only, "only")
@ -464,6 +466,7 @@ func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packersdk.Bu
if !include {
continue
}
opts.OnlyMatches++
}
// -except
@ -481,6 +484,7 @@ func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packersdk.Bu
}
}
if exclude {
opts.ExceptMatches++
continue
}
}
@ -550,6 +554,22 @@ func (cfg *PackerConfig) GetBuilds(opts packer.GetBuildsOptions) ([]packersdk.Bu
res = append(res, pcb)
}
}
if len(opts.Only) > opts.OnlyMatches {
diags = append(diags, &hcl.Diagnostic{
Severity: hcl.DiagWarning,
Summary: "an 'only' option was passed, but not all matches were found for the given build.",
Detail: fmt.Sprintf("Possible build names: %v.\n"+
"These could also be matched with a glob pattern like: 'happycloud.*'", possibleBuildNames),
})
}
if len(opts.Except) > opts.ExceptMatches {
diags = append(diags, &hcl.Diagnostic{
Severity: hcl.DiagWarning,
Summary: "an 'except' option was passed, but did not match any build.",
Detail: fmt.Sprintf("Possible build names: %v.\n"+
"These could also be matched with a glob pattern like: 'happycloud.*'", possibleBuildNames),
})
}
return res, diags
}

3
packer/run_interfaces.go
View File

@ -12,6 +12,9 @@ type GetBuildsOptions struct {
Except, Only []string
Debug, Force bool
OnError string
// count only/except match count; so say something when nothing matched.
ExceptMatches, OnlyMatches int
}
type BuildGetter interface {