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

Fix handling of attest extra arguments

Browse Source 
Signed-off-by: Laurent Goderre <laurent.goderre@docker.com>
This commit is contained in:
Laurent Goderre 2025-02-27 10:42:09 -05:00 committed by CrazyMax
parent 41f8e5c85c
commit 6da88e1555
No known key found for this signature in database
GPG Key ID: ADE44D8C9D44FBE4
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/buildflags/attests.go
View File

@ -148,9 +148,8 @@ func (a *Attest) UnmarshalText(text []byte) error {
if !ok { if !ok {
return errors.Errorf("invalid value %s", field) return errors.Errorf("invalid value %s", field)
} }
key = strings.TrimSpace(strings.ToLower(key))
switch key { switch strings.TrimSpace(strings.ToLower(key)) {
case "type": case "type":
a.Type = value a.Type = value
case "disabled": case "disabled":

16
util/buildflags/export.go
View File

@ -1,6 +1,7 @@
package buildflags package buildflags
import ( import (
"encoding/csv"
"encoding/json" "encoding/json"
"maps" "maps"
"regexp" "regexp"
@ -259,9 +260,18 @@ func (w *csvBuilder) Write(key, value string) {
if w.sb.Len() > 0 { if w.sb.Len() > 0 {
w.sb.WriteByte(',') w.sb.WriteByte(',')
} }
w.sb.WriteString(key)
w.sb.WriteByte('=') pair := key + "=" + value
w.sb.WriteString(value) if strings.ContainsRune(pair, ',') || strings.ContainsRune(pair, '"') {
var attr strings.Builder
writer := csv.NewWriter(&attr)
writer.Write([]string{pair})
writer.Flush()
// Strips the extra newline added by the csv writer
pair = strings.TrimSpace(attr.String())
}
w.sb.WriteString(pair)
} }
func (w *csvBuilder) WriteAttributes(attrs map[string]string) { func (w *csvBuilder) WriteAttributes(attrs map[string]string) {