Throw inner exception and fix versioning

Throw inner exception and fix versioning

Author: felixwa

src/ResourceManager/Search/Commands.Management.Search/AzureRM.Search.psd1

@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Search.dll'
@@ -118,7 +118,7 @@ PrivateData = @{
         Prerelease = 'preview'
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Set minimum dependency of module to PowerShell 5.0'
+        ReleaseNotes = '* Introduce the first version of Azure Search Service cmdlets'
 
     } # End of PSData hashtable
 

src/ResourceManager/Search/Commands.Management.Search/ChangeLog.md

@@ -18,5 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 0.1.0 
 * Introduce the first version of Azure Search Service cmdlets
 

src/ResourceManager/Search/Commands.Management.Search/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -29,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.1.0")]
+[assembly: AssemblyFileVersion("0.1.0")]

src/ResourceManager/Search/Commands.Management.Search/SearchService/GetSearchServiceAdminKeyPairCommand.cs

@@ -72,8 +72,11 @@ public override void ExecuteCmdlet()
                 ServiceName = id.ResourceName;
             }
 
-            var res = SearchClient.AdminKeys.GetWithHttpMessagesAsync(ResourceGroupName, ServiceName).Result;
-            WriteAdminKey(res.Body);
+            CatchThrowInnerException(() =>
+            {
+                var res = SearchClient.AdminKeys.GetWithHttpMessagesAsync(ResourceGroupName, ServiceName).Result;
+                WriteAdminKey(res.Body);
+            });
         }
     }
 }

src/ResourceManager/Search/Commands.Management.Search/SearchService/GetSearchServiceCommand.cs

@@ -73,17 +73,16 @@ public override void ExecuteCmdlet()
                 var svc = SearchClient.Services.GetWithHttpMessagesAsync(ResourceGroupName, Name).Result;
                 WriteSearchService(svc.Body);
             }
-            catch (Exception e)
+            catch (AggregateException ae)
             {
-                if(e is AggregateException && 
-                    e.InnerException is CloudException 
-                    && ((CloudException)e.InnerException).Response?.StatusCode == HttpStatusCode.NotFound)
+                if (ae.InnerException is CloudException
+                    && ((CloudException)ae.InnerException).Response?.StatusCode == HttpStatusCode.NotFound)
                 {
                     // the method throws an exception when the service does not exist.
                     return;
                 }
 
-                throw e;
+                throw ae.InnerException;
             }
         }
     }

src/ResourceManager/Search/Commands.Management.Search/SearchService/GetSearchServiceQueryKeyCommand.cs

@@ -72,8 +72,11 @@ public override void ExecuteCmdlet()
                 ServiceName = id.ResourceName;
             }
 
-            var res = SearchClient.QueryKeys.ListBySearchServiceWithHttpMessagesAsync(ResourceGroupName, ServiceName).Result;
-            WriteQueryKeyList(res.Body);
+            CatchThrowInnerException(() =>
+            {
+                var res = SearchClient.QueryKeys.ListBySearchServiceWithHttpMessagesAsync(ResourceGroupName, ServiceName).Result;
+                WriteQueryKeyList(res.Body);
+            });
         }
     }
 }

src/ResourceManager/Search/Commands.Management.Search/SearchService/NewSearchServiceAdminKeyCommand.cs

@@ -89,8 +89,11 @@ public override void ExecuteCmdlet()
                 KeyKind.ToString(),
                 () =>
                 {
-                    var res = SearchClient.AdminKeys.RegenerateWithHttpMessagesAsync(ResourceGroupName, ServiceName, (AdminKeyKind)(KeyKind)).Result;
-                    WriteAdminKey(res.Body);
+                    CatchThrowInnerException(() =>
+                    {
+                        var res = SearchClient.AdminKeys.RegenerateWithHttpMessagesAsync(ResourceGroupName, ServiceName, (AdminKeyKind)(KeyKind)).Result;
+                        WriteAdminKey(res.Body);
+                    });
                 }
              );
         }

src/ResourceManager/Search/Commands.Management.Search/SearchService/NewSearchServiceCommand.cs

@@ -16,6 +16,7 @@
 using Microsoft.Azure.Commands.Management.Search.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Search.Models;
+using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Management.Search.SearchService
@@ -92,8 +93,11 @@ public override void ExecuteCmdlet()
 
             if (ShouldProcess(Name, Resources.CreateSearchService))
             {
-                var response = SearchClient.Services.CreateOrUpdateWithHttpMessagesAsync(ResourceGroupName, Name, searchService).Result;
-                WriteSearchService(response.Body);
+                CatchThrowInnerException(() =>
+                {
+                    var response = SearchClient.Services.CreateOrUpdateWithHttpMessagesAsync(ResourceGroupName, Name, searchService).Result;
+                    WriteSearchService(response.Body);
+                });
             }
         }
     }

