Add -Environment and make -ProjectName optional for catlet name lookups

src/Eryph.ComputeClient.Commands/Catlets/CatletCmdLet.cs

@@ -1,16 +1,53 @@
-using Eryph.ComputeClient.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Eryph.ComputeClient.Models;
 using JetBrains.Annotations;
 
 namespace Eryph.ComputeClient.Commands.Catlets
 {
     [PublicAPI]
     public abstract class CatletCmdLet : ComputeCmdLet
     {
+        /// <summary>Resource kind used in catlet not-found / ambiguity messages.</summary>
+        protected const string CatletResourceKind = "catlet";
+
+        /// <summary>
+        /// Hint shown when a catlet name is ambiguous, naming the parameter that
+        /// disambiguates it (a catlet name is unique only per project + environment).
+        /// </summary>
+        protected const string EnvironmentAmbiguityHint = "-Environment";
+
+        /// <summary>
+        /// The <see cref="EnvironmentAmbiguityHint"/>, but only when <paramref name="environment"/>
+        /// was not already supplied. Once -Environment has been applied it did not resolve the
+        /// ambiguity, so suggesting it again would be misleading; return null in that case.
+        /// </summary>
+        protected static string EnvironmentHintIfUnset(string environment) =>
+            string.IsNullOrWhiteSpace(environment) ? EnvironmentAmbiguityHint : null;
+
         protected Catlet GetSingleCatlet(string id)
         {
             return Factory.CreateCatletsClient().Get(id);
         }
 
+        /// <summary>
+        /// Lists the catlets of a project, optionally narrowed to a single environment.
+        /// A catlet's name is unique only per project + environment, so a lookup by name
+        /// can match several catlets across environments; passing an environment restricts
+        /// the listing to that environment (case-insensitive exact match). An empty/null
+        /// environment applies no filter and lists every environment. As the server has no
+        /// environment filter, this is applied client-side, mirroring Get-VNetwork and
+        /// Get-CatletDisk. An explicit id (a GUID) bypasses this listing entirely.
+        /// </summary>
+        protected IEnumerable<Catlet> ListCatlets(string projectId, string environment)
+        {
+            IEnumerable<Catlet> catlets = Factory.CreateCatletsClient().List(projectId: projectId);
+            if (!string.IsNullOrWhiteSpace(environment))
+                catlets = catlets.Where(c => string.Equals(c.Environment, environment, StringComparison.OrdinalIgnoreCase));
+            return catlets;
+        }
+
         protected void WaitForOperation(
             Operation operation,
             bool noWait,

src/Eryph.ComputeClient.Commands/Catlets/CatletGuestServiceGetCmdlet.cs

@@ -33,6 +33,10 @@ public abstract class CatletGuestServiceGetCmdlet : CatletCmdLet
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter(ParameterSetName = "list")]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         protected override void BeginProcessing()
         {
             base.BeginProcessing();
@@ -46,7 +50,7 @@ protected override void ProcessRecord()
                 foreach (var id in Id)
                 {
                     if (Stopping) break;
-                    if (TryGetById(id, GetSingleCatlet, "catlet", out var catlet))
+                    if (TryGetById(id, GetSingleCatlet, CatletResourceKind, out var catlet))
                         EmitCatlet(catlet);
                 }
 
@@ -59,9 +63,9 @@ protected override void ProcessRecord()
             WriteByNameOrId(
                 Name,
                 GetSingleCatlet,
-                () => Factory.CreateCatletsClient().List(projectId: projectId),
+                () => ListCatlets(projectId, Environment),
                 catlet => catlet.Name,
-                "catlet",
+                CatletResourceKind,
                 EmitCatlet);
         }
 

src/Eryph.ComputeClient.Commands/Catlets/GetCatletCommand.cs

@@ -46,6 +46,10 @@ public class GetCatletCommand : CatletCmdLet
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
+        [Parameter(ParameterSetName = "list")]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         protected override void ProcessRecord()
         {
 
@@ -57,12 +61,12 @@ protected override void ProcessRecord()
 
                     if (Config.IsPresent)
                     {
-                        if (TryGetById(id, i => Factory.CreateCatletsClient().GetConfig(i), "catlet", out var config))
+                        if (TryGetById(id, i => Factory.CreateCatletsClient().GetConfig(i), CatletResourceKind, out var config))
                             WriteConfig(config);
                     }
                     else
                     {
-                        if (TryGetById(id, GetSingleCatlet, "catlet", out var catlet))
+                        if (TryGetById(id, GetSingleCatlet, CatletResourceKind, out var catlet))
                             WriteObject(catlet);
                     }
                 }
@@ -90,9 +94,9 @@ protected override void ProcessRecord()
             WriteByNameOrId(
                 Name,
                 GetSingleCatlet,
-                () => Factory.CreateCatletsClient().List(projectId: projectId),
+                () => ListCatlets(projectId, Environment),
                 catlet => catlet.Name,
-                "catlet");
+                CatletResourceKind);
         }
 
         private void WriteConfig(CatletConfiguration config)

