Skip to content

Commit 495b1c4

Browse files
author
Hovsep
committed
Merge pull request Azure#508 from vivsriaus/dev
New, Set should return resource object
2 parents 66aa895 + d7c1d10 commit 495b1c4

File tree

7 files changed

+543
-6095
lines changed

7 files changed

+543
-6095
lines changed

ChangeLog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
* Azure Key Vault cmdlets
99
* Updated Key Vault package versions
1010
* Fixed bugs related to secrets
11+
* Azure Resource Manager
12+
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
13+
* Refactored Resource Lock cmdlets
14+
* Removed unnecessary code when getting a resource
1115

1216
2015.06.05 version 0.9.3
1317
* Fixed bug in Websites cmdlets related to slots #454

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/MoveResourceTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
1919

2020
public class MoveResourceTest
2121
{
22-
[Fact(Skip = "TODO: Re-record")]
22+
[Fact]
2323
[Trait(Category.AcceptanceType, Category.CheckIn)]
2424
public void TestMoveAzureResource()
2525
{

0 commit comments

Comments
 (0)