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

Parse bake config as hcl falling back to json

Browse Source 
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
This commit is contained in:
Patrick Van Stee 2020-05-07 23:53:21 -04:00
parent 44c840b31d
commit 355261e49e
No known key found for this signature in database
GPG Key ID: BF979CB547EC707B
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bake/hcl.go
View File

@ -74,18 +74,20 @@ type staticConfig struct {
} }
func ParseHCL(dt []byte, fn string) (*Config, error) { func ParseHCL(dt []byte, fn string) (*Config, error) {
var file *hcl.File // Decode user defined functions, first parsing as hcl and falling back to
var diags hcl.Diagnostics // json, returning errors based on the file suffix.
file, hcldiags := hclsyntax.ParseConfig(dt, fn, hcl.Pos{Line: 1, Column: 1})
// Decode user defined functions. if hcldiags.HasErrors() {
fnl := strings.ToLower(fn) var jsondiags hcl.Diagnostics
if strings.HasSuffix(fnl, ".json") { file, jsondiags = json.Parse(dt, fn)
file, diags = json.Parse(dt, fn) if jsondiags.HasErrors() {
} else { fnl := strings.ToLower(fn)
file, diags = hclsyntax.ParseConfig(dt, fn, hcl.Pos{Line: 1, Column: 1}) if strings.HasSuffix(fnl, ".json") {
} return nil, jsondiags
if diags.HasErrors() { } else {
return nil, diags return nil, hcldiags
}
}
} }
userFunctions, _, diags := userfunc.DecodeUserFunctions(file.Body, "function", func() *hcl.EvalContext { userFunctions, _, diags := userfunc.DecodeUserFunctions(file.Body, "function", func() *hcl.EvalContext {