src/ResourceManager/Search/Commands.Management.Search/SearchService/NewSearchServiceQueryKeyCommand.cs

@@ -81,8 +81,11 @@ public override void ExecuteCmdlet()
 
             if (ShouldProcess(Name, Resources.CreateQueryKey))
             {
-                var res = SearchClient.QueryKeys.CreateWithHttpMessagesAsync(ResourceGroupName, ServiceName, Name).Result;
-                WriteQueryKey(res.Body);
+                CatchThrowInnerException(() =>
+                {
+                    var res = SearchClient.QueryKeys.CreateWithHttpMessagesAsync(ResourceGroupName, ServiceName, Name).Result;
+                    WriteQueryKey(res.Body);
+                });
             }
         }
     }

src/ResourceManager/Search/Commands.Management.Search/SearchService/RemoveSearchServiceCommand.cs

@@ -85,7 +85,10 @@ public override void ExecuteCmdlet()
                 Name,
                 () =>
                 {
-                    SearchClient.Services.DeleteWithHttpMessagesAsync(ResourceGroupName, Name).Wait();
+                    CatchThrowInnerException(() =>
+                    {
+                        SearchClient.Services.DeleteWithHttpMessagesAsync(ResourceGroupName, Name).Wait();
+                    });
 
                     if (PassThru)
                     {

src/ResourceManager/Search/Commands.Management.Search/SearchService/RemoveSearchServiceQueryKey.cs

@@ -91,7 +91,10 @@ public override void ExecuteCmdlet()
                 KeyValue,
                 () =>
                 {
-                    SearchClient.QueryKeys.DeleteWithHttpMessagesAsync(ResourceGroupName, ServiceName, KeyValue).Wait();
+                    CatchThrowInnerException(() =>
+                    {
+                       SearchClient.QueryKeys.DeleteWithHttpMessagesAsync(ResourceGroupName, ServiceName, KeyValue).Wait();
+                    });
 
                     if (PassThru)
                     {

src/ResourceManager/Search/Commands.Management.Search/SearchService/SearchServiceBaseCmdlet.cs

@@ -18,6 +18,7 @@
 using Microsoft.Azure.Management.Search;
 using Microsoft.Azure.Management.Search.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.Management.Search
@@ -121,5 +122,17 @@ protected void WriteQueryKeyList(IEnumerable<QueryKey> queryKeys)
 
             WriteObject(output, true);
         }
+
+        protected void CatchThrowInnerException(Action action)
+        {
+            try
+            {
+                action();
+            }
+            catch (AggregateException ae)
+            {
+                throw ae.InnerException;
+            }
+        }
     }
 }

src/ResourceManager/Search/Commands.Management.Search/SearchService/SetSearchServiceCommand.cs

@@ -85,16 +85,19 @@ public override void ExecuteCmdlet()
 
             if (ShouldProcess(Name, Resources.UpdateSearchService))
             {
-                // GET
-                var service = SearchClient.Services.GetWithHttpMessagesAsync(ResourceGroupName, Name).Result.Body;
+                CatchThrowInnerException(() =>
+                {
+                    // GET
+                    var service = SearchClient.Services.GetWithHttpMessagesAsync(ResourceGroupName, Name).Result.Body;
 
-                // UPDATE
-                service.PartitionCount = PartitionCount;
-                service.ReplicaCount = ReplicaCount;
-                service = SearchClient.Services.UpdateWithHttpMessagesAsync(ResourceGroupName, Name, service).Result.Body;
+                    // UPDATE
+                    service.PartitionCount = PartitionCount;
+                    service.ReplicaCount = ReplicaCount;
+                    service = SearchClient.Services.UpdateWithHttpMessagesAsync(ResourceGroupName, Name, service).Result.Body;
 
-                // OUTPUT
-                WriteSearchService(service);
+                    // OUTPUT
+                    WriteSearchService(service);
+                });
             }
         }
     }

tools/CreateMappings_rules.json

@@ -136,5 +136,6 @@
 
     { "regex":  "ManagementPartner", "alias":  "Management Partner"  },
     { "regex": "DevSpaces", "group": "DevSpaces", "alias": "DevSpaces" },
-    { "regex": "SignalR", "alias": "SignalR" }
+    { "regex": "SignalR", "alias": "SignalR" },
+    { "regex": "Search", "alias": "Search" } 
 ]