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

Merge pull request #1080 from jedevc/issue-1051

Browse Source 
hclparser: strip out blocks for json files
This commit is contained in:
Tõnis Tiigi 2022-04-28 21:11:02 -07:00 committed by GitHub
commit 9cdd837f6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bake/hcl_test.go
View File

@ -745,3 +745,13 @@ target "two" {
require.Equal(t, c.Targets[1].Name, "two") require.Equal(t, c.Targets[1].Name, "two")
require.Equal(t, map[string]string{"b": "pre-jkl"}, c.Targets[1].Args) require.Equal(t, map[string]string{"b": "pre-jkl"}, c.Targets[1].Args)
} }
func TestEmptyVariableJSON(t *testing.T) {
dt := []byte(`{
"variable": {
"VAR": {}
}
}`)
_, err := ParseFile(dt, "docker-bake.json")
require.NoError(t, err)
}

16
bake/hclparser/hclparser.go
View File

@ -256,6 +256,7 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
if err := gohcl.DecodeBody(b, nil, &defs); err != nil { if err := gohcl.DecodeBody(b, nil, &defs); err != nil {
return err return err
} }
defsSchema, _ := gohcl.ImpliedBodySchema(defs)
if opt.LookupVar == nil { if opt.LookupVar == nil {
opt.LookupVar = func(string) (string, bool) { opt.LookupVar = func(string) (string, bool) {
@ -300,6 +301,16 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
p.funcs[v.Name] = v p.funcs[v.Name] = v
} }
content, b, diags := b.PartialContent(schema)
if diags.HasErrors() {
return diags
}
_, b, diags = b.PartialContent(defsSchema)
if diags.HasErrors() {
return diags
}
attrs, diags := b.JustAttributes() attrs, diags := b.JustAttributes()
if diags.HasErrors() { if diags.HasErrors() {
if d := removeAttributesDiags(diags, reserved, p.vars); len(d) > 0 { if d := removeAttributesDiags(diags, reserved, p.vars); len(d) > 0 {
@ -371,11 +382,6 @@ func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
} }
} }
content, _, diags := b.PartialContent(schema)
if diags.HasErrors() {
return diags
}
for _, a := range content.Attributes { for _, a := range content.Attributes {
return hcl.Diagnostics{ return hcl.Diagnostics{
&hcl.Diagnostic{ &hcl.Diagnostic{