Skip to content

Fix globstar expansion in CI Vis code owners #9045

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

Draft
bouwkast wants to merge 6 commits into
base: master
Choose a base branch
from
+43 −5
Draft

Fix globstar expansion in CI Vis code owners #9045

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85b9ad1
Fix globstar expansion in CI Vis code owners
bouwkast Aug 13, 2026
e277c86
Fix leading globstars
bouwkast Aug 13, 2026
e266971
remove the sentinel
bouwkast Aug 13, 2026
a744d44
Restrict leading globstar matching
bouwkast Aug 13, 2026
c2b0d2b
Simplify leading globstar matching
bouwkast Aug 13, 2026
92d59f0
Clarify leading globstar pattern naming
bouwkast Aug 13, 2026
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
6 changes: 6 additions & 0 deletions tracer/src/Datadog.Trace/Ci/CodeOwners.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ private static Regex CompileGlob(string pattern)
// Escape regex metachars first.
var rx = Regex.Escape(pattern);

// A globstar surrounded by slashes matches zero or more directories.
rx = rx.Replace("/\\*\\*/", "/(?:.*/)?");

// A leading globstar followed by a slash also matches at the repository root.
rx = rx.Replace("\\*\\*/", "(?:.*/)?");

@andrewlock andrewlock Aug 13, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want . because that matches / as well

Suggested change
rx = rx.Replace("/\\*\\*/", "/(?:.*/)?");
// A leading globstar followed by a slash also matches at the repository root.
rx = rx.Replace("\\*\\*/", "(?:.*/)?");
rx = rx.Replace("/\\*\\*/", "/(?:[^/]*/)?");
// A leading globstar followed by a slash also matches at the repository root.
rx = rx.Replace("\\*\\*/", "(?:[^/]*/)?");


// Temporary sentinel for ** that we restore after dealing with single *.
rx = rx.Replace("\\*\\*", "§§DOUBLESTAR§§");
rx = rx.Replace("\\*", "[^/]*"); // single‑level wildcard
Expand Down
18 changes: 18 additions & 0 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/CodeOwnersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,24 @@ public CodeOwnersTests()
// New GitHub quirks
[InlineData("/x/logs/error.txt", "[\"@octo-org/octocats\"]")] // **/logs pattern
[InlineData("docs/getting-started.md", "[\"docs@example.com\"]")] // docs/* pattern
[InlineData("/globstar/target", "[\"@globstar-owner\"]")]
[InlineData("/globstar/one/target", "[\"@globstar-owner\"]")]
[InlineData("/globstar/one/two/target", "[\"@globstar-owner\"]")]
[InlineData("/globstar/one/not-target", "[\"@global-owner1\",\"@global-owner2\"]")]
// Leading globstar
[InlineData("foo", "[\"@foo-owner\"]")]
[InlineData("one/foo", "[\"@foo-owner\"]")]
[InlineData("one/two/foo", "[\"@foo-owner\"]")]
[InlineData("foo/bar", "[\"@foo-bar-owner\"]")]
[InlineData("one/foo/bar", "[\"@foo-bar-owner\"]")]
[InlineData("one/two/foo/bar", "[\"@foo-bar-owner\"]")]
[InlineData("foobar", "[\"@global-owner1\",\"@global-owner2\"]")]
// Trailing globstar
[InlineData("abc/file", "[\"@abc-owner\"]")]
[InlineData("abc/one/file", "[\"@abc-owner\"]")]
[InlineData("abc/one/two/file", "[\"@abc-owner\"]")]
[InlineData("abc", "[\"@global-owner1\",\"@global-owner2\"]")]
[InlineData("abcd/file", "[\"@global-owner1\",\"@global-owner2\"]")]
public void CheckGithubCodeOwners(string value, string expected)
{
var match = _githubCodeOwners.Match(value);
Expand Down
12 changes: 11 additions & 1 deletion tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/Data/CODEOWNERS_GITHUB
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,14 @@ apps/ @octocat
# directory in the root of your repository except for the `/apps/github`
# subdirectory, as its owners are left empty.
/apps/ @octocat
/apps/github
/apps/github

# A globstar between slashes matches zero or more directories.
/globstar/**/target @globstar-owner

# A leading globstar matches at any depth, including the repository root.
**/foo @foo-owner
**/foo/bar @foo-bar-owner

# A trailing globstar matches everything inside the directory.
abc/** @abc-owner
Loading