addressed comments

Author: micongjie

src/ResourceManager/Insights/Commands.Insights.Test/ActionGroups/NewAzureRmActionGroupReceiverCommandTests.cs

@@ -24,6 +24,7 @@ namespace Microsoft.Azure.Commands.Insights.Test.ActionGroups
 
     using Microsoft.Azure.Commands.Insights.OutputClasses;
     using Microsoft.Azure.Management.Monitor.Management.Models;
+    using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
     public class NewAzureRmActionGroupReceiverTests
     {
@@ -44,6 +45,7 @@ public NewAzureRmActionGroupReceiverTests(Xunit.Abstractions.ITestOutputHelper o
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void NewAzureRmReceiverCommandEmailParametersProcessing()
         {
+            Cmdlet.SetParameterSet("NewEmailReceiver");
             Cmdlet.EmailReceiver = true;
             Cmdlet.Name = "email1";
             Cmdlet.EmailAddress = "[email protected]";
@@ -63,6 +65,7 @@ public void NewAzureRmReceiverCommandEmailParametersProcessing()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void NewAzureRmReceiverCommandSmsParametersProcessing()
         {
+            Cmdlet.SetParameterSet("NewSmsReceiver");
             Cmdlet.SmsReceiver = true;
             Cmdlet.Name = "sms1";
             Cmdlet.CountryCode = "1";
@@ -84,6 +87,7 @@ public void NewAzureRmReceiverCommandSmsParametersProcessing()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void NewAzureRmReceiverCommandWebhookParametersProcessing()
         {
+            Cmdlet.SetParameterSet("NewWebhookReceiver");
             Cmdlet.WebhookReceiver = true;
             Cmdlet.Name = "webhook1";
             Cmdlet.ServiceUri = "http://test.com";

src/ResourceManager/Insights/Commands.Insights/ActionGroups/NewAzureRmActionGroupReceiverCommand.cs

@@ -19,8 +19,6 @@
 
 namespace Microsoft.Azure.Commands.Insights.ActionGroups
 {
-    using System;
-
     /// <summary>
     /// Create an ActionGroup receiver
     /// </summary>
@@ -45,7 +43,7 @@ public class NewAzureRmActionGroupReceiverCommand : AzureRMCmdlet
         /// <summary>
         /// Gets or sets email receiver SwitchParameter
         /// </summary>
-        [Parameter(ParameterSetName = NewEmailReceiver, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Create a email receiver")]
+        [Parameter(ParameterSetName = NewEmailReceiver, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Create a email receiver")]
         public SwitchParameter EmailReceiver { get; set; }
 
         /// <summary>
@@ -58,7 +56,7 @@ public class NewAzureRmActionGroupReceiverCommand : AzureRMCmdlet
         /// <summary>
         /// Gets or sets sms receiver SwitchParameter
         /// </summary>
-        [Parameter(ParameterSetName = NewSmsReceiver, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Create a sms receiver")]
+        [Parameter(ParameterSetName = NewSmsReceiver, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Create a sms receiver")]
         public SwitchParameter SmsReceiver { get; set; }
 
         /// <summary>
@@ -78,7 +76,7 @@ public class NewAzureRmActionGroupReceiverCommand : AzureRMCmdlet
         /// <summary>
         /// Gets or sets webhook receiver SwitchParameter
         /// </summary>
-        [Parameter(ParameterSetName = NewWebhookReceiver, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Create a webhook receiver")]
+        [Parameter(ParameterSetName = NewWebhookReceiver, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Create a webhook receiver")]
         public SwitchParameter WebhookReceiver { get; set; }
 
         /// <summary>
@@ -96,15 +94,15 @@ public class NewAzureRmActionGroupReceiverCommand : AzureRMCmdlet
         public override void ExecuteCmdlet()
         {
             PSActionGroupReceiverBase receiverBase = null;
-            if (this.EmailReceiver.IsPresent)
+            if (this.ParameterSetName == NewEmailReceiver)
             {
                 receiverBase = new PSEmailReceiver { Name = Name, EmailAddress = EmailAddress };
             }
-            else if (this.SmsReceiver.IsPresent)
+            else if (this.ParameterSetName == NewSmsReceiver)
             {
                 receiverBase = new PSSmsReceiver { Name = Name, CountryCode = CountryCode, PhoneNumber = PhoneNumber };
             }
-            else if (this.WebhookReceiver.IsPresent)
+            else if (this.ParameterSetName == NewWebhookReceiver)
             {
                 receiverBase = new PSWebhookReceiver { Name = Name, ServiceUri = ServiceUri };
             }

src/ResourceManager/Insights/Commands.Insights/ActionGroups/RemoveAzureRmActionGroupCommand.cs

@@ -21,6 +21,8 @@ namespace Microsoft.Azure.Commands.Insights.ActionGroups
 {
     using System;
 
+    using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+
     /// <summary>
     /// Gets an Azure Action Group.
     /// </summary>
@@ -77,8 +79,9 @@ protected override void ProcessRecordInternal()
                 }
                 else if (ParameterSetName == ByResourceId)
                 {
-                    this.ResourceGroupName = Utilities.GetResourceGroupFromId(this.ResourceId);
-                    this.Name = Utilities.GetResourceNameFromId(this.ResourceId);
+                    ResourceIdentifier resourceId = new ResourceIdentifier(this.ResourceId);
+                    this.ResourceGroupName = resourceId.ResourceGroupName;
+                    this.Name = resourceId.ResourceName;
                 }
 
                 var result =

src/ResourceManager/Insights/Commands.Insights/ActionGroups/SetAzureRmActionGroupCommand.cs

@@ -23,6 +23,7 @@ namespace Microsoft.Azure.Commands.Insights.ActionGroups
     using System.Collections;
     using System.Linq;
 
+    using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
     using Microsoft.Azure.Management.Monitor.Management;
 
     /// <summary>
@@ -118,8 +119,9 @@ protected override void ProcessRecordInternal()
                 }
                 else if (ParameterSetName == ByResourceId)
                 {
-                    this.ResourceGroupName = Utilities.GetResourceGroupFromId(this.ResourceId);
-                    this.Name = Utilities.GetResourceNameFromId(this.ResourceId);
+                    ResourceIdentifier resourceId = new ResourceIdentifier(this.ResourceId);
+                    this.ResourceGroupName = resourceId.ResourceGroupName;
+                    this.Name = resourceId.ResourceName;
                 }
 
                 IList<EmailReceiver> emailReceivers =

src/ResourceManager/Insights/Commands.Insights/OutputClasses/PSActionGroupResource.cs

@@ -19,6 +19,8 @@ namespace Microsoft.Azure.Commands.Insights.OutputClasses
     using System.Collections.Generic;
     using System.Linq;
 
+    using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+
     /// <summary>
     /// Wraps around an Action Group.
     /// </summary>
@@ -73,7 +75,7 @@ public PSActionGroupResource(ActionGroupResource actionGroupResource)
                 type: actionGroupResource.Type,
                 tags: actionGroupResource.Tags)
         {
-            this.ResourceGroupName = Utilities.GetResourceGroupFromId(actionGroupResource.Id);
+            this.ResourceGroupName = new ResourceIdentifier(actionGroupResource.Id).ResourceGroupName;
             GroupShortName = actionGroupResource.GroupShortName;
             Enabled = actionGroupResource.Enabled;
             EmailReceivers = actionGroupResource.EmailReceivers?.Select(o => new PSEmailReceiver(o)).ToList();

src/ResourceManager/Insights/Commands.Insights/Utilities.cs

@@ -75,26 +75,5 @@ public static void ExtractCollectionFromResult(this IEnumerator<EventData> enume
                 }
             }
         }
-
-        public static string GetResourceGroupFromId(string resourceId)
-        {
-            const string resourceGroup = "resourceGroups";
-
-            var startIndex = resourceId.IndexOf(resourceGroup, StringComparison.OrdinalIgnoreCase) + resourceGroup.Length + 1;
-            var endIndex = resourceId.IndexOf("/", startIndex, StringComparison.OrdinalIgnoreCase);
-
-            return resourceId.Substring(startIndex, endIndex - startIndex);
-        }
-
-        public static string GetResourceNameFromId(string resourceId)
-        {
-            if (string.IsNullOrWhiteSpace(resourceId))
-            {
-                return null;
-            }
-
-            var parts = resourceId.Split('/');
-            return parts.LastOrDefault();
-        }
     }
 }