Skip to content

Commit 5c82ccd

Browse files
committed
Convert to resource for new and set cmdlets - this will fix the failing test
1 parent c567d87 commit 5c82ccd

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ protected override void OnProcessRecord()
129129
var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
130130
.WaitOnOperation(operationResult: operationResult);
131131

132-
this.TryConvertAndWriteObject(result, this.OutputObjectFormat.Value);
132+
this.TryConvertToResourceAndWriteObject(result, this.OutputObjectFormat.Value);
133133
});
134134
}
135135

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,24 @@ protected void TryConvertAndWriteObject(string resultString, ResourceObjectForma
277277
}
278278
}
279279

280+
/// <summary>
281+
/// Writes the object
282+
/// </summary>
283+
/// <param name="resultString">The result as a string</param>
284+
/// <param name="objectFormat">The <see cref="ResourceObjectFormat"/></param>
285+
protected void TryConvertToResourceAndWriteObject(string resultString, ResourceObjectFormat objectFormat)
286+
{
287+
Resource<JToken> resultResource;
288+
if (resultString.TryConvertTo<Resource<JToken>>(out resultResource))
289+
{
290+
this.WriteObject(resultResource.ToPsObject(objectFormat));
291+
}
292+
else
293+
{
294+
this.WriteObject(resultString);
295+
}
296+
}
297+
280298
/// <summary>
281299
/// Writes a <see cref="JToken"/> object as a <see cref="PSObject"/>.
282300
/// </summary>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ protected override void OnProcessRecord()
123123
var activity = string.Format("{0} {1}", this.ShouldUsePatchSemantics() ? "PATCH" : "PUT", managementUri.PathAndQuery);
124124
var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
125125
.WaitOnOperation(operationResult: operationResult);
126-
127-
this.TryConvertAndWriteObject(result, this.OutputObjectFormat.Value);
126+
127+
this.TryConvertToResourceAndWriteObject(result, this.OutputObjectFormat.Value);
128128
});
129129
}
130130

0 commit comments

Comments
 (0)