[Rollout] Production rollout 2025-02-05 part II (#4423)

#4416

Author: premun

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

@@ -28,19 +28,9 @@ public override Operation GetOperation(ServiceProvider sp)
 public abstract class CommandLineOptions : ICommandLineOptions
 {
     [Option('p', "password",
-        HelpText = "[DEPRECATED] Token used to authenticate to BAR. Please use Azure CLI or an interactive browser login flow.")]
+        HelpText = "Token used to authenticate to BAR. When omitted, Azure CLI or an interactive browser login flow are used.")]
     [RedactFromLogging]
-    public string BuildAssetRegistryToken
-    {
-        get => null;
-        set
-        {
-            if (!string.IsNullOrEmpty(value))
-            {
-                Console.WriteLine("The --password option is deprecated. Please use Azure CLI or an interactive browser login flow.");
-            }
-        }
-    }
+    public string BuildAssetRegistryToken { get; set; } = null;
 
     [Option("github-pat", HelpText = "Token used to authenticate GitHub.")]
     [RedactFromLogging]

src/ProductConstructionService/ProductConstructionService.WorkItems/WorkItemProcessorState.cs

@@ -69,14 +69,7 @@ public async Task SetStoppedIfStoppingAsync()
         }
     }
 
-    public async Task InitializationFinished()
-    {
-        var status = await _stateCache.GetStateAsync();
-        if (!string.IsNullOrEmpty(status) && status == Initializing)
-        {
-            await _stateCache.SetStateAsync(Stopped);
-        }
-    }
+    public async Task InitializationFinished() => await SetStartAsync();
 
     public async Task FinishWorkItemAndStopAsync()
     {
@@ -89,6 +82,6 @@ public async Task FinishWorkItemAndStopAsync()
 
     public async Task<string> GetStateAsync()
     {
-        return await _stateCache.GetStateAsync() ?? Stopped;
+        return await _stateCache.GetStateAsync() ?? Working;
     }
 }

test/ProductConstructionService.WorkItem.Tests/WorkItemsProcessorScopeManagerTests.cs

@@ -55,7 +55,8 @@ public async Task WorkItemsProcessorStatusNormalFlow()
 
         // Initialization is done
         await _state.InitializationFinished();
-        (await _state.GetStateAsync()).Should().Be(WorkItemProcessorState.Stopped);
+        (await _state.GetStateAsync()).Should().Be(WorkItemProcessorState.Working);
+        await _state.FinishWorkItemAndStopAsync();
 
         TaskCompletionSource workItemCompletion1 = new();
         TaskCompletionSource workItemCompletion2 = new();
@@ -121,13 +122,10 @@ public async Task WorkItemsProcessorMultipleStopFlow()
 
         await _state.InitializationFinished();
         // The workItems processor should start in a stopped state
-        (await _state.GetStateAsync()).Should().Be(WorkItemProcessorState.Stopped);
+        (await _state.GetStateAsync()).Should().Be(WorkItemProcessorState.Working);
 
         await _state.FinishWorkItemAndStopAsync();
 
-        // We were already stopped, so we should continue to be so
-        (await _state.GetStateAsync()).Should().Be(WorkItemProcessorState.Stopped);
-
         TaskCompletionSource workItemCompletion = new();
 
         // Start a new workItem that should get blocked
@@ -157,7 +155,7 @@ public async Task WorkItemsProcessorMultipleStartStop()
         await _state.SetInitializingAsync();
         await _state.InitializationFinished();
 
-        (await _state.GetStateAsync()).Should().Be(WorkItemProcessorState.Stopped);
+        (await _state.GetStateAsync()).Should().Be(WorkItemProcessorState.Working);
 
         // Start the WorkItemsProcessor multiple times in a row
         await _state.SetStartAsync();