Skip to content

Commit 742de08

Browse files
committed
New, Set and Remove should return resource obj
1 parent d5475d8 commit 742de08

File tree

5 files changed

+168
-167
lines changed

5 files changed

+168
-167
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.WriteObject(result, this.OutputObjectFormat.Value);
132+
this.WriteObject(result.ToResource().ToPsObject(this.OutputObjectFormat.Value));
133133
});
134134
}
135135

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
1616
{
1717
using System.Management.Automation;
1818
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
19+
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
1920

2021
/// <summary>
2122
/// A cmdlet that removes an azure resource.
2223
/// </summary>
23-
[Cmdlet(VerbsCommon.Remove, "AzureResource", SupportsShouldProcess = true, DefaultParameterSetName = ResourceManipulationCmdletBase.ResourceIdParameterSet), OutputType(typeof(PSObject))]
24+
[Cmdlet(VerbsCommon.Remove, "AzureResource", SupportsShouldProcess = true, DefaultParameterSetName = ResourceManipulationCmdletBase.ResourceIdParameterSet), OutputType(typeof(bool))]
2425
public class RemoveAzureResourceCmdlet : ResourceManipulationCmdletBase
2526
{
2627
/// <summary>
@@ -60,7 +61,7 @@ protected override void OnProcessRecord()
6061
var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: false)
6162
.WaitOnOperation(operationResult: operationResult);
6263

63-
this.WriteObject(result, ResourceObjectFormat.New);
64+
this.WriteObject(true);
6465
});
6566
}
6667
}

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

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

127-
this.WriteObject(result, this.OutputObjectFormat.Value);
127+
this.WriteObject(result.ToResource().ToPsObject(this.OutputObjectFormat.Value));
128128
});
129129
}
130130

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,14 @@ function Test-MoveAResource
234234
New-AzureResourceGroup -Name $rgname -Location $rglocation
235235
New-AzureResourceGroup -Name $rgname2 -Location $rglocation
236236
$resource = New-AzureResource -Name $rname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -ApiVersion $apiversion -Force
237-
Move-AzureResource -ResourceId $resource.Id -DestinationResourceGroupName $rgname2 -Force
237+
Move-AzureResource -ResourceId $resource.ResourceId -DestinationResourceGroupName $rgname2 -Force
238238

239239
$movedResource = Get-AzureResource -ResourceGroupName $rgname2 -ResourceName $rname -ResourceType $resourceType
240240

241241
# Assert
242242
Assert-AreEqual $movedResource.Name $resource.Name
243243
Assert-AreEqual $movedResource.ResourceGroupName $rgname2
244-
Assert-AreEqual $movedResource.ResourceType $resource.Type
244+
Assert-AreEqual $movedResource.ResourceType $resource.ResourceType
245245
}
246246

247247
<#

0 commit comments

Comments
 (0)