Skip to content
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

Jump to bottom

Replace the glob-based CODEOWNERS parser with regex-based #5063

Merged
merged 9 commits into from
Jan 9, 2023
Merged

Replace the glob-based CODEOWNERS parser with regex-based #5063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5102e0e
ongoing
Jan 5, 2023
f50e791
remove obsolete reference to Microsoft.Extensions.FileSystemGlobbing
Jan 7, 2023
5d55bb5
clarify cases handling **, plus improve comments
Jan 7, 2023
86ed4fe
refactor
Jan 7, 2023
ee2a4e1
replace NormalizeTargetPath with regex manipulation
Jan 7, 2023
7c6b4ed
improve comments
Jan 9, 2023
98dbf7d
add diagnostic logging and test cases showing paths with [, ], and ! …
Jan 9, 2023
38a6697
Fix Microsoft.Extensions.Logging version downgrade
Jan 9, 2023
121207b
update LoggerFactory in NotificationConfiguration.Main
Jan 9, 2023
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
240 changes: 122 additions & 118 deletions tools/code-owners-parser/Azure.Sdk.Tools.CodeOwnersParser.Tests/CodeOwnersFileTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static int Main(
bool filterOutNonUserAliases = false
)
{
var target = targetDirectory.ToLower().Trim();
var target = targetDirectory.Trim();
try {
var codeOwnerEntry = CodeOwnersFile.ParseAndFindOwnersForClosestMatch(codeOwnerFilePath, target);
if (filterOutNonUserAliases)
Expand Down
2 changes: 1 addition & 1 deletion tools/code-owners-parser/CodeOwnersParser/Azure.Sdk.Tools.CodeOwnersParser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="CommandLine.Net" Version="2.3.0" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
konrad-jamrozik marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

</Project>
299 changes: 180 additions & 119 deletions tools/code-owners-parser/CodeOwnersParser/MatchedCodeOwnerEntry.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/identity-resolution/identity-resolution.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.170.0" />
<PackageReference Include="Microsoft.VisualStudio.Services.Notifications.WebApi" Version="16.170.0" />
<PackageReference Include="YamlDotNet" Version="6.1.1" />
Expand Down
2 changes: 1 addition & 1 deletion ...ation-configuration/notification-creator/Azure.Sdk.Tools.NotificationConfiguration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.19317.1" />
</ItemGroup>

Expand Down
6 changes: 2 additions & 4 deletions tools/notification-configuration/notification-creator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.Services.Common;
Expand Down Expand Up @@ -39,12 +39,10 @@ static async Task Main(
var devOpsCreds = new VssBasicCredential("nobody", devOpsToken);
var devOpsConnection = new VssConnection(new Uri($"https://dev.azure.com/{organization}/"), devOpsCreds);

#pragma warning disable CS0618 // Type or member is obsolete
var loggerFactory = LoggerFactory.Create(builder =>
{
builder.AddConsole(config => { config.IncludeScopes = true; });
builder.AddSimpleConsole(config => { config.IncludeScopes = true; });
});
#pragma warning restore CS0618 // Type or member is obsolete
var devOpsServiceLogger = loggerFactory.CreateLogger<AzureDevOpsService>();
var notificationConfiguratorLogger = loggerFactory.CreateLogger<NotificationConfigurator>();

Expand Down