Fix Set and Move AzureResource commands. DefaultParamSet is now ResourceId.

Author: vivsriaus

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Commands.ResourceManager.Cmdlets.csproj

@@ -118,6 +118,7 @@
     <Compile Include="Extensions\IEnumerableExtensions.cs" />
     <Compile Include="Extensions\JsonExtensions.cs" />
     <Compile Include="Extensions\ObjectExtensions.cs" />
+    <Compile Include="Extensions\PsObjectExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Handlers\AuthenticationHandler.cs" />
     <Compile Include="Handlers\RetryHandler.cs" />

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/Constants.cs

@@ -52,7 +52,7 @@ public static class Constants
         /// <summary>
         /// The move action.
         /// </summary>
-        public static readonly string Move = "move";
+        public static readonly string MoveResources = "moveResources";
 
         /// <summary>
         /// The locks resource type.
@@ -63,5 +63,10 @@ public static class Constants
         /// The deployment operations resource type.
         /// </summary>
         public static readonly string MicrosoftResourcesDeploymentOperationsType = Constants.MicrosoftResourceNamesapce + "/deployments/operations";
+
+        /// <summary>
+        /// The type name of the generic resource.
+        /// </summary>
+        public static readonly string MicrosoftAzureResource = "Microsoft.Azure.Resource";
     }
 }

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs

@@ -20,7 +20,6 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Collections;
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.RestClients;
@@ -167,6 +166,11 @@ private TrackingOperationResult HandleCreateOrUpdateResponse(OperationResult ope
                 : operationResult.Value
                     .ToObject<Resource<InsensitiveDictionary<JToken>>>(JsonExtensions.JsonObjectTypeSerializer);
 
+            if(resource == null && operationResult.HttpStatusCode == HttpStatusCode.Created)
+            {
+                return this.SuccessfulResult(operationResult);
+            }
+
             if (resource == null)
             {
                 this.FailedResult(

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/ResourceIdUtility.cs

@@ -165,7 +165,7 @@ public static string GetProviderNamespace(string resourceId)
         }
 
         /// <summary>
-        /// Gets the provider namespace from the resource id.
+        /// Gets the subscription id from the resource id.
         /// </summary>
         /// <param name="resourceId">The resource id.</param>
         public static string GetSubscriptionId(string resourceId)
@@ -174,14 +174,45 @@ public static string GetSubscriptionId(string resourceId)
         }
 
         /// <summary>
-        /// Gets the provider namespace from the resource id.
+        /// Gets the name of the resource group from the resource id.
         /// </summary>
         /// <param name="resourceId">The resource id.</param>
-        public static string GetResourceGroup(string resourceId)
+        public static string GetResourceGroupName(string resourceId)
         {
             return ResourceIdUtility.GetNextSegmentAfter(resourceId: resourceId, segmentName: Constants.ResourceGroups);
         }
 
+        /// <summary>
+        /// Gets the id of the resource group from the resource id.
+        /// </summary>
+        /// <param name="resourceId">The resource id.</param>
+        public static string GetResourceGroupId(string resourceId)
+        {
+            var subscriptionId = ResourceIdUtility.GetSubscriptionId(resourceId);
+            if (string.IsNullOrWhiteSpace(subscriptionId))
+            {
+                return null;
+            }
+
+            Guid subscriptionGuid;
+            if (!Guid.TryParse(subscriptionId, out subscriptionGuid))
+            {
+                return null;
+            }
+
+            var resourceGroupName = ResourceIdUtility.GetResourceGroupName(resourceId);
+            if (string.IsNullOrWhiteSpace(resourceGroupName))
+            {
+                return null;
+            }
+
+            return ResourceIdUtility.GetResourceId(
+                subscriptionId: subscriptionGuid,
+                resourceGroupName: resourceGroupName,
+                resourceType: null,
+                resourceName: null);
+        }
+
         /// <summary>
         /// Gets a resource type
         /// </summary>

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/TagsHelper.cs

@@ -51,15 +51,11 @@ internal static InsensitiveDictionary<string> GetTagsDictionary(IEnumerable<Hash
         /// Gets a tags hash table from a tags dictionary.
         /// </summary>
         /// <param name="tags">The tags dictionary.</param>
-        internal static Hashtable[] GetTagsHashtables(InsensitiveDictionary<string> tags)
+        internal static List<Hashtable> GetTagsHashtables(InsensitiveDictionary<string> tags)
         {
             return tags == null
                 ? null
-                : tags.SelectArray(kvp => new Hashtable
-                {
-                    {"Name", kvp.Key},
-                    {"Value", kvp.Value},
-                });
+                : tags.Select(kvp => new Hashtable { { "Name", kvp.Key }, { "Value", kvp.Value } }).ToList();
         }
     }
 }

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/PsObjectExtensions.cs

