docker
/
buildx
mirror of https://github.com/docker/buildx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bake: improve error when using incorrect format for setting labels 

Improves the error message when using an incorrect format for setting
labels. This includes the intended format directly in the error message
instead of assuming the user knows what the format is.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
This commit is contained in:
Jonathan A. Sternberg 2024-11-04 14:38:23 -06:00
parent bcac44f658
commit a5bb117ff0
No known key found for this signature in database
GPG Key ID: 6603D4B96394F6B1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bake/bake.go
View File

@ -725,10 +725,12 @@ type Target struct {
linked bool linked bool
} }
var _ hclparser.WithEvalContexts = &Target{} var (
var _ hclparser.WithGetName = &Target{} _ hclparser.WithEvalContexts = &Target{}
var _ hclparser.WithEvalContexts = &Group{} _ hclparser.WithGetName = &Target{}
var _ hclparser.WithGetName = &Group{} _ hclparser.WithEvalContexts = &Group{}
_ hclparser.WithGetName = &Group{}
)
func (t *Target) normalize() { func (t *Target) normalize() {
t.Annotations = removeDupes(t.Annotations) t.Annotations = removeDupes(t.Annotations)
@ -865,7 +867,7 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
t.Dockerfile = &value t.Dockerfile = &value
case "args": case "args":
if len(keys) != 2 { if len(keys) != 2 {
return errors.Errorf("args require name") return errors.Errorf("invalid format for args, expecting args.<name>=<value>")
} }
if t.Args == nil { if t.Args == nil {
t.Args = map[string]*string{} t.Args = map[string]*string{}
@ -873,7 +875,7 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
t.Args[keys[1]] = &value t.Args[keys[1]] = &value
case "contexts": case "contexts":
if len(keys) != 2 { if len(keys) != 2 {
return errors.Errorf("contexts require name") return errors.Errorf("invalid format for contexts, expecting contexts.<name>=<value>")
} }
if t.Contexts == nil { if t.Contexts == nil {
t.Contexts = map[string]string{} t.Contexts = map[string]string{}
@ -881,7 +883,7 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
t.Contexts[keys[1]] = value t.Contexts[keys[1]] = value
case "labels": case "labels":
if len(keys) != 2 { if len(keys) != 2 {
return errors.Errorf("labels require name") return errors.Errorf("invalid format for labels, expecting labels.<name>=<value>")
} }
if t.Labels == nil { if t.Labels == nil {
t.Labels = map[string]*string{} t.Labels = map[string]*string{}