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

Reduce regex usage in annotation parser

Browse Source 
Signed-off-by: Eli Treuherz <et@arenko.group>
This commit is contained in:
Eli Treuherz 2024-06-18 12:29:14 +01:00
parent bcd04d5a64
commit 3d0951b800
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util/buildflags/export.go
View File

@ -81,8 +81,10 @@ func ParseExports(inp []string) ([]*controllerapi.ExportEntry, error) {
func ParseAnnotations(inp []string) (map[exptypes.AnnotationKey]string, error) { func ParseAnnotations(inp []string) (map[exptypes.AnnotationKey]string, error) {
// TODO: use buildkit's annotation parser once it supports setting custom prefix and ":" separator // TODO: use buildkit's annotation parser once it supports setting custom prefix and ":" separator
annotationRegexp := regexp.MustCompile(`^((?:[a-z-]+(?:\[[A-Za-z0-9_/-]+\])?)(?:,[a-z-]+(?:\[[A-Za-z0-9_/-]+\])?)*:)?(\S+)$`)
// type followed by optional platform specifier in square brackets
annotationTypeRegexp := regexp.MustCompile(`^([a-z-]+)(?:\[([A-Za-z0-9_/-]+)\])?$`) annotationTypeRegexp := regexp.MustCompile(`^([a-z-]+)(?:\[([A-Za-z0-9_/-]+)\])?$`)
annotations := make(map[exptypes.AnnotationKey]string) annotations := make(map[exptypes.AnnotationKey]string)
for _, inp := range inp { for _, inp := range inp {
k, v, ok := strings.Cut(inp, "=") k, v, ok := strings.Cut(inp, "=")
@ -90,27 +92,33 @@ func ParseAnnotations(inp []string) (map[exptypes.AnnotationKey]string, error) {
return nil, errors.Errorf("invalid annotation %q, expected key=value", inp) return nil, errors.Errorf("invalid annotation %q, expected key=value", inp)
} }
groups := annotationRegexp.FindStringSubmatch(k) types, key, ok := strings.Cut(k, ":")
if groups == nil { if !ok {
return nil, errors.Errorf("invalid annotation format, expected <type>:<key>=<value>, got %q", inp) // no types specified, swap Cut outputs
} key = types
types, key := groups[1], groups[2]
if types == "" {
ak := exptypes.AnnotationKey{Key: key} ak := exptypes.AnnotationKey{Key: key}
annotations[ak] = v annotations[ak] = v
continue continue
} }
typesSplit := strings.Split(strings.TrimSuffix(types, ":"), ",") typesSplit := strings.Split(types, ",")
for _, typeAndPlatform := range typesSplit { for _, typeAndPlatform := range typesSplit {
groups := annotationTypeRegexp.FindStringSubmatch(typeAndPlatform) groups := annotationTypeRegexp.FindStringSubmatch(typeAndPlatform)
if groups == nil {
return nil, errors.Errorf(
"invalid annotation type %q, expected type and optional platform in square brackets",
typeAndPlatform)
}
typ, platform := groups[1], groups[2] typ, platform := groups[1], groups[2]
switch typ { switch typ {
case "": case "":
case exptypes.AnnotationIndex, exptypes.AnnotationIndexDescriptor, exptypes.AnnotationManifest, exptypes.AnnotationManifestDescriptor: case exptypes.AnnotationIndex,
exptypes.AnnotationIndexDescriptor,
exptypes.AnnotationManifest,
exptypes.AnnotationManifestDescriptor:
default: default:
return nil, errors.Errorf("unknown annotation type %q", typ) return nil, errors.Errorf("unknown annotation type %q", typ)
} }