Skip to content

chore: allow wildcard matching in metadata key names #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2024
Merged

chore: allow wildcard matching in metadata key names #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion pkg/parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"bufio"
"fmt"
"io"
"maps"
"path"
"regexp"
"slices"
"strconv"
Expand All @@ -16,7 +18,7 @@ import (
var (
sepRegex = regexp.MustCompile(`^\s*---+\s*$`)
strictSepRegex = regexp.MustCompile(`^---\n$`)
skipRegex = regexp.MustCompile(`^![-.:\w]+\s*$`)
skipRegex = regexp.MustCompile(`^![-.:*\w]+\s*$`)
)

func normalize(key string) string {
Expand Down Expand Up @@ -390,6 +392,16 @@ func assignMetadata(nodes []Node) (result []Node) {
for _, node := range nodes {
if node.ToolNode != nil {
node.ToolNode.Tool.MetaData = metadata[node.ToolNode.Tool.Name]
for wildcard := range metadata {
if strings.Contains(wildcard, "*") {
if m, err := path.Match(wildcard, node.ToolNode.Tool.Name); m && err == nil {
if node.ToolNode.Tool.MetaData == nil {
node.ToolNode.Tool.MetaData = map[string]string{}
}
maps.Copy(node.ToolNode.Tool.MetaData, metadata[wildcard])
}
}
}
}
result = append(result, node)
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@ asdf2
---
!metadata:first:requirements.txt
asdf

---
!metadata:f*r*:other

foo bar
`
tools, err := ParseTools(strings.NewReader(input))
require.NoError(t, err)
Expand All @@ -266,5 +271,6 @@ asdf
autogold.Expect(map[string]string{
"package.json": "foo=base\nf",
"requirements.txt": "asdf",
"other": "foo bar",
}).Equal(t, tools[0].MetaData)
}