docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-19 01:47:43 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: support filenames without suffix

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2020-09-27 21:35:16 -07:00
parent 570e733a51
commit 5bf2ff98c9
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bake/hcl.go
View File

@ -107,6 +107,20 @@ type staticConfig struct {
} }
func ParseHCL(dt []byte, fn string) (_ *Config, err error) { func ParseHCL(dt []byte, fn string) (_ *Config, err error) {
if strings.HasSuffix(fn, ".json") || strings.HasSuffix(fn, ".hcl") {
return parseHCL(dt, fn)
}
cfg, err := parseHCL(dt, fn+".hcl")
if err != nil {
cfg2, err2 := parseHCL(dt, fn+".json")
if err2 == nil {
return cfg2, nil
}
}
return cfg, err
}
func parseHCL(dt []byte, fn string) (_ *Config, err error) {
defer func() { defer func() {
err = formatHCLError(dt, err) err = formatHCLError(dt, err)
}() }()
@ -192,15 +206,17 @@ func formatHCLError(dt []byte, err error) error {
if d.Severity != hcl.DiagError { if d.Severity != hcl.DiagError {
continue continue
} }
src := errdefs.Source{ if d.Subject != nil {
Info: &pb.SourceInfo{ src := errdefs.Source{
Filename: d.Subject.Filename, Info: &pb.SourceInfo{
Data: dt, Filename: d.Subject.Filename,
}, Data: dt,
Ranges: []*pb.Range{toErrRange(d.Subject)}, },
Ranges: []*pb.Range{toErrRange(d.Subject)},
}
err = errdefs.WithSource(err, src)
break
} }
err = errdefs.WithSource(err, src)
break
} }
return err return err
} }