Add darc vmr add-repo and remove-repo commands (#5415)

Author: Copilot

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/AddRepoOperation.cs

@@ -0,0 +1,109 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Maestro.Common;
+using Microsoft.DotNet.Darc.Helpers;
+using Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
+using Microsoft.DotNet.DarcLib.Helpers;
+using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
+using Microsoft.DotNet.DarcLib.VirtualMonoRepo;
+using Microsoft.Extensions.Logging;
+
+#nullable enable
+namespace Microsoft.DotNet.Darc.Operations.VirtualMonoRepo;
+
+internal class AddRepoOperation : Operation
+{
+    private readonly AddRepoCommandLineOptions _options;
+    private readonly IVmrInitializer _vmrInitializer;
+    private readonly IVmrInfo _vmrInfo;
+    private readonly ILogger<AddRepoOperation> _logger;
+
+    public AddRepoOperation(
+        AddRepoCommandLineOptions options,
+        IVmrInitializer vmrInitializer,
+        IVmrInfo vmrInfo,
+        ILogger<AddRepoOperation> logger)
+    {
+        _options = options;
+        _vmrInitializer = vmrInitializer;
+        _vmrInfo = vmrInfo;
+        _logger = logger;
+    }
+
+    public override async Task<int> ExecuteAsync()
+    {
+        var repositories = _options.Repositories.ToList();
+
+        if (!repositories.Any())
+        {
+            _logger.LogError("Please specify at least one repository to add");
+            return Constants.ErrorCode;
+        }
+
+        // Repository names are in the form of URI:REVISION where URI is the git repository URL
+        // and REVISION is a git ref (commit SHA, branch, or tag)
+        foreach (var repository in repositories)
+        {
+            var parts = repository.Split(':', 2);
+            if (parts.Length != 2)
+            {
+                _logger.LogError("Repository '{repository}' must be in the format URI:REVISION", repository);
+                return Constants.ErrorCode;
+            }
+
+            string uri = parts[0];
+            string revision = parts[1];
+
+            // For URIs starting with https://, we need to reconstruct the full URI
+            // since the split on ':' would have separated it
+            if (uri == "https" || uri == "http")
+            {
+                // The original input had a URI with protocol, find the last : to split properly
+                int lastColonIndex = repository.LastIndexOf(':');
+                if (lastColonIndex <= uri.Length + 2) // +2 for "://"
+                {
+                    _logger.LogError("Repository '{repository}' must be in the format URI:REVISION", repository);
+                    return Constants.ErrorCode;
+                }
+                
+                uri = repository.Substring(0, lastColonIndex);
+                revision = repository.Substring(lastColonIndex + 1);
+            }
+
+            try
+            {
+                // Extract repo name from URI
+                var (repoName, _) = GitRepoUrlUtils.GetRepoNameAndOwner(uri);
+
+                var sourceMappingsPath = _vmrInfo.VmrPath / VmrInfo.DefaultRelativeSourceMappingsPath;
+
+                await _vmrInitializer.InitializeRepository(
+                    repoName,
+                    revision,
+                    uri,
+                    sourceMappingsPath,
+                    new CodeFlowParameters(
+                        Array.Empty<AdditionalRemote>(),
+                        VmrInfo.ThirdPartyNoticesFileName,
+                        GenerateCodeOwners: false,
+                        GenerateCredScanSuppressions: true),
+                    CancellationToken.None);
+
+                _logger.LogInformation("Successfully added repository '{repoName}' from '{uri}' at revision '{revision}'", repoName, uri, revision);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to add repository from '{uri}'", uri);
+                return Constants.ErrorCode;
+            }
+        }
+
+        return Constants.SuccessCode;
+    }
+}

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/InitializeOperation.cs renamed to src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/RemoveRepoOperation.cs

@@ -5,27 +5,26 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
-using Microsoft.DotNet.DarcLib.Helpers;
 using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
 using Microsoft.DotNet.DarcLib.VirtualMonoRepo;
 using Microsoft.Extensions.Logging;
 
 #nullable enable
 namespace Microsoft.DotNet.Darc.Operations.VirtualMonoRepo;
 
-internal class InitializeOperation : VmrOperationBase
+internal class RemoveRepoOperation : VmrOperationBase
 {
-    private readonly InitializeCommandLineOptions _options;
-    private readonly IVmrInitializer _vmrInitializer;
+    private readonly RemoveRepoCommandLineOptions _options;
+    private readonly IVmrRemover _vmrRemover;
 
-    public InitializeOperation(
-        InitializeCommandLineOptions options,
-        IVmrInitializer vmrInitializer,
-        ILogger<InitializeOperation> logger)
+    public RemoveRepoOperation(
+        RemoveRepoCommandLineOptions options,
+        IVmrRemover vmrRemover,
+        ILogger<RemoveRepoOperation> logger)
         : base(options, logger)
     {
         _options = options;
-        _vmrInitializer = vmrInitializer;
+        _vmrRemover = vmrRemover;
     }
 
     protected override async Task ExecuteInternalAsync(
@@ -34,15 +33,13 @@ protected override async Task ExecuteInternalAsync(
         IReadOnlyCollection<AdditionalRemote> additionalRemotes,
         CancellationToken cancellationToken)
     {
-        await _vmrInitializer.InitializeRepository(
+        await _vmrRemover.RemoveRepository(
             repoName,
-            targetRevision,
-            new NativePath(_options.SourceMappings),
             new CodeFlowParameters(
                 additionalRemotes,
-                _options.TpnTemplate,
-                _options.GenerateCodeowners,
-                _options.GenerateCredScanSuppressions),
+                VmrInfo.ThirdPartyNoticesFileName,
+                GenerateCodeOwners: false,
+                GenerateCredScanSuppressions: true),
             cancellationToken);
     }
 }

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/AddRepoCommandLineOptions.cs

@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using CommandLine;
+using Microsoft.DotNet.Darc.Operations.VirtualMonoRepo;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
+
+[Verb("add-repo", HelpText = "Adds new repo(s) to the VMR that haven't been synchronized yet.")]
+internal class AddRepoCommandLineOptions : VmrCommandLineOptions<AddRepoOperation>, IBaseVmrCommandLineOptions
+{
+    [Value(0, Required = true, HelpText =
+        "Repository URIs in the form of URI:REVISION where URI is the git repository URL (e.g., https://github.com/dotnet/runtime) and REVISION is a commit SHA or other git reference (branch, tag).")]
+    public IEnumerable<string> Repositories { get; set; }
+
+    // Required by IBaseVmrCommandLineOptions but not used for this command
+    public IEnumerable<string> AdditionalRemotes { get; set; } = [];
+
+    public override IServiceCollection RegisterServices(IServiceCollection services)
+    {
+        if (!Verbose && !Debug)
+        {
+            // Force verbose output for these commands
+            Verbose = true;
+        }
+
+        return base.RegisterServices(services);
+    }
+}

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/InitializeCommandLineOptions.cs

@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using CommandLine;
+using Microsoft.DotNet.Darc.Operations.VirtualMonoRepo;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
+
+[Verb("remove-repo", HelpText = "Removes repo(s) from the VMR.")]
+internal class RemoveRepoCommandLineOptions : VmrCommandLineOptions<RemoveRepoOperation>, IBaseVmrCommandLineOptions
+{
+    [Value(0, Required = true, HelpText = "Repository names to remove from the VMR.")]
+    public IEnumerable<string> Repositories { get; set; }
+
+    // Required by IBaseVmrCommandLineOptions but not used for this command
+    public IEnumerable<string> AdditionalRemotes { get; set; } = [];
+
+    public override IServiceCollection RegisterServices(IServiceCollection services)
+    {
+        if (!Verbose && !Debug)
+        {
+            // Force verbose output for these commands
+            Verbose = true;
+        }
+
+        return base.RegisterServices(services);
+    }
+}

src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/RemoveRepoCommandLineOptions.cs

@@ -145,7 +145,8 @@ public static Type[] GetOptions() =>
     // These are under the "vmr" subcommand
     public static Type[] GetVmrOptions() =>
     [
-        typeof(InitializeCommandLineOptions),
+        typeof(AddRepoCommandLineOptions),
+        typeof(RemoveRepoCommandLineOptions),
         typeof(BackflowCommandLineOptions),
         typeof(ForwardFlowCommandLineOptions),
         typeof(CherryPickCommandLineOptions),

src/Microsoft.DotNet.Darc/Darc/Program.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 #nullable enable
 namespace Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
@@ -44,7 +45,9 @@ public class SourceMappingSetting
     public string? DefaultRef { get; set; }
     public string[]? Include { get; set; }
     public string[]? Exclude { get; set; }
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
     public bool IgnoreDefaults { get; set; }
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
     public bool DisableSynchronization { get; set; }
 }
 

src/Microsoft.DotNet.Darc/DarcLib/Models/VirtualMonoRepo/SourceMappingFile.cs

@@ -16,11 +16,13 @@ public interface IVmrInitializer
     /// </summary>
     /// <param name="mappingName">Name of a repository mapping</param>
     /// <param name="targetRevision">Revision (commit SHA, branch, tag..) onto which to synchronize, leave empty for HEAD</param>
+    /// <param name="remoteUri">Remote URI of the repository (optional, will default to https://github.com/dotnet/{mappingName})</param>
     /// <param name="sourceMappingsPath">Path to the source-mappings.json file</param>
     /// <param name="codeFlowParameters">Record containing parameters for VMR initialization</param>
     Task InitializeRepository(
         string mappingName,
         string? targetRevision,
+        string? remoteUri,
         LocalPath sourceMappingsPath,
         CodeFlowParameters codeFlowParameters,
         CancellationToken cancellationToken);

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/IVmrInitializer.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
+
+#nullable enable
+namespace Microsoft.DotNet.DarcLib.VirtualMonoRepo;
+
+public interface IVmrRemover
+{
+    /// <summary>
+    /// Removes a repository from the VMR.
+    /// </summary>
+    /// <param name="mappingName">Name of a repository mapping</param>
+    /// <param name="codeFlowParameters">Record containing parameters for VMR operations</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    Task RemoveRepository(
+        string mappingName,
+        CodeFlowParameters codeFlowParameters,
+        CancellationToken cancellationToken);
+}