diff --git a/src/Resources/ResourceManager/Implementation/DeploymentScripts/GetAzDeploymentScriptLog.cs b/src/Resources/ResourceManager/Implementation/DeploymentScripts/GetAzDeploymentScriptLog.cs
index 522fc5d40ab1..9cda08e5b373 100644
--- a/src/Resources/ResourceManager/Implementation/DeploymentScripts/GetAzDeploymentScriptLog.cs
+++ b/src/Resources/ResourceManager/Implementation/DeploymentScripts/GetAzDeploymentScriptLog.cs
@@ -45,10 +45,11 @@ public class GetAzDeploymentScriptLog : DeploymentScriptCmdletBase
[ResourceIdCompleter("Microsoft.Resources/deploymentScripts")]
public string DeploymentScriptResourceId { get; set; }
+ [Alias("DeploymentScriptInputObject")]
[Parameter(Position = 0, ParameterSetName = GetDeploymentScriptLogByInputObject, Mandatory = true, ValueFromPipeline = true,
HelpMessage = "The deployment script PowerShell object.")]
[ValidateNotNullOrEmpty]
- public PsDeploymentScript DeploymentScriptInputObject { get; set; }
+ public PsDeploymentScript DeploymentScriptObject { get; set; }
[Parameter(Position = 2, ParameterSetName = GetDeploymentScriptLogByName, Mandatory = false, HelpMessage = "Limit output to last n lines")]
[Parameter(Position = 1, ParameterSetName = GetDeploymentScriptLogByResourceId, Mandatory = false, HelpMessage = "Limit output to last n lines")]
@@ -81,8 +82,8 @@ public override void ExecuteCmdlet()
break;
case GetDeploymentScriptLogByInputObject:
deploymentScriptLog = DeploymentScriptsSdkClient.GetDeploymentScriptLog(
- DeploymentScriptInputObject.Name,
- ResourceIdUtility.GetResourceGroupName(DeploymentScriptInputObject.Id),
+ DeploymentScriptObject.Name,
+ ResourceIdUtility.GetResourceGroupName(DeploymentScriptObject.Id),
tailParam);
break;
default:
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentScripts/RemoveAzDeploymentScript.cs b/src/Resources/ResourceManager/Implementation/DeploymentScripts/RemoveAzDeploymentScript.cs
index 57da179d06f8..b0fc99f11ea1 100644
--- a/src/Resources/ResourceManager/Implementation/DeploymentScripts/RemoveAzDeploymentScript.cs
+++ b/src/Resources/ResourceManager/Implementation/DeploymentScripts/RemoveAzDeploymentScript.cs
@@ -61,25 +61,31 @@ public override void ExecuteCmdlet()
{
try
{
+ string scriptName = "";
+
switch (ParameterSetName)
{
case RemoveDeploymentScriptByName:
- if (ShouldProcess(Name, "Remove Deployment Script"))
+ scriptName = Name;
+ if (ShouldProcess(scriptName, "Remove Deployment Script"))
{
- DeploymentScriptsSdkClient.DeleteDeploymentScript(Name, ResourceGroupName);
+ DeploymentScriptsSdkClient.DeleteDeploymentScript(scriptName, ResourceGroupName);
}
break;
case RemoveDeploymentScriptByResourceId:
- if (ShouldProcess(Name, "Remove Deployment Script"))
+ scriptName = ResourceIdUtility.GetResourceName(this.Id);
+ if (ShouldProcess(scriptName, "Remove Deployment Script"))
{
- DeploymentScriptsSdkClient.DeleteDeploymentScript( ResourceIdUtility.GetResourceName(this.Id),
+ DeploymentScriptsSdkClient.DeleteDeploymentScript(scriptName,
ResourceIdUtility.GetResourceGroupName(this.Id));
}
break;
case RemoveDeploymentScriptByInputObject:
- if (ShouldProcess(Name, "Remove Deployment Script"))
+ scriptName = InputObject.Name;
+ if (ShouldProcess(scriptName, "Remove Deployment Script"))
{
- DeploymentScriptsSdkClient.DeleteDeploymentScript(InputObject.Name, ResourceIdUtility.GetResourceGroupName(InputObject.Id));
+ DeploymentScriptsSdkClient.DeleteDeploymentScript(scriptName,
+ ResourceIdUtility.GetResourceGroupName(InputObject.Id));
}
break;
default:
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentScripts/SaveAzDeploymentScriptLog.cs b/src/Resources/ResourceManager/Implementation/DeploymentScripts/SaveAzDeploymentScriptLog.cs
index b7f4cabae5f1..2417907810a0 100644
--- a/src/Resources/ResourceManager/Implementation/DeploymentScripts/SaveAzDeploymentScriptLog.cs
+++ b/src/Resources/ResourceManager/Implementation/DeploymentScripts/SaveAzDeploymentScriptLog.cs
@@ -21,6 +21,7 @@
using System;
using System.IO;
using System.Management.Automation;
+using System.Text;
namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
{
@@ -53,11 +54,12 @@ public class SaveAzDeploymentScriptLog : DeploymentScriptCmdletBase
[ResourceIdCompleter("Microsoft.Resources/deploymentScripts")]
public string DeploymentScriptResourceId { get; set; }
+ [Alias("DeploymentScriptInputObject")]
[Parameter(Position = 0, ParameterSetName = SaveDeploymentScriptLogByInputObject, Mandatory = true,
ValueFromPipeline = true,
HelpMessage = "The deployment script PowerShell object.")]
[ValidateNotNullOrEmpty]
- public PsDeploymentScript DeploymentScriptInputObject { get; set; }
+ public PsDeploymentScript DeploymentScriptObject { get; set; }
[Parameter(Position = 2, ParameterSetName = SaveDeploymentScriptLogByName, Mandatory = true, HelpMessage = "The directory path to save deployment script log.")]
[Parameter(Position = 1, ParameterSetName = SaveDeploymentScriptLogByResourceId, Mandatory = true, HelpMessage = "The directory path to save deployment script log.")]
@@ -84,25 +86,28 @@ public override void ExecuteCmdlet()
PsDeploymentScriptLog deploymentScriptLog;
int tailParam = this.IsParameterBound(c => c.Tail) ? Tail : 0;
+ string scriptName = "";
try
{
switch (ParameterSetName)
{
case SaveDeploymentScriptLogByName:
+ scriptName = Name;
deploymentScriptLog =
- DeploymentScriptsSdkClient.GetDeploymentScriptLog(Name, ResourceGroupName, tailParam);
+ DeploymentScriptsSdkClient.GetDeploymentScriptLog(scriptName, ResourceGroupName, tailParam);
break;
case SaveDeploymentScriptLogByResourceId:
- deploymentScriptLog = DeploymentScriptsSdkClient.GetDeploymentScriptLog(
- ResourceIdUtility.GetResourceName(this.DeploymentScriptResourceId),
+ scriptName = ResourceIdUtility.GetResourceName(this.DeploymentScriptResourceId);
+ deploymentScriptLog = DeploymentScriptsSdkClient.GetDeploymentScriptLog(scriptName,
ResourceIdUtility.GetResourceGroupName(this.DeploymentScriptResourceId),
tailParam);
break;
case SaveDeploymentScriptLogByInputObject:
+ scriptName = DeploymentScriptObject.Name;
deploymentScriptLog = DeploymentScriptsSdkClient.GetDeploymentScriptLog(
- DeploymentScriptInputObject.Name,
- ResourceIdUtility.GetResourceGroupName(DeploymentScriptInputObject.Id),
+ scriptName,
+ ResourceIdUtility.GetResourceGroupName(DeploymentScriptObject.Id),
tailParam);
break;
default:
@@ -118,13 +123,26 @@ public override void ExecuteCmdlet()
this.ConfirmAction(
this.Force || !AzureSession.Instance.DataStore.FileExists(outputPathWithFileName),
string.Format(
- Properties.Resources.DeploymentScriptLogFileExists, Name, OutputPath),
+ Properties.Resources.DeploymentScriptLogFileExists, scriptName, OutputPath),
Properties.Resources.DeploymentScriptShouldProcessString,
OutputPath,
() =>
{
+ //Standardize newline character to be written into file
+ StringBuilder logs = new StringBuilder();
+ StringReader stringReader = new StringReader(deploymentScriptLog.Log);
+
+ String line = stringReader.ReadLine();
+ while(line != null)
+ {
+ logs.Append(line);
+ line = stringReader.ReadLine();
+ if (line != null)
+ logs.Append(Environment.NewLine);
+ }
+
AzureSession.Instance.DataStore.WriteFile(outputPathWithFileName,
- deploymentScriptLog.Log);
+ logs.ToString());
WriteObject(new PsDeploymentScriptLogPath() {Path = outputPathWithFileName});
});
diff --git a/src/Resources/ResourceManager/ResourceManager.format.ps1xml b/src/Resources/ResourceManager/ResourceManager.format.ps1xml
index 5d76344f9dc4..298ec5f47cb6 100644
--- a/src/Resources/ResourceManager/ResourceManager.format.ps1xml
+++ b/src/Resources/ResourceManager/ResourceManager.format.ps1xml
@@ -342,6 +342,10 @@
$_.Status.ContainerInstanceId
+
+
+ OutputsString
+
RetentionInterval
diff --git a/src/Resources/ResourceManager/SdkExtensions/ResourcesExtensions.cs b/src/Resources/ResourceManager/SdkExtensions/ResourcesExtensions.cs
index f928699267df..f2e286f74b1d 100644
--- a/src/Resources/ResourceManager/SdkExtensions/ResourcesExtensions.cs
+++ b/src/Resources/ResourceManager/SdkExtensions/ResourcesExtensions.cs
@@ -195,6 +195,35 @@ private static string ConstructTemplateLinkView(TemplateLink templateLink)
return result.ToString();
}
+ public static string ConstructOutputTable(IDictionary dictionary)
+ {
+ if (dictionary == null)
+ {
+ return null;
+ }
+
+ var maxNameLength = 18;
+ dictionary.Keys.ForEach(k => maxNameLength = Math.Max(maxNameLength, k.Length + 2));
+
+ StringBuilder output = new StringBuilder();
+
+ if (dictionary.Count > 0)
+ {
+ string rowFormat = "{0, -" + maxNameLength + "} {1}\r\n";
+ output.AppendLine();
+ output.AppendFormat(rowFormat, "Key", "Value");
+ output.AppendFormat(rowFormat, GeneralUtilities.GenerateSeparator(maxNameLength, "="), GeneralUtilities.GenerateSeparator(maxNameLength, "="));
+
+ foreach (KeyValuePair pair in dictionary)
+ {
+ String val = pair.Value.ToString().Replace("\n", "\n" + GeneralUtilities.GenerateSeparator(maxNameLength, " ") + " ");
+ output.AppendFormat(rowFormat, pair.Key, val);
+ }
+ }
+
+ return output.ToString();
+ }
+
public static string ConstructDeploymentVariableTable(Dictionary dictionary)
{
if (dictionary == null)
diff --git a/src/Resources/ResourceManager/SdkModels/DeploymentScripts/PsDeploymentScript.cs b/src/Resources/ResourceManager/SdkModels/DeploymentScripts/PsDeploymentScript.cs
index e3bee8d93348..b7c2f98d4bd1 100644
--- a/src/Resources/ResourceManager/SdkModels/DeploymentScripts/PsDeploymentScript.cs
+++ b/src/Resources/ResourceManager/SdkModels/DeploymentScripts/PsDeploymentScript.cs
@@ -12,6 +12,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkExtensions;
using Microsoft.Azure.Management.ResourceManager.Models;
using System.Collections.Generic;
@@ -25,6 +26,11 @@ public class PsDeploymentScript : PsAzureScriptBase
public IDictionary