src/Eryph.ComputeClient.Commands/Catlets/GetCatletIpCommand.cs

@@ -29,6 +29,10 @@ public class GetCatletIpCommand : CatletCmdLet
     [ValidateNotNullOrEmpty]
     public string ProjectName { get; set; }
 
+    [Parameter(ParameterSetName = "list")]
+    [ValidateNotNullOrEmpty]
+    public string Environment { get; set; }
+
     [Parameter]
     public SwitchParameter InternalIp { get; set; }
 
@@ -42,7 +46,7 @@ protected override void ProcessRecord()
             foreach (var id in Id)
             {
                 if (Stopping) break;
-                if (TryGetById(id, GetSingleCatlet, "catlet", out var catlet))
+                if (TryGetById(id, GetSingleCatlet, CatletResourceKind, out var catlet))
                     WriteIp(catlet);
             }
 
@@ -55,9 +59,9 @@ protected override void ProcessRecord()
         WriteByNameOrId(
             Name,
             GetSingleCatlet,
-            () => Factory.CreateCatletsClient().List(projectId: projectId),
+            () => ListCatlets(projectId, Environment),
             catlet => catlet.Name,
-            "catlet",
+            CatletResourceKind,
             WriteIp);
     }
 

src/Eryph.ComputeClient.Commands/Catlets/GetCatletProvisioningLogCommand.cs

@@ -38,6 +38,10 @@ public class GetCatletProvisioningLogCommand : CatletCmdLet
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter(ParameterSetName = "list")]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         /// <summary>
         /// Emit the rendered, human-readable text log instead of the structured events.
         /// </summary>
@@ -57,7 +61,7 @@ protected override void ProcessRecord()
                 foreach (var id in Id)
                 {
                     if (Stopping) break;
-                    if (TryGetById(id, GetSingleCatlet, "catlet", out var catlet))
+                    if (TryGetById(id, GetSingleCatlet, CatletResourceKind, out var catlet))
                         EmitLog(catlet);
                 }
 
@@ -70,9 +74,9 @@ protected override void ProcessRecord()
             WriteByNameOrId(
                 Name,
                 GetSingleCatlet,
-                () => Factory.CreateCatletsClient().List(projectId: projectId),
+                () => ListCatlets(projectId, Environment),
                 catlet => catlet.Name,
-                "catlet",
+                CatletResourceKind,
                 EmitLog);
         }
 
@@ -92,7 +96,7 @@ private void EmitLog(Catlet catlet)
                 // Prefix a header so the text blocks stay attributable to their catlet
                 // when several catlets are targeted in one invocation.
                 var header = $"# Catlet {catlet.Name} ({catlet.Id})";
-                WriteObject(header + Environment.NewLine + result.RenderedLog);
+                WriteObject(header + System.Environment.NewLine + result.RenderedLog);
                 return;
             }
 

src/Eryph.ComputeClient.Commands/Catlets/GetCatletProvisioningStatusCommand.cs

@@ -35,6 +35,10 @@ public class GetCatletProvisioningStatusCommand : CatletCmdLet
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter(ParameterSetName = "list")]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         protected override void BeginProcessing()
         {
             base.BeginProcessing();
@@ -48,7 +52,7 @@ protected override void ProcessRecord()
                 foreach (var id in Id)
                 {
                     if (Stopping) break;
-                    if (TryGetById(id, GetSingleCatlet, "catlet", out var catlet))
+                    if (TryGetById(id, GetSingleCatlet, CatletResourceKind, out var catlet))
                         WriteStatus(catlet);
                 }
 
@@ -61,9 +65,9 @@ protected override void ProcessRecord()
             WriteByNameOrId(
                 Name,
                 GetSingleCatlet,
-                () => Factory.CreateCatletsClient().List(projectId: projectId),
+                () => ListCatlets(projectId, Environment),
                 catlet => catlet.Name,
-                "catlet",
+                CatletResourceKind,
                 WriteStatus);
         }
 

src/Eryph.ComputeClient.Commands/Catlets/RemoveCatletCommand.cs

@@ -55,6 +55,10 @@ public SwitchParameter NoWait
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         private bool _force;
         private bool _nowait;
         private bool _passThru;
