Fixes to life cycle commands state (#9149)

Author: JamesNK

src/Aspire.Hosting/ApplicationModel/CommandsConfigurationExtensions.cs

@@ -29,7 +29,7 @@ internal static void AddLifeCycleCommands(this IResource resource)
             updateState: context =>
             {
                 var state = context.ResourceSnapshot.State?.Text;
-                if (IsStarting(state) || IsRuntimeUnhealthy(state))
+                if (IsStarting(state) || IsRuntimeUnhealthy(state) || HasNoState(state))
                 {
                     return ResourceCommandState.Disabled;
                 }
@@ -66,7 +66,7 @@ internal static void AddLifeCycleCommands(this IResource resource)
                 {
                     return ResourceCommandState.Disabled;
                 }
-                else if (!IsStopped(state) && !IsStarting(state) && !IsWaiting(state) && !IsRuntimeUnhealthy(state) && context.ResourceSnapshot.State is not null)
+                else if (!IsStopped(state) && !IsStarting(state) && !IsWaiting(state) && !IsRuntimeUnhealthy(state) && !HasNoState(state))
                 {
                     return ResourceCommandState.Enabled;
                 }
@@ -96,7 +96,7 @@ internal static void AddLifeCycleCommands(this IResource resource)
             updateState: context =>
             {
                 var state = context.ResourceSnapshot.State?.Text;
-                if (IsStarting(state) || IsStopping(state) || IsStopped(state) || IsWaiting(state) || IsRuntimeUnhealthy(state) || context.ResourceSnapshot.State is null)
+                if (IsStarting(state) || IsStopping(state) || IsStopped(state) || IsWaiting(state) || IsRuntimeUnhealthy(state) || HasNoState(state))
                 {
                     return ResourceCommandState.Disabled;
                 }
@@ -119,5 +119,6 @@ internal static void AddLifeCycleCommands(this IResource resource)
         static bool IsStarting(string? state) => state == KnownResourceStates.Starting;
         static bool IsWaiting(string? state) => state == KnownResourceStates.Waiting;
         static bool IsRuntimeUnhealthy(string? state) => state == KnownResourceStates.RuntimeUnhealthy;
+        static bool HasNoState(string? state) => string.IsNullOrEmpty(state);
     }
 }

tests/Aspire.Hosting.Tests/ResourceCommandAnnotationTests.cs

@@ -19,6 +19,8 @@ public class ResourceCommandAnnotationTests
     [InlineData(KnownResourceCommands.StartCommand, "Unknown", ResourceCommandState.Enabled)]
     [InlineData(KnownResourceCommands.StartCommand, "Waiting", ResourceCommandState.Enabled)]
     [InlineData(KnownResourceCommands.StartCommand, "RuntimeUnhealthy", ResourceCommandState.Disabled)]
+    [InlineData(KnownResourceCommands.StartCommand, "", ResourceCommandState.Disabled)]
+    [InlineData(KnownResourceCommands.StartCommand, null, ResourceCommandState.Disabled)]
     [InlineData(KnownResourceCommands.StopCommand, "Starting", ResourceCommandState.Hidden)]
     [InlineData(KnownResourceCommands.StopCommand, "Stopping", ResourceCommandState.Disabled)]
     [InlineData(KnownResourceCommands.StopCommand, "Running", ResourceCommandState.Enabled)]
@@ -28,6 +30,8 @@ public class ResourceCommandAnnotationTests
     [InlineData(KnownResourceCommands.StopCommand, "Unknown", ResourceCommandState.Hidden)]
     [InlineData(KnownResourceCommands.StopCommand, "Waiting", ResourceCommandState.Hidden)]
     [InlineData(KnownResourceCommands.StopCommand, "RuntimeUnhealthy", ResourceCommandState.Hidden)]
+    [InlineData(KnownResourceCommands.StopCommand, "", ResourceCommandState.Hidden)]
+    [InlineData(KnownResourceCommands.StopCommand, null, ResourceCommandState.Hidden)]
     [InlineData(KnownResourceCommands.RestartCommand, "Starting", ResourceCommandState.Disabled)]
     [InlineData(KnownResourceCommands.RestartCommand, "Stopping", ResourceCommandState.Disabled)]
     [InlineData(KnownResourceCommands.RestartCommand, "Running", ResourceCommandState.Enabled)]
@@ -37,7 +41,9 @@ public class ResourceCommandAnnotationTests
     [InlineData(KnownResourceCommands.RestartCommand, "Unknown", ResourceCommandState.Disabled)]
     [InlineData(KnownResourceCommands.RestartCommand, "Waiting", ResourceCommandState.Disabled)]
     [InlineData(KnownResourceCommands.RestartCommand, "RuntimeUnhealthy", ResourceCommandState.Disabled)]
-    public void LifeCycleCommands_CommandState(string commandName, string resourceState, ResourceCommandState commandState)
+    [InlineData(KnownResourceCommands.RestartCommand, "", ResourceCommandState.Disabled)]
+    [InlineData(KnownResourceCommands.RestartCommand, null, ResourceCommandState.Disabled)]
+    public void LifeCycleCommands_CommandState(string commandName, string? resourceState, ResourceCommandState commandState)
     {
         // Arrange
         var builder = DistributedApplication.CreateBuilder();