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: fix map type checking to detect matrix property set to list

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell 2023-04-05 12:59:32 +01:00
parent a3293cdaaa
commit 9827abbf76
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bake/bake.go
View File

@ -820,7 +820,7 @@ func (t *Target) GetEvalContexts(ectx *hcl.EvalContext, block *hcl.Block, loadDe
return nil, err return nil, err
} }
if !value.CanIterateElements() { if !value.Type().IsMapType() && !value.Type().IsObjectType() {
return nil, errors.Errorf("matrix must be a map") return nil, errors.Errorf("matrix must be a map")
} }
matrix := value.AsValueMap() matrix := value.AsValueMap()

18
bake/hcl_test.go
View File

@ -1051,6 +1051,14 @@ func TestHCLMatrixBadTypes(t *testing.T) {
_, err := ParseFile(dt, "docker-bake.hcl") _, err := ParseFile(dt, "docker-bake.hcl")
require.Error(t, err) require.Error(t, err)
dt = []byte(`
target "default" {
matrix = ["test"]
}
`)
_, err = ParseFile(dt, "docker-bake.hcl")
require.Error(t, err)
dt = []byte(` dt = []byte(`
target "default" { target "default" {
matrix = { matrix = {
@ -1061,6 +1069,16 @@ func TestHCLMatrixBadTypes(t *testing.T) {
_, err = ParseFile(dt, "docker-bake.hcl") _, err = ParseFile(dt, "docker-bake.hcl")
require.Error(t, err) require.Error(t, err)
dt = []byte(`
target "default" {
matrix = {
1 = 2
}
}
`)
_, err = ParseFile(dt, "docker-bake.hcl")
require.Error(t, err)
dt = []byte(` dt = []byte(`
target "default" { target "default" {
matrix = { matrix = {