Skip to content

Commit 994c762

Browse files
dantedallagNoriZC
dantedallag
and
NoriZC
authored
(Deployment Stacks) Update ActionOnUnmanage Enum. (#25029)
* Update ActionOnUnmanage enum value to remove unnecessary value. * Update warning message in deployments stacks New/Remove cmdlets. * Update Changelog. * Update ChangeLog.md --------- Co-authored-by: NoriZC <[email protected]>
1 parent 04f3563 commit 994c762

17 files changed

+72
-34
lines changed

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzManagementGroupDeploymentStack.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,21 @@ protected override void OnProcessRecord()
142142
string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in ManagementGroup '{ManagementGroupId}'. " +
143143
$"Do you want to overwrite it\n?" +
144144
$"The following actions will be applied to any resources the are no longer managed by the deployment stack after the template is applied:" +
145-
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
145+
// Deleting
146+
(shouldDeleteResources || shouldDeleteResourceGroups || shouldDeleteManagementGroups ? "\nDeleting: " : "") +
146147
(shouldDeleteResources ? "resources" : "") +
147148
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
148149
(shouldDeleteResourceGroups ? "resourceGroups" : "") +
149-
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
150+
(shouldDeleteResourceGroups && shouldDeleteManagementGroups ? ", " : "") +
151+
(shouldDeleteManagementGroups ? "managementGroups" : "") +
152+
// Detaching
153+
(!shouldDeleteResources || !shouldDeleteResourceGroups || !shouldDeleteManagementGroups ? "\nDetaching: " : "") +
150154
(!shouldDeleteResources ? "resources" : "") +
151155
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
152-
(!shouldDeleteResourceGroups ? "resourceGroups" : "");
156+
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
157+
(!shouldDeleteResourceGroups && !shouldDeleteManagementGroups ? ", " : "") +
158+
(!shouldDeleteManagementGroups ? "managementGroups" : "");
159+
153160
ConfirmAction(
154161
Force.IsPresent,
155162
confirmationMessage,

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,20 @@ protected override void OnProcessRecord()
127127
string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in ResourceGroup '{ResourceGroupName}'. " +
128128
$"Do you want to overwrite it?\n" +
129129
$"The following actions will be applied to any resources the are no longer managed by the deployment stack after the template is applied:" +
130-
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
130+
// Deleting
131+
(shouldDeleteResources || shouldDeleteResourceGroups || shouldDeleteManagementGroups ? "\nDeleting: " : "") +
131132
(shouldDeleteResources ? "resources" : "") +
132133
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
133134
(shouldDeleteResourceGroups ? "resourceGroups" : "") +
134-
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
135+
(shouldDeleteResourceGroups && shouldDeleteManagementGroups ? ", " : "") +
136+
(shouldDeleteManagementGroups ? "managementGroups" : "") +
137+
// Detaching
138+
(!shouldDeleteResources || !shouldDeleteResourceGroups || !shouldDeleteManagementGroups ? "\nDetaching: " : "") +
135139
(!shouldDeleteResources ? "resources" : "") +
136140
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
137-
(!shouldDeleteResourceGroups ? "resourceGroups" : "");
141+
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
142+
(!shouldDeleteResourceGroups && !shouldDeleteManagementGroups ? ", " : "") +
143+
(!shouldDeleteManagementGroups ? "managementGroups" : "");
138144

139145
ConfirmAction(
140146
Force.IsPresent,

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,21 @@ protected override void OnProcessRecord()
137137
string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in the current subscription. " +
138138
$"Do you want to overwrite it?\n" +
139139
$"The following actions will be applied to any resources the are no longer managed by the deployment stack after the template is applied:" +
140-
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
140+
// Deleting
141+
(shouldDeleteResources || shouldDeleteResourceGroups || shouldDeleteManagementGroups ? "\nDeleting: " : "") +
141142
(shouldDeleteResources ? "resources" : "") +
142143
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
143144
(shouldDeleteResourceGroups ? "resourceGroups" : "") +
144-
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
145+
(shouldDeleteResourceGroups && shouldDeleteManagementGroups ? ", " : "") +
146+
(shouldDeleteManagementGroups ? "managementGroups" : "") +
147+
// Detaching
148+
(!shouldDeleteResources || !shouldDeleteResourceGroups || !shouldDeleteManagementGroups ? "\nDetaching: " : "") +
145149
(!shouldDeleteResources ? "resources" : "") +
146150
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
147-
(!shouldDeleteResourceGroups ? "resourceGroups" : "");
151+
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
152+
(!shouldDeleteResourceGroups && !shouldDeleteManagementGroups ? ", " : "") +
153+
(!shouldDeleteManagementGroups ? "managementGroups" : "");
154+
148155
ConfirmAction(
149156
Force.IsPresent,
150157
confirmationMessage,

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzManagmentGroupDeploymentStack.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,20 @@ protected override void OnProcessRecord()
100100

101101
string confirmationMessage = $"Are you sure you want to remove ManagementGroup scoped DeploymentStack '{Name}' " +
102102
$"in ManagementGroup '{ManagementGroupId}' with the following actions?" +
103-
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
103+
// Deleting
104+
(shouldDeleteResources || shouldDeleteResourceGroups || shouldDeleteManagementGroups ? "\nDeleting: " : "") +
105+
(shouldDeleteResources ? "resources" : "") +
106+
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
107+
(shouldDeleteResourceGroups ? "resourceGroups" : "") +
108+
(shouldDeleteResourceGroups && shouldDeleteManagementGroups ? ", " : "") +
109+
(shouldDeleteManagementGroups ? "managementGroups" : "") +
110+
// Detaching
111+
(!shouldDeleteResources || !shouldDeleteResourceGroups || !shouldDeleteManagementGroups ? "\nDetaching: " : "") +
104112
(!shouldDeleteResources ? "resources" : "") +
105113
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
106114
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
107-
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
108-
(shouldDeleteResources ? "resources" : "") +
109-
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
110-
(shouldDeleteResourceGroups ? "resourceGroups" : "");
115+
(!shouldDeleteResourceGroups && !shouldDeleteManagementGroups ? ", " : "") +
116+
(!shouldDeleteManagementGroups ? "managementGroups" : "");
111117

112118
ConfirmAction(
113119
Force.IsPresent,

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,20 @@ protected override void OnProcessRecord()
100100
}
101101
string confirmationMessage = $"Are you sure you want to remove ResourceGroup scoped DeploymentStack '{Name}' " +
102102
$"in ResourceGroup '{ResourceGroupName}' with the following actions?" +
103-
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
103+
// Deleting
104+
(shouldDeleteResources || shouldDeleteResourceGroups || shouldDeleteManagementGroups ? "\nDeleting: " : "") +
105+
(shouldDeleteResources ? "resources" : "") +
106+
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
107+
(shouldDeleteResourceGroups ? "resourceGroups" : "") +
108+
(shouldDeleteResourceGroups && shouldDeleteManagementGroups ? ", " : "") +
109+
(shouldDeleteManagementGroups ? "managementGroups" : "") +
110+
// Detaching
111+
(!shouldDeleteResources || !shouldDeleteResourceGroups || !shouldDeleteManagementGroups ? "\nDetaching: " : "") +
104112
(!shouldDeleteResources ? "resources" : "") +
105113
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
106114
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
107-
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
108-
(shouldDeleteResources ? "resources" : "") +
109-
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
110-
(shouldDeleteResourceGroups ? "resourceGroups" : "");
115+
(!shouldDeleteResourceGroups && !shouldDeleteManagementGroups ? ", " : "") +
116+
(!shouldDeleteManagementGroups ? "managementGroups" : "");
111117

112118
ConfirmAction(
113119
Force.IsPresent,

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,20 @@ protected override void OnProcessRecord()
9393

9494
string confirmationMessage = $"Are you sure you want to remove Subscription scoped DeploymentStack '{Name}' " +
9595
$"in current Subscription with the following actions?" +
96-
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
96+
// Deleting
97+
(shouldDeleteResources || shouldDeleteResourceGroups || shouldDeleteManagementGroups ? "\nDeleting: " : "") +
98+
(shouldDeleteResources ? "resources" : "") +
99+
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
100+
(shouldDeleteResourceGroups ? "resourceGroups" : "") +
101+
(shouldDeleteResourceGroups && shouldDeleteManagementGroups ? ", " : "") +
102+
(shouldDeleteManagementGroups ? "managementGroups" : "") +
103+
// Detaching
104+
(!shouldDeleteResources || !shouldDeleteResourceGroups || !shouldDeleteManagementGroups ? "\nDetaching: " : "") +
97105
(!shouldDeleteResources ? "resources" : "") +
98106
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
99107
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
100-
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
101-
(shouldDeleteResources ? "resources" : "") +
102-
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
103-
(shouldDeleteResourceGroups ? "resourceGroups" : "");
108+
(!shouldDeleteResourceGroups && !shouldDeleteManagementGroups ? ", " : "") +
109+
(!shouldDeleteManagementGroups ? "managementGroups" : "");
104110

105111
ConfirmAction(
106112
Force.IsPresent,

‎src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSActionOnUnmanage.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public enum PSActionOnUnmanage
1818
{
1919
DetachAll = 0,
2020
DeleteResources,
21-
DeleteResourcesAndResourceGroups,
2221
DeleteAll
2322
}
2423
}

‎src/Resources/Resources/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020

2121
## Upcoming Release
22+
* Updated Remove/New stack cmdlets with warnings for management groups ActionOnUnmanage and removed DeleteResourcesAndResourceGroups as valid ActionOnUnmanage value.
2223
* Supported get and assign versioned policy definitions and sets
2324
* Fixed syntax incompatible with windows powershell [#24971]
2425
* Fixed bug with `Get-AzPolicyExemption` requesting 'ParentResourcePath'

‎src/Resources/Resources/help/New-AzManagementGroupDeploymentStack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Action to take on resources that become unmanaged on deletion or update of the d
196196
Type: Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels.DeploymentStacks.PSActionOnUnmanage
197197
Parameter Sets: (All)
198198
Aliases:
199-
Accepted values: DetachAll, DeleteResources, DeleteResourcesAndResourceGroups, DeleteAll
199+
Accepted values: DetachAll, DeleteResources, DeleteAll
200200

201201
Required: True
202202
Position: Named

‎src/Resources/Resources/help/New-AzResourceGroupDeploymentStack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Action to take on resources that become unmanaged on deletion or update of the d
183183
Type: Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels.DeploymentStacks.PSActionOnUnmanage
184184
Parameter Sets: (All)
185185
Aliases:
186-
Accepted values: DetachAll, DeleteResources, DeleteResourcesAndResourceGroups, DeleteAll
186+
Accepted values: DetachAll, DeleteResources, DeleteAll
187187

188188
Required: True
189189
Position: Named

0 commit comments

Comments
 (0)