Skip to content

Commit 2132b7c

Browse files
committed
Updated SDK + purge delete support
1 parent 10213b1 commit 2132b7c

File tree

8 files changed

+23
-11
lines changed

8 files changed

+23
-11
lines changed

src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStack.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public class RemoveAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
5050
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
5151
public SwitchParameter Force { get; set; }
5252

53+
[Parameter(Mandatory = false,
54+
HelpMessage = "Delete all resources along with the stack.")]
55+
public SwitchParameter Purge { get; set; }
56+
5357
#endregion
5458

5559
#region Cmdlet Overrides
@@ -67,12 +71,14 @@ public override void ExecuteCmdlet()
6771

6872
string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";
6973

74+
string deleteBehavior = Purge.IsPresent ? "all" : null;
75+
7076
ConfirmAction(
7177
Force.IsPresent,
7278
confirmationMessage,
7379
"Deleting Deployment Stack ...",
7480
Name,
75-
() => DeploymentStacksSdkClient.DeleteResourceGroupDeploymentStack(ResourceGroupName, Name)
81+
() => DeploymentStacksSdkClient.DeleteResourceGroupDeploymentStack(ResourceGroupName, Name, deleteBehavior)
7682
);
7783

7884
WriteObject(true);

src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ public class RemoveAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
4545
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
4646
public SwitchParameter Force { get; set; }
4747

48+
[Parameter(Mandatory = false,
49+
HelpMessage = "Delete all resources along with the stack.")]
50+
public SwitchParameter Purge { get; set; }
51+
4852
#endregion
4953

5054
#region Cmdlet Overrides
@@ -57,12 +61,14 @@ public override void ExecuteCmdlet()
5761

5862
string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";
5963

64+
string deleteBehavior = Purge.IsPresent ? "all" : null;
65+
6066
ConfirmAction(
6167
Force.IsPresent,
6268
confirmationMessage,
6369
"Deleting Deployment Stack ...",
6470
Name,
65-
() => DeploymentStacksSdkClient.DeleteSubscriptionDeploymentStack(Name)
71+
() => DeploymentStacksSdkClient.DeleteSubscriptionDeploymentStack(Name, deleteBehavior)
6672
);
6773

6874
WriteObject(true);

src/Resources/ResourceManager/ResourceManager.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="AutoMapper" Version="6.2.2" />
16-
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.4-stacks" />
16+
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.7-stacks" />
1717
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
1818
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
1919
</ItemGroup>

src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,10 @@ internal void DeleteSubscriptionDeploymentStackSnapshot(string name, string snap
387387
return;
388388
}
389389

390-
internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, string name)
390+
internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, string name, string deleteBehavior = null)
391391
{
392392
var deleteResponse = DeploymentStacksClient.DeploymentStacks
393-
.DeleteAtResourceGroupWithHttpMessagesAsync(resourceGroupName, name)
393+
.DeleteAtResourceGroupWithHttpMessagesAsync(resourceGroupName, name, deleteBehavior)
394394
.GetAwaiter()
395395
.GetResult();
396396

@@ -404,10 +404,10 @@ internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, strin
404404
return;
405405
}
406406

407-
internal void DeleteSubscriptionDeploymentStack(string name)
407+
internal void DeleteSubscriptionDeploymentStack(string name, string deleteBehavior = null)
408408
{
409409
var deleteResponse = DeploymentStacksClient.DeploymentStacks
410-
.DeleteAtSubscriptionWithHttpMessagesAsync(name)
410+
.DeleteAtSubscriptionWithHttpMessagesAsync(name, deleteBehavior)
411411
.GetAwaiter()
412412
.GetResult();
413413

src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class PSDeploymentStack
3939

4040
public string description { get; set; }
4141

42-
public IList<ResourceReference> managedResources { get; set; }
42+
public IList<ManagedResourceReference> managedResources { get; set; }
4343

4444
public string deploymentId { get; set; }
4545

src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStackSnapshot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class PSDeploymentStackSnapshot
3939

4040
public ErrorResponse error { get; set; }
4141

42-
public IList<ResourceReference> managedResources { get; set; }
42+
public IList<ManagedResourceReference> managedResources { get; set; }
4343

4444
public IList<ResourceReference> detatchedResources { get; set; }
4545

src/Resources/Resources.Test/Resources.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Update="Microsoft.Azure.Management.ResourceManager" Version="3.14.4-stacks" />
35+
<PackageReference Update="Microsoft.Azure.Management.ResourceManager" Version="3.14.7-stacks" />
3636
</ItemGroup>
3737
<ItemGroup>
3838
<PackageReference Include="FluentAssertions" Version="5.9.0" />

src/Resources/Resources/Resources.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.8.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.12.0-preview" />
1616
<PackageReference Include="Microsoft.Azure.Management.ManagementGroups" Version="1.1.1-preview" />
17-
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.4-stacks" />
17+
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.7-stacks" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)