Make `darc add-subscription` work with the new config repo #5627

dkurepa · 2025-12-08T06:53:04Z

Copilot

Pull request overview

This PR implements the initial infrastructure for managing subscriptions via a configuration repository rather than through the database. It introduces a new ConfigurationManagementOperation base class that enables DARC commands to read from and commit to a Git-based configuration repository, with support for both local and remote repositories (GitHub and Azure DevOps).

Key changes:

New ConfigurationManagementOperation base class provides common functionality for managing YAML configuration files in a Git repository
Extended Git clients to support direct API commits without cloning (GitHub and Azure DevOps)
Added IsEquivalentTo method to SubscriptionYaml for duplicate detection
Updated subscription operations to inherit from ConfigurationManagementOperation

Reviewed changes

Copilot reviewed 20 out of 20 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
src/Microsoft.DotNet.Darc/DarcLib/RemoteRepoBase.cs	Removed obsolete logger parameter from documentation
src/Microsoft.DotNet.Darc/DarcLib/Remote.cs	Added wrapper method for no-cloning commit functionality
src/Microsoft.DotNet.Darc/DarcLib/Models/Yaml/SubscriptionYaml.cs	Implemented equivalence checking for subscription deduplication
src/Microsoft.DotNet.Darc/DarcLib/LocalLibGit2Client.cs	Added repository existence check method
src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs	Added branch existence check and branch creation from base
src/Microsoft.DotNet.Darc/DarcLib/IRemoteGitRepo.cs	Moved common methods to IGitRepo and added CommitFilesWithNoCloningAsync
src/Microsoft.DotNet.Darc/DarcLib/IRemote.cs	Added interface method for no-cloning commits
src/Microsoft.DotNet.Darc/DarcLib/IGitRepo.cs	Moved branch and repository management methods from IRemoteGitRepo
src/Microsoft.DotNet.Darc/DarcLib/GitHubClient.cs	Implemented direct API-based commit functionality using GitHub Git Data API
src/Microsoft.DotNet.Darc/DarcLib/AzureDevOpsClient.cs	Implemented direct API-based commit functionality using Azure DevOps pushes API
src/Microsoft.DotNet.Darc/Darc/Options/SubscriptionCommandLineOptions.cs	Changed base class to ConfigurationManagementCommandLineOptions
src/Microsoft.DotNet.Darc/Darc/Options/ConfigurationManagementCommandLineOptions.cs	New options class for configuration repository management
src/Microsoft.DotNet.Darc/Darc/Options/CommandLineOptions.cs	Registered LocalGitRepoFactory and LocalGitClient in DI container
src/Microsoft.DotNet.Darc/Darc/Operations/UpdateSubscriptionOperation.cs	Updated constructor to use ConfigurationManagementOperation base
src/Microsoft.DotNet.Darc/Darc/Operations/SubscriptionOperationBase.cs	Changed base class to ConfigurationManagementOperation
src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs	New base class providing configuration repository management functionality
src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs	Added configuration repository support with duplicate detection
src/Microsoft.DotNet.Darc/Darc/Microsoft.DotNet.Darc.csproj	Added dependency on Microsoft.DotNet.MaestroConfiguration.Client
eng/Version.Details.xml	Updated MaestroConfiguration.Client package version
eng/Version.Details.props	Updated MaestroConfiguration.Client package version

src/Microsoft.DotNet.Darc/DarcLib/LocalLibGit2Client.cs

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs

src/Microsoft.DotNet.Darc/DarcLib/AzureDevOpsClient.cs

src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs

src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs

src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs

src/Microsoft.DotNet.Darc/Darc/Options/ConfigurationManagementCommandLineOptions.cs

src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs

…CommandLineOptions.cs Co-authored-by: Přemek Vysoký <[email protected]>

premun · 2025-12-09T12:24:47Z

@dkurepa do you have a task for updating of Darc.md after we're done?

Ideally we'd maybe scrap the whole file as the whole format is just useless and we'd:

explain the main commands in some short concise way
explain the configuration repo interaction

