Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions bake/bake.go
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,10 @@ func ParseFiles(files []File, defaults, vars map[string]string) (_ *Config, _ *h
pm = *res
}

if err := validateTargetGroups(hclFiles); err != nil {
return nil, nil, err
}

return &c, &pm, nil
}

Expand Down Expand Up @@ -442,6 +446,36 @@ func ParseFile(dt []byte, fn string) (*Config, error) {
return c, err
}

func validateTargetGroups(files []*hcl.File) error {
schema := &hcl.BodySchema{
Blocks: []hcl.BlockHeaderSchema{
{Type: "target", LabelNames: []string{"name"}},
},
}
for _, f := range files {
content, _, diags := f.Body.PartialContent(schema)
if diags.HasErrors() {
return diags
}
for _, block := range content.Blocks {
attrs, diags := block.Body.JustAttributes()
if diags.HasErrors() {
return diags
}
if attr, ok := attrs["targets"]; ok {
return hcl.Diagnostics{&hcl.Diagnostic{
Severity: hcl.DiagError,
Summary: "Unsupported argument",
Detail: "The \"targets\" argument is not valid inside a target block; use a group block instead.",
Subject: attr.NameRange.Ptr(),
Context: attr.Range.Ptr(),
}}
}
}
}
return nil
}

type Config struct {
Groups []*Group `json:"group" hcl:"group,block" cty:"group"`
Targets []*Target `json:"target" hcl:"target,block" cty:"target"`
Expand Down
21 changes: 21 additions & 0 deletions bake/hcl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,27 @@ func TestHCLWithUserDefinedFunctions(t *testing.T) {
require.Equal(t, ptrstr("124"), c.Targets[0].Args["buildno"])
}

func TestTargetDisallowsGroupTargetsAttribute(t *testing.T) {
dt := []byte(`
target "app" {
dockerfile = "app.Dockerfile"
}

target "db" {
dockerfile = "db.Dockerfile"
}

target "foo" {
targets = ["app", "db"]
}
`)

_, err := ParseFile(dt, "docker-bake.hcl")
require.Error(t, err)
require.ErrorContains(t, err, "Unsupported argument")
require.ErrorContains(t, err, "targets")
}

func TestHCLWithVariables(t *testing.T) {
dt := []byte(`
variable "BUILD_NUMBER" {
Expand Down