Giuliov/issue 142 (#143)

* first attempt

* fix test

* Check if mapping was deleted (#142)

* review exit codes

Author: giuliov

src/aggregator-cli/CommandBase.cs

@@ -43,15 +43,18 @@ internal int Run(CancellationToken cancellationToken)
                 t.Wait(cancellationToken);
                 cancellationToken.ThrowIfCancellationRequested();
                 int rc = t.Result;
-                if (rc != 0)
+                if (rc == ExitCodes.Success)
                 {
-                    Logger.WriteError("Failed!");
+                    Logger.WriteSuccess("Succeeded");
+                }
+                else if (rc == ExitCodes.NotFound)
+                {
+                    Logger.WriteWarning("Not found");
                 }
                 else
                 {
-                    Logger.WriteSuccess("Succeeded");
+                    Logger.WriteError("Failed!");
                 }
-
                 return rc;
             }
             catch (Exception ex)
@@ -61,7 +64,7 @@ internal int Run(CancellationToken cancellationToken)
                     ? ex.Message
                     : ex.InnerException.Message
                     );
-                return 99;
+                return ExitCodes.Unexpected;
             }
         }
 

src/aggregator-cli/ExitCodes.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace aggregator.cli
+{
+    internal static class ExitCodes
+    {
+        public const int Success = 0;
+        public const int Failure = 1;
+        public const int InvalidArguments = 2;
+        public const int NotFound = 3;
+        public const int Unexpected = 99;
+    }
+}

src/aggregator-cli/Instances/ConfigureInstanceCommand.cs

@@ -36,16 +36,16 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
                 .BuildAsync(cancellationToken);
             var instances = new AggregatorInstances(context.Azure, context.Logger, context.Naming);
             var instance = context.Naming.Instance(Name, ResourceGroup);
-            bool ok = false;
             if (Authentication)
             {
-                ok = await instances.ChangeAppSettingsAsync(instance, Location, SaveMode, cancellationToken);
-            } else
+                bool ok = await instances.ChangeAppSettingsAsync(instance, Location, SaveMode, cancellationToken);
+                return ok ? ExitCodes.Success : ExitCodes.Failure;
+            }
+            else
             {
                 context.Logger.WriteError($"Unsupported command option(s)");
+                return ExitCodes.InvalidArguments;
             }
-
-            return ok ? 0 : 1;
         }
     }
-}
+}

src/aggregator-cli/Instances/InstallInstanceCommand.cs

@@ -44,12 +44,12 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
             if (!validHostingPlanSkus.Contains(HostingPlanSku))
             {
                 Logger.WriteError($"Invalid value for hostingPlanSku: must be one of {String.Join(",", validHostingPlanSkus)}");
-                return 2;
+                return ExitCodes.InvalidArguments;
             }
             if (!validHostingPlanTiers.Contains(HostingPlanTier))
             {
                 Logger.WriteError($"Invalid value for hostingPlanTier: must be one of {String.Join(",", validHostingPlanTiers)}");
-                return 2;
+                return ExitCodes.InvalidArguments;
             }
             var tuning = new AggregatorInstances.InstanceFineTuning
             {
@@ -65,7 +65,7 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
             var instances = new AggregatorInstances(context.Azure, context.Logger, context.Naming);
             var instance = context.Naming.GetInstanceCreateNames(Name, ResourceGroup);
             bool ok = await instances.AddAsync(instance, Location, RequiredVersion, SourceUrl, tuning, cancellationToken);
-            return ok ? 0 : 1;
+            return ok ? ExitCodes.Success : ExitCodes.Failure;
         }
     }
 }

src/aggregator-cli/Instances/ListInstancesCommand.cs

@@ -50,7 +50,7 @@ private async Task<int> ListByLocationAsync(CommandContext context, AggregatorIn
             {
                 context.Logger.WriteInfo($"No aggregator instances found in {Location} Region.");
             }
-            return 0;
+            return ExitCodes.Success;
         }
 
         private async Task<int> ListInResourceGroupAsync(CommandContext context, AggregatorInstances instances, CancellationToken cancellationToken)
@@ -68,7 +68,7 @@ private async Task<int> ListInResourceGroupAsync(CommandContext context, Aggrega
                 context.Logger.WriteInfo($"No aggregator instances found in {ResourceGroup} Resource Group.");
             }
 
-            return 0;
+            return ExitCodes.Success;
         }
 
         private static async Task<int> ListAllAsync(CommandContext context, AggregatorInstances instances, CancellationToken cancellationToken)
@@ -80,13 +80,15 @@ private static async Task<int> ListAllAsync(CommandContext context, AggregatorIn
                 context.Logger.WriteOutput(dataObject);
                 any = true;
             }
-
             if (!any)
             {
                 context.Logger.WriteInfo("No aggregator instances found.");
+                return ExitCodes.NotFound;
+            }
+            else
+            {
+                return ExitCodes.Success;
             }
-
-            return 0;
         }
     }
 }

src/aggregator-cli/Instances/StreamLogsCommand.cs

@@ -24,7 +24,7 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
             var instance = context.Naming.Instance(Instance, ResourceGroup);
             var instances = new AggregatorInstances(context.Azure, context.Logger, context.Naming);
             bool ok = await instances.StreamLogsAsync(instance, cancellationToken);
-            return ok ? 0 : 1;
+            return ok ? ExitCodes.Success : ExitCodes.Failure;
         }
     }
 }

src/aggregator-cli/Instances/UninstallInstanceCommand.cs

@@ -39,7 +39,7 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
 
             var instances = new AggregatorInstances(context.Azure, context.Logger, context.Naming);
             var ok = await instances.RemoveAsync(instance, Location);
-            return ok ? 0 : 1;
+            return ok ? ExitCodes.Success : ExitCodes.Failure;
         }
     }
 }

src/aggregator-cli/Instances/UpdateInstance.cs

@@ -32,7 +32,7 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
             var instance = context.Naming.Instance(Instance, ResourceGroup);
 
             bool ok = await instances.UpdateAsync(instance, RequiredVersion, SourceUrl, cancellationToken);
-            return ok ? 0 : 1;
+            return ok ? ExitCodes.Success : ExitCodes.Failure;
         }
     }
 }

src/aggregator-cli/Logon/LogonAzureCommand.cs

@@ -36,7 +36,7 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
             if (azure == null)
             {
                 context.Logger.WriteError("Invalid azure credentials");
-                return 2;
+                return ExitCodes.InvalidArguments;
             }
             // FIX #60: call some read API to validate parameters
             try
@@ -48,9 +48,9 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
                 int nl = ex.Message.IndexOf(Environment.NewLine);
                 string m = nl != -1 ? ex.Message.Remove(nl) : ex.Message;
                 context.Logger.WriteError("Invalid azure credentials: " + m);
-                return 2;
+                return ExitCodes.InvalidArguments;
             }
-            return 0;
+            return ExitCodes.Success;
         }
     }
 }

src/aggregator-cli/Logon/LogonDevOpsCommand.cs

@@ -36,10 +36,10 @@ internal override async Task<int> RunAsync(CancellationToken cancellationToken)
             if (devops == null)
             {
                 context.Logger.WriteError("Invalid Azure DevOps credentials");
-                return 2;
+                return ExitCodes.InvalidArguments;
             }
 
-            return 0;
+            return ExitCodes.Success;
         }
     }
 }