@@ -0,0 +1,107 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions
+{
+    using System;
+    using System.Collections;
+    using System.Linq;
+    using System.Management.Automation;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Collections;
+    using Newtonsoft.Json.Linq;
+
+    /// <summary>
+    /// A helper class that handles common tasks that deal with the <see cref="ResourcePropertyObject"/> class.
+    /// </summary>
+    public static class PsObjectExtensions
+    {
+        /// <summary>
+        /// The properties to remove.
+        /// </summary>
+        private static readonly InsensitiveDictionary<bool> PropertiesToRemove = new InsensitiveDictionary<bool>
+        {
+            { "ResourceId", false },
+            { "ResourceName", false },
+            { "ResourceType", false},
+            { "ExtensionResourceName", false },
+            { "ExtensionResourceType", false },
+            { "ResourceGroupName", false },
+            { "SubscriptionId", false },
+            { "Tags", false },
+            { "PropertiesText", false },
+        };
+
+        /// <summary>
+        /// Converts a <see cref="ResourcePropertyObject"/> to <see cref="JToken"/>
+        /// </summary>
+        /// <param name="propertyObject">The <see cref="ResourcePropertyObject"/></param>
+        internal static JToken ToResourcePropertiesBody(this PSObject propertyObject)
+        {
+            return PsObjectExtensions.ToJToken(propertyObject);
+        }
+
+        /// <summary>
+        /// Helper method for converting <see cref="Object"/> to <see cref="JToken"/>
+        /// </summary>
+        /// <param name="value">The object.</param>
+        private static JToken ToJToken(object value)
+        {
+            if (value == null)
+            {
+                return null;
+            }
+
+            var valueAsPsObject = value as PSObject;
+            if (valueAsPsObject != null)
+            {
+                JObject obj = new JObject();
+                if (valueAsPsObject.TypeNames.Any(typeName => typeName.EqualsInsensitively("System.Collections.Hashtable")) && valueAsPsObject.BaseObject is Hashtable)
+                {
+                    foreach (var dictionaryEntry in ((Hashtable)valueAsPsObject.BaseObject).OfType<DictionaryEntry>())
+                    {
+                        obj.Add(dictionaryEntry.Key.ToString(), PsObjectExtensions.ToJToken(dictionaryEntry.Value));
+                    }
+                }
+                else
+                {
+                    var properties = (valueAsPsObject.TypeNames.Any(typeName => typeName.EqualsInsensitively(Constants.MicrosoftAzureResource)))
+                        ? valueAsPsObject.Properties.Where(property => !PsObjectExtensions.PropertiesToRemove.ContainsKey(property.Name))
+                        : valueAsPsObject.Properties.AsEnumerable();
+
+                    foreach (var member in properties)
+                    {
+                        obj.Add(member.Name, PsObjectExtensions.ToJToken(member.Value));
+                    }
+                }
+
+                return obj;
+            }
+
+            var valueAsArray = value as Array;
+            if (valueAsArray != null)
+            {
+                var retVal = new JToken[valueAsArray.Length];
+                for (int i = 0; i < valueAsArray.Length; ++i)
+                {
+                    retVal[i] = PsObjectExtensions.ToJToken(valueAsArray.GetValue(i));
+                }
+
+                return JArray.FromObject(retVal);
+            }
+
+            return new JValue(value.ToString());
+        }
+    }
+}

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/ResourceExtensions.cs

@@ -45,21 +45,23 @@ internal static PSObject ToPsObject(this Resource<JToken> resource)
                 { "ExtensionResourceName", ResourceIdUtility.GetExtensionResourceName(resource.Id) },
                 { "ExtensionResourceType", extensionResourceType },
                 { "Kind", resource.Kind },
