changes for incremental release

dantedallag · dantedallag · commit 187764dc489f · 2023-02-01T13:46:52.000-08:00
diff --git a/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs b/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs
@@ -186,7 +186,7 @@ protected override void OnBeginProcessing()
 
         public new virtual object GetDynamicParameters()
         {
-            if (BicepUtility.IsBicepFile(TemplateUri))
+                if (BicepUtility.IsBicepFile(TemplateUri))
             {
                 throw new NotSupportedException($"'-TemplateUri {TemplateUri}' is not supported. Please download the bicep file and pass it using -TemplateFile.");
             }
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzManagementGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzManagementGroupDeploymentStack.cs
@@ -270,16 +270,16 @@ protected override void OnProcessRecord()
                         throwIfNotExists: false) != null)
                 {
                     string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in ManagementGroup '{ManagementGroupId}'. " +
-                        $"Do you want to overwrite it with the following actions?" +
-                        (!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
-                        (!shouldDeleteResources ? "resources" : "") +
-                        (!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
-                        (!shouldDeleteResourceGroups ? "resourceGroups" : "") +
+                        $"Do you want to overwrite it\n?" +
+                        $"The following actions will be applied to any resources the are no longer managed by the deployment stack after the template is applied:" +
                         (shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
                         (shouldDeleteResources ? "resources" : "") +
                         (shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
-                        (shouldDeleteResourceGroups ? "resourceGroups" : "");
-
+                        (shouldDeleteResourceGroups ? "resourceGroups" : "") +
+                        (!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
+                        (!shouldDeleteResources ? "resources" : "") +
+                        (!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
+                        (!shouldDeleteResourceGroups ? "resourceGroups" : ""); 
                     ConfirmAction(
                         Force.IsPresent,
                         confirmationMessage,
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs
@@ -256,15 +256,16 @@ protected override void OnProcessRecord()
                         throwIfNotExists: false) != null)
                 {
                     string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in ResourceGroup '{ResourceGroupName}'. " +
-                        $"Do you want to overwrite it with the following actions?" +
-                        (!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
-                        (!shouldDeleteResources ? "resources" : "") +
-                        (!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
-                        (!shouldDeleteResourceGroups ? "resourceGroups" : "") +
+                        $"Do you want to overwrite it?\n" +
+                        $"The following actions will be applied to any resources the are no longer managed by the deployment stack after the template is applied:" +
                         (shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
                         (shouldDeleteResources ? "resources" : "") +
                         (shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
-                        (shouldDeleteResourceGroups ? "resourceGroups" : "");
+                        (shouldDeleteResourceGroups ? "resourceGroups" : "") +
+                        (!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
+                        (!shouldDeleteResources ? "resources" : "") +
+                        (!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
+                        (!shouldDeleteResourceGroups ? "resourceGroups" : "");
 
                     ConfirmAction(
                         Force.IsPresent,
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs
@@ -264,16 +264,16 @@ protected override void OnProcessRecord()
                 {
 
                     string confirmationMessage = $"The DeploymentStack '{Name}' you're trying to create already exists in the current subscription. " +
-                        $"Do you want to overwrite it with the following actions?" +
-                        (!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
-                        (!shouldDeleteResources ? "resources" : "") +
-                        (!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
-                        (!shouldDeleteResourceGroups ? "resourceGroups" : "") +
+                        $"Do you want to overwrite it?\n" +
+                        $"The following actions will be applied to any resources the are no longer managed by the deployment stack after the template is applied:" +
                         (shouldDeleteResources || shouldDeleteResourceGroups ? "\nDeleting: " : "") +
                         (shouldDeleteResources ? "resources" : "") +
                         (shouldDeleteResources && shouldDeleteResourceGroups ? ", " : "") +
-                        (shouldDeleteResourceGroups ? "resourceGroups" : "");
-
+                        (shouldDeleteResourceGroups ? "resourceGroups" : "") +
+                        (!shouldDeleteResources || !shouldDeleteResourceGroups ? "\nDetaching: " : "") +
+                        (!shouldDeleteResources ? "resources" : "") +
+                        (!shouldDeleteResources && !shouldDeleteResourceGroups ? ", " : "") +
+                        (!shouldDeleteResourceGroups ? "resourceGroups" : "");
                     ConfirmAction(
                         Force.IsPresent,
                         confirmationMessage,
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzManagmentGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzManagmentGroupDeploymentStack.cs
@@ -60,6 +60,9 @@ public class RemoveAzManagementGroupDeploymentStack : DeploymentStacksCmdletBase
         /*[Parameter(Mandatory = false, HelpMessage = "Singal to delete unmanaged stack management groups after updating stack.")]
         public SwitchParameter DeleteManagementGroups { get; set; }*/
 
+        [Parameter(Mandatory = false, HelpMessage = "If set, a boolean will be returned with value dependent on cmdlet success.")]
+        public SwitchParameter PassThru { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
@@ -109,17 +112,23 @@ protected override void OnProcessRecord()
                             resourcesCleanupAction: shouldDeleteResources ? "delete" : "detach",
                             resourceGroupsCleanupAction: shouldDeleteResourceGroups ? "delete" : "detach"
                         );
-                        WriteObject(true);
+                        if (PassThru.IsPresent)
+                        {
+                            WriteObject(true);
+                        }
                     }
                 );
             }
             catch (Exception ex)
             {
                 if (ex is DeploymentStacksErrorException dex)
+                {
                     throw new PSArgumentException(dex.Message + " : " + dex.Body.Error.Code + " : " + dex.Body.Error.Message);
+                }
                 else
-                    WriteObject(false);
+                {
                     WriteExceptionError(ex);
+                }
             }
         }
 
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStack.cs
@@ -62,6 +62,9 @@ public class RemoveAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
         /*[Parameter(Mandatory = false, HelpMessage = "Singal to delete unmanaged stack management groups after updating stack.")]
         public SwitchParameter DeleteManagementGroups { get; set; }*/
 
+        [Parameter(Mandatory = false, HelpMessage = "If set, a boolean will be returned with value dependent on cmdlet success.")]
+        public SwitchParameter PassThru { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
@@ -110,17 +113,23 @@ protected override void OnProcessRecord()
                             resourcesCleanupAction: shouldDeleteResources ? "delete" : "detach",
                             resourceGroupsCleanupAction: shouldDeleteResourceGroups ? "delete" : "detach"
                         );
-                        WriteObject(true);
+                        if (PassThru.IsPresent)
+                        {
+                            WriteObject(true);
+                        }
                     }   
                 );
             }
             catch (Exception ex)
             {
                 if (ex is DeploymentStacksErrorException dex)
+                {
                     throw new PSArgumentException(dex.Message + " : " + dex.Body.Error.Code + " : " + dex.Body.Error.Message);
+                }
                 else
-                    WriteObject(false);
+                {
                     WriteExceptionError(ex);
+                }
             }
         }
 
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs
@@ -56,6 +56,9 @@ public class RemoveAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
         /*[Parameter(Mandatory = false, HelpMessage = "Singal to delete unmanaged stack management groups after updating stack.")]
         public SwitchParameter DeleteManagementGroups { get; set; }*/
 
+        [Parameter(Mandatory = false, HelpMessage = "If set, a boolean will be returned with value dependent on cmdlet success.")]
+        public SwitchParameter PassThru { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
@@ -103,20 +106,26 @@ protected override void OnProcessRecord()
                             resourcesCleanupAction: shouldDeleteResources ? "delete" : "detach",
                             resourceGroupsCleanupAction: shouldDeleteResourceGroups ? "delete" : "detach"
                         );
-                        WriteObject(true);
+                        if (PassThru.IsPresent)
+                        {
+                            WriteObject(true);
+                        }
                     }
                 );
             }
             catch (Exception ex)
             {
                 if (ex is DeploymentStacksErrorException dex)
+                {
                     throw new PSArgumentException(dex.Message + " : " + dex.Body.Error.Code + " : " + dex.Body.Error.Message);
+                }
                 else
-                    WriteObject(false);
+                {
                     WriteExceptionError(ex);
+                }
             }
         }
 
         #endregion
     }
-}
+}
diff --git a/src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs b/src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs
@@ -460,14 +460,16 @@ internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, strin
 
         internal void DeleteSubscriptionDeploymentStack(string name, string resourcesCleanupAction, string resourceGroupsCleanupAction)
         {
-            var deleteResponse = DeploymentStacksClient.DeploymentStacks.DeleteAtSubscription(name, resourcesCleanupAction, resourceGroupsCleanupAction);
+            var deleteResponse = DeploymentStacksClient.DeploymentStacks.DeleteAtSubscriptionWithHttpMessagesAsync(name, resourcesCleanupAction, resourceGroupsCleanupAction)
+                .GetAwaiter()
+                .GetResult();
 
-/*            if (deleteResponse.Response.StatusCode == System.Net.HttpStatusCode.NoContent)
+            if (deleteResponse.Response.StatusCode == System.Net.HttpStatusCode.NoContent)
             {
                 throw new PSArgumentException(
                         $"DeploymentStack '{name}' not found in the curent subscription scope."
                     );
-            }*/
+            }
 
             return;
         }
diff --git a/src/Resources/ResourceManager/SdkExtensions/ResourcesExtensions.cs b/src/Resources/ResourceManager/SdkExtensions/ResourcesExtensions.cs
@@ -176,6 +176,40 @@ public static string ConstructTagsTable(Hashtable tags)
             return resourcesTable.ToString();
         }
 
+        public static string ConstructTagsTableFromIDictionary(IDictionary<string, string> tags)
+        {
+            // TODO: Can I change existing code?
+         
+            if (tags == null || tags.Count == 0)
+            {
+                return null;
+            }
+
+            StringBuilder resourcesTable = new StringBuilder();
+
+            int maxNameLength = Math.Max("Name".Length, tags.Max(tag => tag.Key.Length));
+            int maxValueLength = Math.Max("Value".Length, tags.Max(tag => tag.Value.Length));
+
+            string rowFormat = "{0, -" + maxNameLength + "}  {1, -" + maxValueLength + "}\r\n";
+            resourcesTable.AppendLine();
+            resourcesTable.AppendFormat(rowFormat, "Name", "Value");
+            resourcesTable.AppendFormat(rowFormat,
+                GeneralUtilities.GenerateSeparator(maxNameLength, "="),
+                GeneralUtilities.GenerateSeparator(maxValueLength, "="));
+
+            foreach (var tag in tags)
+            {
+                if (tag.Key.StartsWith(TagsClient.ExecludedTagPrefix))
+                {
+                    continue;
+                }
+
+                resourcesTable.AppendFormat(rowFormat, tag.Key, tag.Value);
+            }
+
+            return resourcesTable.ToString();
+        }
+
         private static string ConstructTemplateLinkView(TemplateLink templateLink)
         {
             if (templateLink == null)
diff --git a/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStack.cs b/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStack.cs
@@ -1,4 +1,5 @@
-﻿using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkExtensions;
+﻿using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkExtensions;
 using Microsoft.Azure.Management.Internal.Network.Version2017_10_01;
 using Microsoft.Azure.Management.ResourceManager.Models;
 using Microsoft.Rest;
@@ -11,6 +12,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text;
+using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels
 {
@@ -106,6 +109,52 @@ internal PSDeploymentStack(DeploymentStack deploymentStack)
 
         }
 
+        public string GetFormattedParameterTable() 
+        {
+            return ResourcesExtensions.ConstructDeploymentVariableTable(this.parameters);
+        }
+
+        public string GetFormattedOutputTable()
+        {
+            return ResourcesExtensions.ConstructDeploymentVariableTable(this.outputs);
+        }
+
+        public string GetFormattedTagTable()
+        {
+            return ResourcesExtensions.ConstructTagsTableFromIDictionary(this.Tags);
+        }
+
+        private const char Whitespace = ' ';
+
+        public string GetFormattedErrorString()
+        {
+            return this.error == null
+                ? string.Empty
+                : GetFormattedErrorString(this.error).TrimEnd('\r', '\n');
+        }
+
+        private static string GetFormattedErrorString(ErrorResponse error, int level = 0)
+        {
+            if (error.Details == null)
+            {
+                return string.Format(ProjectResources.DeploymentOperationErrorMessageNoDetails, error.Message, error.Code);
+            }
+
+            string errorDetail = null;
+
+            foreach (ErrorResponse detail in error.Details)
+            {
+                errorDetail += GetIndentation(level) + GetFormattedErrorString(detail, level + 1) + System.Environment.NewLine;
+            }
+
+            return string.Format(ProjectResources.DeploymentOperationErrorMessage, error.Message, error.Code, errorDetail);
+        }
+
+        private static string GetIndentation(int l)
+        {
+            return new StringBuilder().Append(Whitespace, l * 2).Append(" - ").ToString();
+        }
+
         internal static PSDeploymentStack FromAzureSDKDeploymentStack(DeploymentStack stack)
         {
             return stack != null
diff --git a/src/Resources/Resources.Test/ScenarioTests/DeploymentStackTests.ps1 b/src/Resources/Resources.Test/ScenarioTests/DeploymentStackTests.ps1

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ protected override void OnBeginProcessing()`
`186`	`186`
`187`	`187`	`public new virtual object GetDynamicParameters()`
`188`	`188`	`{`
`189`		`- if (BicepUtility.IsBicepFile(TemplateUri))`
	`189`	`+ if (BicepUtility.IsBicepFile(TemplateUri))`
`190`	`190`	`{`
`191`	`191`	`throw new NotSupportedException($"'-TemplateUri {TemplateUri}' is not supported. Please download the bicep file and pass it using -TemplateFile.");`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -460,14 +460,16 @@ internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, strin`
`460`	`460`
`461`	`461`	`internal void DeleteSubscriptionDeploymentStack(string name, string resourcesCleanupAction, string resourceGroupsCleanupAction)`
`462`	`462`	`{`
`463`		`- var deleteResponse = DeploymentStacksClient.DeploymentStacks.DeleteAtSubscription(name, resourcesCleanupAction, resourceGroupsCleanupAction);`
	`463`	`+ var deleteResponse = DeploymentStacksClient.DeploymentStacks.DeleteAtSubscriptionWithHttpMessagesAsync(name, resourcesCleanupAction, resourceGroupsCleanupAction)`
	`464`	`+ .GetAwaiter()`
	`465`	`+ .GetResult();`
`464`	`466`
`465`		`-/* if (deleteResponse.Response.StatusCode == System.Net.HttpStatusCode.NoContent)`
	`467`	`+ if (deleteResponse.Response.StatusCode == System.Net.HttpStatusCode.NoContent)`
`466`	`468`	`{`
`467`	`469`	`throw new PSArgumentException(`
`468`	`470`	`$"DeploymentStack '{name}' not found in the curent subscription scope."`
`469`	`471`	`);`
`470`		`- }*/`
	`472`	`+ }`
`471`	`473`
`472`	`474`	`return;`
`473`	`475`	`}`