Throw warning only if using legacy object format

Author: vivsriaus

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

@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions
 {
     using System;
     using System.Collections;
+    using System.Collections.Generic;
     using System.Linq;
     using System.Management.Automation;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
@@ -69,9 +70,18 @@ private static JToken ToJToken(object value)
                 JObject obj = new JObject();
                 if (valueAsPsObject.BaseObject != null && valueAsPsObject.BaseObject is IDictionary)
                 {
-                    foreach (var dictionaryEntry in ((IDictionary)valueAsPsObject.BaseObject).OfType<DictionaryEntry>())
+                    var valueAsIDictionary = valueAsPsObject.BaseObject as IDictionary;
+                    var dictionaryEntries = valueAsIDictionary is IDictionary<string, object>
+                        ? valueAsIDictionary.OfType<KeyValuePair<string, object>>().Select(kvp => Tuple.Create(kvp.Key, kvp.Value))
+                        : valueAsIDictionary.OfType<DictionaryEntry>().Select(dictionaryEntry => Tuple.Create(dictionaryEntry.Key.ToString(), dictionaryEntry.Value));
+
+                    dictionaryEntries = dictionaryEntries.Any(dictionaryEntry => dictionaryEntry.Item1.EqualsInsensitively(Constants.MicrosoftAzureResource))
+                        ? dictionaryEntries.Where(dictionaryEntry => !PsObjectExtensions.PropertiesToRemove.ContainsKey(dictionaryEntry.Item1))
+                        : dictionaryEntries;
+
+                    foreach (var dictionaryEntry in dictionaryEntries)
                     {
-                        obj.Add(dictionaryEntry.Key.ToString(), PsObjectExtensions.ToJToken(dictionaryEntry.Value));
+                        obj.Add(dictionaryEntry.Item1, PsObjectExtensions.ToJToken(dictionaryEntry.Item2));
                     }
                 }
                 else

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

@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using System.Collections;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Management.Automation;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
@@ -75,7 +76,8 @@ public sealed class NewAzureResourceCmdlet : ResourceManipulationCmdletBase
         /// Gets or sets the resource property object format.
         /// </summary>
         [Parameter(Mandatory = false, HelpMessage = "The output format of the resource properties.")]
-        public ResourceObjectFormat OutputObjectFormat { get; set; }
+        [ValidateNotNull]
+        public ResourceObjectFormat? OutputObjectFormat { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NewAzureResourceCmdlet" /> class.
@@ -91,9 +93,13 @@ public NewAzureResourceCmdlet()
         protected override void OnProcessRecord()
         {
             base.OnProcessRecord();
+            this.DetermineOutputObjectFormat();
+            if (this.OutputObjectFormat == ResourceObjectFormat.Legacy)
+            {
+                this.WriteWarning("This cmdlet is using the legacy properties object format. This format is being deprecated. Please use '-OutputObjectFormat New' and update your scripts.");
+            }
 
             var resourceId = this.GetResourceId();
-
             this.ConfirmAction(
                 this.Force,
                 "Are you sure you want to create the following resource: "+ resourceId,
@@ -123,10 +129,26 @@ protected override void OnProcessRecord()
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
                         .WaitOnOperation(operationResult: operationResult);
 
-                    this.WriteObject(result, this.OutputObjectFormat);
+                    this.WriteObject(result, this.OutputObjectFormat.Value);
                 });
         }
 
+        /// <summary>
+        /// Determines the output object format.
+        /// </summary>
+        private void DetermineOutputObjectFormat()
+        {
+            if (this.Properties != null && this.OutputObjectFormat == null && this.Properties.TypeNames.Any(typeName => typeName.EqualsInsensitively(Constants.MicrosoftAzureResource)))
+            {
+                this.OutputObjectFormat = ResourceObjectFormat.New;
+            }
+
+            if (this.OutputObjectFormat == null)
+            {
+                this.OutputObjectFormat = ResourceObjectFormat.Legacy;
+            }
+        }
+
         /// <summary>
         /// Gets the resource body from the parameters.
         /// </summary>

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

@@ -15,6 +15,7 @@
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using System.Collections;
+    using System.Linq;
     using System.Management.Automation;
     using System.Threading.Tasks;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
@@ -69,26 +70,21 @@ public sealed class SetAzureResourceCmdlet : ResourceManipulationCmdletBase
         /// Gets or sets the resource property object format.
         /// </summary>
         [Parameter(Mandatory = false, HelpMessage = "The output format of the resource properties.")]
-        public ResourceObjectFormat OutputObjectFormat { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetAzureResourceCmdlet" /> class.
-        /// </summary>
-        public SetAzureResourceCmdlet()
-        {
-            this.OutputObjectFormat = ResourceObjectFormat.Legacy;
-        }
+        [ValidateNotNull]
+        public ResourceObjectFormat? OutputObjectFormat { get; set; }
 
         /// <summary>
         /// Executes the cmdlet.
         /// </summary>
         protected override void OnProcessRecord()
         {
             base.OnProcessRecord();
+            this.DetermineOutputObjectFormat();
             if (this.OutputObjectFormat == ResourceObjectFormat.Legacy)
             {
                 this.WriteWarning("This cmdlet is using the legacy properties object format. This format is being deprecated. Please use '-OutputObjectFormat New' and update your scripts.");
             }
+
             var resourceId = this.GetResourceId();
             this.ConfirmAction(
                 this.Force,
@@ -128,10 +124,26 @@ protected override void OnProcessRecord()
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
                         .WaitOnOperation(operationResult: operationResult);
 
-                    this.WriteObject(result, this.OutputObjectFormat);
+                    this.WriteObject(result, this.OutputObjectFormat.Value);
                 });
         }
 
+        /// <summary>
+        /// Determines the output object format.
+        /// </summary>
+        private void DetermineOutputObjectFormat()
+        {
+            if (this.Properties != null && this.OutputObjectFormat == null && this.Properties.TypeNames.Any(typeName => typeName.EqualsInsensitively(Constants.MicrosoftAzureResource)))
+            {
+                this.OutputObjectFormat = ResourceObjectFormat.New;
+            }
+
+            if (this.OutputObjectFormat == null)
+            {
+                this.OutputObjectFormat = ResourceObjectFormat.Legacy;
+            }
+        }
+
         /// <summary>
         /// Gets the resource body.
         /// </summary>