-                { "ResourceGroupName", ResourceIdUtility.GetResourceGroup(resource.Id) },
+                { "ResourceGroupName", ResourceIdUtility.GetResourceGroupName(resource.Id) },
                 { "Location", resource.Location },
                 { "SubscriptionId", ResourceIdUtility.GetSubscriptionId(resource.Id) },
                 { "Tags", TagsHelper.GetTagsHashtables(resource.Tags) },
                 { "Plan", resource.Plan.ToJToken().ToPsObject() },
                 { "Properties", resource.Properties.ToPsObject() },
-                { "PropertiesText", resource.Properties == null ? null : resource.Properties.ToString() },
                 { "CreatedTime", resource.CreatedTime },
                 { "ChangedTime", resource.ChangedTime },
                 { "ETag", resource.ETag },
             };
 
-            return PowerShellUtilities.ConstructPSObject(
+            var psObject = PowerShellUtilities.ConstructPSObject(
                 (resourceType + extensionResourceType).Replace('/', '.'),
                 objectDefinition.Where(kvp => kvp.Value != null).SelectManyArray(kvp => new[] { kvp.Key, kvp.Value }));
+
+            psObject.TypeNames.Add(Constants.MicrosoftAzureResource);
+            return psObject;
         }
 
         /// <summary>
@@ -70,5 +72,15 @@ internal static Resource<JToken> ToResource(this JToken jtoken)
         {
             return jtoken.ToObject<Resource<JToken>>(JsonExtensions.JsonMediaTypeSerializer);
         }
+
+        /// <summary>00
+        /// Converts a <see cref="JToken"/> to a <see cref="Resource{JToken}"/>.
+        /// </summary>
+        /// <typeparam name="TType">The type of the properties.</typeparam>
+        /// <param name="jtoken">The <see cref="JToken"/>.</param>
+        internal static Resource<TType> ToResource<TType>(this JToken jtoken)
+        {
+            return jtoken.ToObject<Resource<TType>>(JsonExtensions.JsonMediaTypeSerializer);
+        }
     }
 }

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/GetAzureResourceCmdlet.cs

@@ -349,7 +349,7 @@ private async Task<JObject> GetResource()
         private async Task<ResponseWithContinuation<JObject[]>> ListResourcesTypeCollection()
         {
             var resourceCollectionId = ResourceIdUtility.GetResourceId(
-                subscriptionId: this.SubscriptionId.CoalesceEnumerable().FirstOrDefault(),
+                subscriptionId: this.SubscriptionId.CoalesceEnumerable().Cast<Guid?>().FirstOrDefault(),
                 resourceGroupName: this.ResourceGroupName,
                 resourceType: this.ResourceType,
                 resourceName: this.ResourceName,
@@ -619,7 +619,7 @@ private string GetResourceId()
             return !string.IsNullOrWhiteSpace(this.ResourceId)
             ? this.ResourceId
             : ResourceIdUtility.GetResourceId(
-                subscriptionId: this.SubscriptionId.CoalesceEnumerable().FirstOrDefault(),
+                subscriptionId: this.SubscriptionId.CoalesceEnumerable().Cast<Guid?>().FirstOrDefault(),
                 resourceGroupName: this.ResourceGroupName,
                 resourceType: this.ResourceType,
                 resourceName: this.ResourceName,
@@ -665,7 +665,7 @@ private bool IsResourceGet()
         /// </summary>
         private bool IsResourceTypeCollectionGet()
         {
-            return this.IsCollection && 
+            return (this.IsCollection || this.TenantLevel) && 
                 (this.IsResourceGroupLevelResourceTypeCollectionGet() ||
                 this.IsSubscriptionLevelResourceTypeCollectionGet() ||
                 this.IsTenantLevelResourceTypeCollectionGet());

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/InvokeAzureResourceActionCmdlet.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// <summary>
     /// A cmdlet that creates a new azure resource.
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Invoke, "AzureResourceAction", SupportsShouldProcess = true, DefaultParameterSetName = ResourceManipulationCmdletBase.SubscriptionLevelResoruceParameterSet), OutputType(typeof(PSObject))]
+    [Cmdlet(VerbsLifecycle.Invoke, "AzureResourceAction", SupportsShouldProcess = true, DefaultParameterSetName = ResourceManipulationCmdletBase.ResourceIdParameterSet), OutputType(typeof(PSObject))]
     public sealed class InvokAzureResourceActionCmdlet : ResourceManipulationCmdletBase
     {
         /// <summary>