From 5c82ccd70cd3b302173b15e50e9438e59a2aed96 Mon Sep 17 00:00:00 2001
From: vivsriaus <visriniv@microsoft.com>
Date: Mon, 13 Jul 2015 11:47:34 -0700
Subject: [PATCH] Convert to resource for new and set cmdlets - this will fix
 the failing test

---
 .../Implementation/NewAzureResourceCmdlet.cs   |  2 +-
 .../ResourceManagerCmdletBase.cs               | 18 ++++++++++++++++++
 .../Implementation/SetAzureResourceCmdlet.cs   |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/NewAzureResourceCmdlet.cs b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/NewAzureResourceCmdlet.cs
index 0b3a3ddad57f..05b8ca0f26a5 100644
--- a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/NewAzureResourceCmdlet.cs
+++ b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/NewAzureResourceCmdlet.cs
@@ -129,7 +129,7 @@ protected override void OnProcessRecord()
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
                         .WaitOnOperation(operationResult: operationResult);
 
-                    this.TryConvertAndWriteObject(result, this.OutputObjectFormat.Value);
+                    this.TryConvertToResourceAndWriteObject(result, this.OutputObjectFormat.Value);
                 });
         }
 
diff --git a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/ResourceManagerCmdletBase.cs b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/ResourceManagerCmdletBase.cs
index 6eed73f61fb6..62f0e6985864 100644
--- a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/ResourceManagerCmdletBase.cs
+++ b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/ResourceManagerCmdletBase.cs
@@ -277,6 +277,24 @@ protected void TryConvertAndWriteObject(string resultString, ResourceObjectForma
             }
         }
 
+        /// <summary>
+        /// Writes the object
+        /// </summary>
+        /// <param name="resultString">The result as a string</param>
+        /// <param name="objectFormat">The <see cref="ResourceObjectFormat"/></param>
+        protected void TryConvertToResourceAndWriteObject(string resultString, ResourceObjectFormat objectFormat)
+        {
+            Resource<JToken> resultResource;
+            if (resultString.TryConvertTo<Resource<JToken>>(out resultResource))
+            {
+                this.WriteObject(resultResource.ToPsObject(objectFormat));
+            }
+            else
+            {
+                this.WriteObject(resultString);
+            }
+        }
+
         /// <summary>
         /// Writes a <see cref="JToken"/> object as a <see cref="PSObject"/>.
         /// </summary>
diff --git a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/SetAzureResourceCmdlet.cs b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/SetAzureResourceCmdlet.cs
index 6287c131833a..d47782fbf631 100644
--- a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/SetAzureResourceCmdlet.cs
+++ b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/SetAzureResourceCmdlet.cs
@@ -123,8 +123,8 @@ protected override void OnProcessRecord()
                     var activity = string.Format("{0} {1}", this.ShouldUsePatchSemantics() ? "PATCH" : "PUT", managementUri.PathAndQuery);
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
                         .WaitOnOperation(operationResult: operationResult);
-                    
-                    this.TryConvertAndWriteObject(result, this.OutputObjectFormat.Value);
+
+                    this.TryConvertToResourceAndWriteObject(result, this.OutputObjectFormat.Value);
                 });
         }