Skip to content

Commit 042bfe5

Browse files
committed
adjusted confirmation message in remove/new
1 parent 5dfe415 commit 042bfe5

File tree

6 files changed

+36
-6
lines changed

6 files changed

+36
-6
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,16 @@ protected override void OnProcessRecord()
251251
throwIfNotExists: false) != null)
252252
{
253253

254-
string confirmationMessage = ($"The DeploymentStack '{Name}' you're trying to create already exists in the current management group. Do you want to overwrite it?");
254+
string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in ManagementGroup '{ManagementGroupId}'. " +
255+
$"Do you want to overwrite it with the following actions?" +
256+
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
257+
(!shouldDeleteResources ? "resources" : "") +
258+
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
259+
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
260+
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
261+
(shouldDeleteResources ? "resources" : "") +
262+
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
263+
(shouldDeleteResourceGroups ? "resourceGroups" : "");
255264

256265
ConfirmAction(
257266
Force.IsPresent,

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,16 @@ protected override void OnProcessRecord()
240240
Name,
241241
throwIfNotExists: false) != null)
242242
{
243-
string confirmationMessage = ($"The DeploymentStack '{Name}' in Resource Group '{ResourceGroupName}' you're trying to create already exists. Do you want to overwrite it?");
243+
string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in ResourceGroup '{ResourceGroupName}'." +
244+
$"Do you want to overwrite it with the following actions?" +
245+
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
246+
(!shouldDeleteResources ? "resources" : "") +
247+
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
248+
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
249+
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
250+
(shouldDeleteResources ? "resources" : "") +
251+
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
252+
(shouldDeleteResourceGroups ? "resourceGroups" : "");
244253

245254
ConfirmAction(
246255
Force.IsPresent,

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,16 @@ protected override void OnProcessRecord()
248248
throwIfNotExists: false) != null)
249249
{
250250

251-
string confirmationMessage = ($"The DeploymentStack '{Name}' you're trying to create already exists in the current subscription. Do you want to overwrite it?");
251+
string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in the current subscription. " +
252+
$"Do you want to overwrite it with the following actions?" +
253+
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
254+
(!shouldDeleteResources ? "resources" : "") +
255+
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
256+
(!shouldDeleteResourceGroups ? "resourceGroups" : "") +
257+
(shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
258+
(shouldDeleteResources ? "resources" : "") +
259+
(shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
260+
(shouldDeleteResourceGroups ? "resourceGroups" : "");
252261

253262
ConfirmAction(
254263
Force.IsPresent,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ protected override void OnProcessRecord()
8585
"/providers/Microsoft.Management/managementGroups/<managementgroupid>/providers/Microsoft.Resources/deploymentStacks/<stackname>");
8686
}
8787

88-
string confirmationMessage = $"Are you sure you want to remove ManagementGroup scoped DeploymentStack '{Name}' with the following actions?" +
88+
string confirmationMessage = $"Are you sure you want to remove ManagementGroup scoped DeploymentStack '{Name}' " +
89+
$"in ManagementGroup '{ManagementGroupId}' with the following actions?" +
8990
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
9091
(!shouldDeleteResources ? "resources" : "") +
9192
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ protected override void OnProcessRecord()
8686
throw new PSArgumentException($"Provided Id '{ResourceId}' is not in correct form. Should be in form " +
8787
"/subscriptions/<subid>/resourceGroups/<rgname>/providers/Microsoft.Resources/deploymentStacks/<stackname>");
8888
}
89-
string confirmationMessage = $"Are you sure you want to remove ResourceGroup scoped DeploymentStack '{Name}' with the following actions?" +
89+
string confirmationMessage = $"Are you sure you want to remove ResourceGroup scoped DeploymentStack '{Name}' " +
90+
$"in ResourceGroup '{ResourceGroupName}' with the following actions?" +
9091
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
9192
(!shouldDeleteResources ? "resources" : "") +
9293
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ protected override void OnProcessRecord()
8080
"/subscriptions/<subid>/providers/Microsoft.Resources/deploymentStacks/<stackname>");
8181
}
8282

83-
string confirmationMessage = $"Are you sure you want to remove Subscription scoped DeploymentStack '{Name}' with the following actions?" +
83+
string confirmationMessage = $"Are you sure you want to remove Subscription scoped DeploymentStack '{Name}' " +
84+
$"in current Subscription with the following actions?" +
8485
(!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
8586
(!shouldDeleteResources ? "resources" : "") +
8687
(!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +

0 commit comments

Comments
 (0)