dkurepa · 2025-12-09T12:30:44Z

@dkurepa do you have a task for updating of Darc.md after we're done?

Ideally we'd maybe scrap the whole file as the whole format is just useless and we'd:

explain the main commands in some short concise way

explain the configuration repo interaction

It's under the Fully transition issue currently #5537, will probably end up splitting that one into multiple

premun · 2025-12-09T16:25:23Z

@dkurepa if you're going to spin up the AI tasks for other commands then don't. Matt has a request which might mean a change to the code here that the AI will be reusing

src/Microsoft.DotNet.Darc/DarcLib/IRemoteGitRepo.cs

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

adamzip · 2025-12-09T15:33:46Z

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

+        }
+
+        subscriptionsInFile.Add(subscriptionYaml);
+        await WriteConfigurationDataAsync(


Suggested change

await WriteConfigurationDataAsync(

await CommitConfigurationChangesAsync(

src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs

adamzip · 2025-12-09T23:26:10Z

src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs

+
+        if (!await _configurationRepo.Value.DoesBranchExistAsync(_options.ConfigurationRepository, _options.ConfigurationBaseBranch))
+        {
+            throw new ArgumentException($"The configuration base branch '{_options.ConfigurationBaseBranch}' does not exist in the repository '{_options.ConfigurationRepository}'.");


I think that error message is only true if the repo is remote. With a local one, it could just be that the branch (eg, "prod") hasn't been fetched?

I mean it still doesn't exist on your repo locally, it's up to the user to figure it out at that point

adamzip · 2025-12-09T23:28:30Z

src/Microsoft.DotNet.Darc/Darc/Operations/ConfigurationManagementOperation.cs

+    {
+        if (!await _configurationRepo.Value.RepoExistsAsync(_options.ConfigurationRepository))
+        {
+            throw new ArgumentException($"The configuration repository '{_options.ConfigurationRepository}' is not a valid git repository.");


Suggested change

throw new ArgumentException($"The configuration repository '{_options.ConfigurationRepository}' is not a valid git repository.");

throw new ArgumentException($"ConfigurationRepository must be a valid URI to a remote git repository, or a path to a git repository on disk.");

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

adamzip · 2025-12-09T23:34:06Z

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

+                sourceEnabled: subscriptionYaml.SourceEnabled,
+                sourceDirectory: subscriptionYaml.SourceDirectory,
+                targetDirectory: subscriptionYaml.TargetDirectory))
+            .FirstOrDefault(s => s.TargetBranch == subscriptionYaml.TargetBranch);


nit: targetBranch could be added to the optional params that GetSubscriptionsAsync accepts

ah you mean expand the method

Looking at it, I wouldn't want to add it as a last argument, but adding it somewhere in the middle would make it so I'd have to check a lot of places, which I wouldn't want to do in this PR

@dkurepa not saying you should add it but in case you are doing such a change in future, VS allows you to add a new param in the "Change signature" modal dialog and you can set what value you want to insert in all calling places. So you'd put something like TODO and it will make sure it's everywhere and you don't break stuff

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

premun · 2025-12-10T08:46:11Z

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

+        if (!_options.NoPr)
+        {
+            await CreatePullRequest(
+                $"Add new subscription ({subscriptionYaml.Channel}) {subscriptionYaml.SourceRepository} => {subscriptionYaml.TargetRepository} ({subscriptionYaml.TargetBranch})");


The title could be generated by SubscriptionDescriptionHelper

…RepositoryManager

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

src/Microsoft.DotNet.Darc/DarcLib/LocalLibGit2Client.cs

premun · 2025-12-10T16:19:53Z

...ft.DotNet.Darc/DarcLib/ConfigurationRepository/ConfigurationRepositoryOperationParameters.cs

+namespace Microsoft.DotNet.DarcLib.ConfigurationRepository;
+
+// this is just a temporary thing, till we add it in the configuration repo
+public class ConfigurationRepositoryOperationParameters


Do we still need this?

I haven't merged the PR in the config repo yet, so yes

Should we just merge it and tomorrow morning we can use the real interfaces?

if this PR looks good to you, could we merge it first, and merge the config repo one tomorrow?

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

dkurepa added 4 commits December 4, 2025 16:30

start

64b5156

Merge remote-tracking branch 'origin/main' into dkurepa/DarcConfigRepo

976db65

implement the operation

75c8379

Looks ok now

3ddd3eb

Copilot AI review requested due to automatic review settings December 8, 2025 06:53

dkurepa changed the title ~~start~~ Make darc add-subscriptiojn work with the new config repo Dec 8, 2025

Copilot started reviewing on behalf of dkurepa December 8, 2025 06:53 View session

Copilot AI reviewed Dec 8, 2025

View reviewed changes

dkurepa added 7 commits December 8, 2025 09:40

improve things a bit

3a8ae50

CR changes, fix test

1b0eed2

Fix a bug, add tests

9de09ee

Ignore cleanup errors

5ecd5e7

remove unused things

7eb187c

Use the real repoFactory

177066c

remove more useless stuff

feeedff

dkurepa changed the title ~~Make darc add-subscriptiojn work with the new config repo~~ Make darc add-subscription work with the new config repo Dec 8, 2025

premun reviewed Dec 8, 2025

View reviewed changes

dkurepa and others added 5 commits December 8, 2025 16:14

Update src/Microsoft.DotNet.Darc/Darc/Options/ConfigurationManagement…

1283350

…CommandLineOptions.cs Co-authored-by: Přemek Vysoký <[email protected]>

Update src/Microsoft.DotNet.Darc/Darc/Options/ConfigurationManagement…

fc5b015

…CommandLineOptions.cs Co-authored-by: Přemek Vysoký <[email protected]>

Update src/Microsoft.DotNet.Darc/Darc/Options/ConfigurationManagement…

3d4370c

…CommandLineOptions.cs Co-authored-by: Přemek Vysoký <[email protected]>

Cr changes

2c43a33

Cr change

7f5ebdd

premun previously approved these changes Dec 9, 2025

View reviewed changes

fix the tests

5ec7b89

dkurepa dismissed premun’s stale review via 5ec7b89 December 9, 2025 10:44

dkurepa added 2 commits December 9, 2025 11:47

Update deps one more time

2afbc66

one more test

176ffc4

premun previously approved these changes Dec 9, 2025

View reviewed changes

adamzip reviewed Dec 9, 2025

View reviewed changes

CR changes

6664475

premun reviewed Dec 10, 2025

View reviewed changes

Remove yaml models from DarcLib, Start implementing the Configuration…

8c1475c

…RepositoryManager

dkurepa dismissed premun’s stale review via 8c1475c December 10, 2025 16:09

Rename method

b87ff42

premun reviewed Dec 10, 2025

View reviewed changes

dkurepa added 3 commits December 10, 2025 17:32

Fix tests

95844fe

Cr changes, change API

4f22bea

fix the build

78b236f

	await WriteConfigurationDataAsync(
	await CommitConfigurationChangesAsync(

	throw new ArgumentException($"The configuration repository '{_options.ConfigurationRepository}' is not a valid git repository.");
	throw new ArgumentException($"ConfigurationRepository must be a valid URI to a remote git repository, or a path to a git repository on disk.");

Make darc add-subscription work with the new config repo #5627

Are you sure you want to change the base?

Make darc add-subscription work with the new config repo #5627

Uh oh!

Conversation

dkurepa commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

premun commented Dec 9, 2025

Uh oh!

dkurepa commented Dec 9, 2025

Uh oh!

premun commented Dec 9, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dkurepa Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

premun Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dkurepa Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Make `darc add-subscription` work with the new config repo #5627

Make `darc add-subscription` work with the new config repo #5627

dkurepa commented Dec 8, 2025 •

edited

Loading

dkurepa Dec 10, 2025 •

edited

Loading

premun Dec 10, 2025 •

edited

Loading

dkurepa Dec 10, 2025 •

edited

Loading