@@ -68,7 +72,7 @@ protected override void ProcessRecord()
             foreach (var nameOrId in Id)
             {
                 foreach (var catlet in ResolveActionTargets(nameOrId, ProjectName, GetSingleCatlet,
-                             projectId => Factory.CreateCatletsClient().List(projectId: projectId), c => c.Name, "catlet"))
+                             projectId => ListCatlets(projectId, Environment), c => c.Name, CatletResourceKind, EnvironmentHintIfUnset(Environment)))
                 {
                     if (Stopping) break;
 

src/Eryph.ComputeClient.Commands/Catlets/RemoveCatletGuestServiceAccessKeyCommand.cs

@@ -23,6 +23,10 @@ public class RemoveCatletGuestServiceAccessKeyCommand : CatletCmdLet
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         [Parameter]
         public SwitchParameter Force
         {
@@ -64,7 +68,7 @@ protected override void ProcessRecord()
             foreach (var nameOrId in Id)
             {
                 foreach (var catlet in ResolveActionTargets(nameOrId, ProjectName, GetSingleCatlet,
-                             projectId => Factory.CreateCatletsClient().List(projectId: projectId), c => c.Name, "catlet"))
+                             projectId => ListCatlets(projectId, Environment), c => c.Name, CatletResourceKind, EnvironmentHintIfUnset(Environment)))
                 {
                     if (Stopping) break;
 

src/Eryph.ComputeClient.Commands/Catlets/SetCatletGuestServiceConfigCommand.cs

@@ -23,6 +23,10 @@ public class SetCatletGuestServiceConfigCommand : CatletCmdLet
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         /// <summary>
         /// Shell command for interactive SSH sessions. An empty string clears the
         /// override; omitting the parameter leaves the current value unchanged.
@@ -84,7 +88,7 @@ protected override void ProcessRecord()
             foreach (var nameOrId in Id)
             {
                 foreach (var catlet in ResolveActionTargets(nameOrId, ProjectName, GetSingleCatlet,
-                             projectId => Factory.CreateCatletsClient().List(projectId: projectId), c => c.Name, "catlet"))
+                             projectId => ListCatlets(projectId, Environment), c => c.Name, CatletResourceKind, EnvironmentHintIfUnset(Environment)))
                 {
                     if (Stopping) break;
 

src/Eryph.ComputeClient.Commands/Catlets/StartCatletCommand.cs

@@ -44,6 +44,10 @@ public SwitchParameter NoWait
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         private bool _force;
         private bool _nowait;
         private bool _yesToAll, _noToAll;
@@ -54,7 +58,7 @@ protected override void ProcessRecord()
             foreach (var nameOrId in Id)
             {
                 foreach (var catlet in ResolveActionTargets(nameOrId, ProjectName, GetSingleCatlet,
-                             projectId => Factory.CreateCatletsClient().List(projectId: projectId), c => c.Name, "catlet"))
+                             projectId => ListCatlets(projectId, Environment), c => c.Name, CatletResourceKind, EnvironmentHintIfUnset(Environment)))
                 {
                     if (Stopping) break;
 

src/Eryph.ComputeClient.Commands/Catlets/StopCatletCommand.cs

@@ -37,6 +37,10 @@ public class StopCatletCommand : CatletCmdLet
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         private bool _yesToAll;
         private bool _noToAll;
         private bool _yesToKillAll;
@@ -55,7 +59,7 @@ protected override void ProcessRecord()
             foreach (var nameOrId in Id)
             {
                 foreach (var catlet in ResolveActionTargets(nameOrId, ProjectName, GetSingleCatlet,
-                             projectId => Factory.CreateCatletsClient().List(projectId: projectId), c => c.Name, "catlet"))
+                             projectId => ListCatlets(projectId, Environment), c => c.Name, CatletResourceKind, EnvironmentHintIfUnset(Environment)))
                 {
                     if (Stopping) break;
 

src/Eryph.ComputeClient.Commands/Catlets/UpdateCatletCommand.cs

@@ -31,14 +31,18 @@ public class UpdateCatletCommand : CatletConfigCmdlet
         [ValidateNotNullOrEmpty]
         public string ProjectName { get; set; }
 
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string Environment { get; set; }
+
         protected override void ProcessRecord()
         {
             var client = Factory.CreateCatletsClient();
 
             foreach (var nameOrId in Id)
             {
                 foreach (var catlet in ResolveActionTargets(nameOrId, ProjectName, GetSingleCatlet,
-                             projectId => client.List(projectId: projectId), c => c.Name, "catlet"))
+                             projectId => ListCatlets(projectId, Environment), c => c.Name, CatletResourceKind, EnvironmentHintIfUnset(Environment)))
                 {
                     if (Stopping) break;