update according to feedback

Author: Jinhuafei

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands/NewAzureContainerRegistry.cs

@@ -43,6 +43,7 @@ public class NewAzureContainerRegistry : ContainerRegistryCmdletBase
 
         [Parameter(Mandatory = false, HelpMessage = "Container Registry Location. Default to the location of the resource group.")]
         [ValidateNotNullOrEmpty]
+        [LocationCompleter("Microsoft.ContainerRegistry/registries")]
         public string Location { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = "Enable admin user for the container registry.")]

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands/NewAzureContainerRegistryReplication.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using System.Collections;
 using System.Management.Automation;
@@ -38,6 +39,7 @@ public class NewAzureContainerRegistryReplication : ContainerRegistryCmdletBase
         [Parameter(Mandatory = true, HelpMessage = "Container Registry Location. Default to the location of the resource group.")]
         [ValidateNotNullOrEmpty]
         [Alias(ReplicationLocationAlias)]
+        [LocationCompleter("Microsoft.ContainerRegistry/registries/replications")]
         public string Location { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = "Container Registry Replication Name. Default to the location name.")]

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands/NewAzureContainerRegistryWebhook.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Collections;
 using System.Management.Automation;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.ContainerRegistry.Models;
 
@@ -74,6 +75,7 @@ public class NewAzureContainerRegistryWebhook : ContainerRegistryCmdletBase
         [Parameter(Mandatory = false, HelpMessage = "Webhook Location. Default to the location of the registry.")]
         [ValidateNotNullOrEmpty]
         [Alias(WebhookLocationAlias)]
+        [LocationCompleter("Microsoft.ContainerRegistry/registries/webhooks")]
         public string Location { get; set; }
 
         [Parameter(Mandatory = true, ParameterSetName = ResourceIdParameterSet, ValueFromPipelineByPropertyName = true, HelpMessage = "The container registry resource id")]

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands/RemoveAzureContainerRegistryWebhook.cs

@@ -45,32 +45,29 @@ public class RemoveAzureContainerRegistryWebhook : ContainerRegistryCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            if (ShouldProcess(Name, "Delete the Webhook from the container registry"))
+            if (string.Equals(ParameterSetName, WebhookObjectParameterSet))
             {
-                if (string.Equals(ParameterSetName, WebhookObjectParameterSet))
+                ResourceId = Webhook.Id;
+            }
+            if (MyInvocation.BoundParameters.ContainsKey("ResourceId") || !string.IsNullOrWhiteSpace(ResourceId))
+            {
+                string resourceGroup, registryName, childResourceName;
+                if (!ConversionUtilities.TryParseRegistryRelatedResourceId(ResourceId, out resourceGroup, out registryName, out childResourceName)
+                    || string.IsNullOrEmpty(childResourceName))
                 {
-                    ResourceId = Webhook.Id;
+                    WriteInvalidResourceIdError(InvalidWebhookResourceIdErrorMessage);
+                    return;
                 }
-                if (MyInvocation.BoundParameters.ContainsKey("ResourceId") || !string.IsNullOrWhiteSpace(ResourceId))
-                {
-                    string resourceGroup, registryName, childResourceName;
-                    if(!ConversionUtilities.TryParseRegistryRelatedResourceId(ResourceId, out resourceGroup, out registryName, out childResourceName)
-                        || string.IsNullOrEmpty(childResourceName))
-                    {
-                        WriteInvalidResourceIdError(InvalidWebhookResourceIdErrorMessage);
-                        return;
-                    }
 
-                    ResourceGroupName = resourceGroup;
-                    Name = childResourceName;
-                    RegistryName = registryName;
-                }
+                ResourceGroupName = resourceGroup;
+                Name = childResourceName;
+                RegistryName = registryName;
+            }
 
-                if (ShouldProcess(Name, "Remove Container Registry Webhook"))
-                {
-                    RegistryClient.DeleteWebhook(ResourceGroupName, RegistryName, Name);
-                    WriteObject(true);
-                }
+            if (ShouldProcess(Name, "Remove Container Registry Webhook"))
+            {
+                RegistryClient.DeleteWebhook(ResourceGroupName, RegistryName, Name);
+                WriteObject(true);
             }
         }
     }

tools/AzureRM/AzureRM.psd1

@@ -66,7 +66,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '4.0.0';
                @{ModuleName = 'AzureRM.Compute'; RequiredVersion = '4.0.1'; }, 
                @{ModuleName = 'AzureRM.Consumption'; RequiredVersion = '0.3.0'; }, 
                @{ModuleName = 'AzureRM.ContainerInstance'; RequiredVersion = '0.1.0'; }, 
-               @{ModuleName = 'AzureRM.ContainerRegistry'; RequiredVersion = '0.3.0'; }, 
+               @{ModuleName = 'AzureRM.ContainerRegistry'; RequiredVersion = '1.0.0'; }, 
                @{ModuleName = 'AzureRM.DataFactories'; RequiredVersion = '4.0.1'; }, 
                @{ModuleName = 'AzureRM.DataFactoryV2'; RequiredVersion = '0.3.0'; }, 
                @{ModuleName = 'AzureRM.DataLakeAnalytics'; RequiredVersion = '4.0.0'; },