Merge pull request #35 from Azure/dev

huangpf · huangpf · commit 186b7284b78c · 2015-06-30T17:33:45.000-07:00
.
diff --git a/src/Common/Commands.Common/ComputeCloudException.cs b/src/Common/Commands.Common/ComputeCloudException.cs
@@ -35,20 +35,20 @@ protected static string GetErrorMessageWithRequestIdInfo(CloudException cloudExc
                 throw new ArgumentNullException("cloudException");
             }
 
-            var sb = new StringBuilder(cloudException.Message);
+            var sb = new StringBuilder();
 
-            if (cloudException.Response != null)
+            if (!string.IsNullOrEmpty(cloudException.Message))
+            {
+                sb.Append(cloudException.Message);
+            }
+
+            if (cloudException.Response != null &&
+                cloudException.Response.Headers != null)
             {
                 var headers = cloudException.Response.Headers;
-                if (headers != null && headers.ContainsKey(RequestIdHeaderInResponse))
+                if (headers.ContainsKey(RequestIdHeaderInResponse))
                 {
-                    if (sb.Length > 0)
-                    {
-                        // If the original exception message is not empty, append a new line here.
-                        sb.Append(Environment.NewLine);
-                    }
-
-                    sb.AppendFormat(
+                    sb.AppendLine().AppendFormat(
                         Properties.Resources.ComputeCloudExceptionOperationIdMessage,
                         headers[RequestIdHeaderInResponse].FirstOrDefault());
                 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/RemoveAzureAvailabilitySetCommand.cs b/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/RemoveAzureAvailabilitySetCommand.cs
@@ -52,9 +52,7 @@ public override void ExecuteCmdlet()
 
             ExecuteClientAction(() =>
             {
-                if (this.Force.IsPresent
-                || this.ShouldContinue(Properties.Resources.AvailabilitySetRemovalConfirmation,
-                                       Properties.Resources.AvailabilitySetRemovalCaption))
+                if (this.Force.IsPresent || this.ShouldContinue(Properties.Resources.AvailabilitySetRemovalConfirmation, Properties.Resources.AvailabilitySetRemovalCaption))
                 {
                     AzureOperationResponse op = this.AvailabilitySetClient.Delete(this.ResourceGroupName, this.Name);
                     var result = Mapper.Map<PSOperation>(op);
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/CustomScript/RemoveAzureVMCustomScriptExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/CustomScript/RemoveAzureVMCustomScriptExtensionCommand.cs
@@ -59,8 +59,7 @@ public override void ExecuteCmdlet()
 
             ExecuteClientAction(() =>
             {
-                if (this.Force.IsPresent
-                 || this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))
+                if (this.Force.IsPresent || this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))
                 {
                     var op = this.VirtualMachineExtensionClient.Delete(this.ResourceGroupName, this.VMName, this.Name);
                     WriteObject(op);
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/RemoveAzureVMExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/RemoveAzureVMExtensionCommand.cs
@@ -60,8 +60,7 @@ public override void ExecuteCmdlet()
 
             ExecuteClientAction(() =>
             {
-                if (this.Force.IsPresent
-                 || this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))
+                if (this.Force.IsPresent || this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))
                 {
                     var op = this.VirtualMachineExtensionClient.Delete(this.ResourceGroupName, this.VMName, this.Name);
                     var result = Mapper.Map<PSComputeLongRunningOperation>(op);
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/VMAccess/RemoveAzureVMAccessExtension.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/VMAccess/RemoveAzureVMAccessExtension.cs
@@ -59,8 +59,7 @@ public override void ExecuteCmdlet()
 
             ExecuteClientAction(() =>
             {
-                if (this.Force.IsPresent
-                 || this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))
+                if (this.Force.IsPresent || this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))
                 {
                     var op = this.VirtualMachineExtensionClient.Delete(this.ResourceGroupName, this.VMName, this.Name);
                     WriteObject(op);
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs
@@ -60,8 +60,7 @@ public override void ExecuteCmdlet()
 
             ExecuteClientAction(() =>
             {
-                if (this.Force.IsPresent
-                 || this.ShouldContinue(Properties.Resources.VirtualMachineStoppingConfirmation, Properties.Resources.VirtualMachineStoppingCaption))
+                if (this.Force.IsPresent || this.ShouldContinue(Properties.Resources.VirtualMachineStoppingConfirmation, Properties.Resources.VirtualMachineStoppingCaption))
                 {
                     Action<Func<string, string, ComputeLongRunningOperationResponse>> call = f =>
                     {
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/RemoveAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/RemoveAzureVMCommand.cs
@@ -52,8 +52,7 @@ public override void ExecuteCmdlet()
             base.ExecuteCmdlet();
             ExecuteClientAction(() =>
             {
-                if (this.Force.IsPresent
-                 || this.ShouldContinue(Properties.Resources.VirtualMachineRemovalConfirmation, Properties.Resources.VirtualMachineRemovalCaption))
+                if (this.Force.IsPresent || this.ShouldContinue(Properties.Resources.VirtualMachineRemovalConfirmation, Properties.Resources.VirtualMachineRemovalCaption))
                 {
                     var op = this.VirtualMachineClient.Delete(this.ResourceGroupName, this.Name);
                     var result = Mapper.Map<PSComputeLongRunningOperation>(op);

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,7 @@ public override void ExecuteCmdlet()`
`52`	`52`
`53`	`53`	`ExecuteClientAction(() =>`
`54`	`54`	`{`
`55`		`- if (this.Force.IsPresent`
`56`		`- \|\| this.ShouldContinue(Properties.Resources.AvailabilitySetRemovalConfirmation,`
`57`		`- Properties.Resources.AvailabilitySetRemovalCaption))`
	`55`	`+ if (this.Force.IsPresent \|\| this.ShouldContinue(Properties.Resources.AvailabilitySetRemovalConfirmation, Properties.Resources.AvailabilitySetRemovalCaption))`
`58`	`56`	`{`
`59`	`57`	`AzureOperationResponse op = this.AvailabilitySetClient.Delete(this.ResourceGroupName, this.Name);`
`60`	`58`	`var result = Mapper.Map<PSOperation>(op);`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ public override void ExecuteCmdlet()`
`59`	`59`
`60`	`60`	`ExecuteClientAction(() =>`
`61`	`61`	`{`
`62`		`- if (this.Force.IsPresent`
`63`		`- \|\| this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))`
	`62`	`+ if (this.Force.IsPresent \|\| this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))`
`64`	`63`	`{`
`65`	`64`	`var op = this.VirtualMachineExtensionClient.Delete(this.ResourceGroupName, this.VMName, this.Name);`
`66`	`65`	`WriteObject(op);`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ public override void ExecuteCmdlet()`
`60`	`60`
`61`	`61`	`ExecuteClientAction(() =>`
`62`	`62`	`{`
`63`		`- if (this.Force.IsPresent`
`64`		`- \|\| this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))`
	`63`	`+ if (this.Force.IsPresent \|\| this.ShouldContinue(Properties.Resources.VirtualMachineExtensionRemovalConfirmation, Properties.Resources.VirtualMachineExtensionRemovalCaption))`
`65`	`64`	`{`
`66`	`65`	`var op = this.VirtualMachineExtensionClient.Delete(this.ResourceGroupName, this.VMName, this.Name);`
`67`	`66`	`var result = Mapper.Map<PSComputeLongRunningOperation>(op);`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ public override void ExecuteCmdlet()`
`52`	`52`	`base.ExecuteCmdlet();`
`53`	`53`	`ExecuteClientAction(() =>`
`54`	`54`	`{`
`55`		`- if (this.Force.IsPresent`
`56`		`- \|\| this.ShouldContinue(Properties.Resources.VirtualMachineRemovalConfirmation, Properties.Resources.VirtualMachineRemovalCaption))`
	`55`	`+ if (this.Force.IsPresent \|\| this.ShouldContinue(Properties.Resources.VirtualMachineRemovalConfirmation, Properties.Resources.VirtualMachineRemovalCaption))`
`57`	`56`	`{`
`58`	`57`	`var op = this.VirtualMachineClient.Delete(this.ResourceGroupName, this.Name);`
`59`	`58`	`var result = Mapper.Map<PSComputeLongRunningOperation>(op);`