Fix issues related with resource id

Author: yolocs

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands/ContainerInstanceCmdletBase.cs

@@ -16,6 +16,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using AutoMapper;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
@@ -159,6 +160,28 @@ public string GetResourceGroupLocation(string resourceGroupName)
             return resourceGroup?.Location;
         }
 
+        /// <summary>
+        /// Parse resource group from resource id.
+        /// </summary>
+        /// <param name="resourceId">A resource id.</param>
+        public string ParseResourceGroupFromResourceId(string resourceId)
+        {
+            if (string.IsNullOrEmpty(resourceId))
+            {
+                throw new ArgumentNullException("resourceId");
+            }
+
+            Regex r = new Regex(@"(.*?)/resourcegroups/(?<rgname>\S+)/providers/(.*?)", RegexOptions.IgnoreCase);
+            Match m = r.Match(resourceId);
+
+            if (!m.Success)
+            {
+                throw new ArgumentException("Invalid format of resourceId");
+            }
+
+            return m.Groups["rgname"].Value;
+        }
+
         /// <summary>
         /// Convert hashtable to dictionary.
         /// </summary>

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands/GetAzureContainerGroupCommand.cs

@@ -78,11 +78,11 @@ protected override void ExecuteCmdletInternal()
             }
             else if (!string.IsNullOrEmpty(this.ResourceId))
             {
-                var resource = this.ResourceClient.Resources.GetById(this.ResourceId, this.ResourceClient.ApiVersion);
+                var resource = this.ResourceClient.Resources.GetById(this.ResourceId, this.ContainerClient.ApiVersion);
                 if (resource != null)
                 {
                     var psContainerGroup = PSContainerGroup.FromContainerGroup(
-                        this.ContainerClient.ContainerGroups.Get(resource.ResourceGroupName, resource.Name));
+                        this.ContainerClient.ContainerGroups.Get(this.ParseResourceGroupFromResourceId(this.ResourceId), resource.Name));
                     this.WriteObject(psContainerGroup);
                 }
             }

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands/GetAzureContainerInstanceLogCommand.cs

@@ -82,13 +82,9 @@ protected override void ExecuteCmdletInternal()
                 && string.IsNullOrWhiteSpace(containerGroupName)
                 && !string.IsNullOrWhiteSpace(this.ResourceId))
             {
-                var resource = this.ResourceClient.Resources.GetById(this.ResourceId, this.ResourceClient.ApiVersion);
-                if (resource != null)
-                {
-                    var containerGroup = this.ContainerClient.ContainerGroups.Get(resource.ResourceGroupName, resource.Name);
-                    resourceGroupName = resource.ResourceGroupName;
-                    containerGroupName = containerGroup?.Name;
-                }
+                var resource = this.ResourceClient.Resources.GetById(this.ResourceId, this.ContainerClient.ApiVersion);
+                resourceGroupName = this.ParseResourceGroupFromResourceId(this.ResourceId);
+                containerGroupName = resource?.Name;
             }
 
             var containerName = this.Name ?? containerGroupName;

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands/RemoveAzureContainerGroupCommand.cs

@@ -81,10 +81,10 @@ protected override void ExecuteCmdletInternal()
                 }
                 else if (!string.IsNullOrEmpty(this.ResourceId))
                 {
-                    var resource = this.ResourceClient.Resources.GetById(this.ResourceId, this.ResourceClient.ApiVersion);
+                    var resource = this.ResourceClient.Resources.GetById(this.ResourceId, this.ContainerClient.ApiVersion);
                     if (resource != null)
                     {
-                        containerGroupDeleted = this.ContainerClient.ContainerGroups.Delete(resource.ResourceGroupName, resource.Name);
+                        containerGroupDeleted = this.ContainerClient.ContainerGroups.Delete(this.ParseResourceGroupFromResourceId(this.ResourceId), resource.Name);
                     }
                 }