Skip to content

Commit b1b2a42

Browse files
avneeshraiusitavneeshraiusit
committed
Taking PR comments
1 parent 614b4f4 commit b1b2a42

File tree

4 files changed

+40
-29
lines changed

4 files changed

+40
-29
lines changed

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ function Test-RecoveryServicesVaultCRUDTests
4343
Assert-NotNull($vaultToBeRemoved.ID)
4444
Assert-NotNull($vaultToBeRemoved.Type)
4545

46-
# Download Vault settings file
47-
Get-AzureRmRecoveryServicesVaultSettingsFile -Vault $vaultToBeRemoved
48-
4946
# Remove Vault
5047
Remove-AzureRmRecoveryServicesVault -Vault $vaultToBeRemoved
5148
$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/RecoveryServicesCmdletBase.cs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2121
using Microsoft.Azure.Commands.ResourceManager.Common;
2222
using Newtonsoft.Json;
23+
using System.Text;
2324

2425
namespace Microsoft.Azure.Commands.RecoveryServices
2526
{
@@ -77,27 +78,30 @@ public void HandleException(Exception ex)
7778
string originalMessage = cloudException.Error.OriginalMessage;
7879
error = JsonConvert.DeserializeObject<ARMError>(originalMessage);
7980

80-
string exceptionMessage = Properties.Resources.CloudExceptionDetails;
81+
StringBuilder exceptionMessage = new StringBuilder();
82+
exceptionMessage.Append(Properties.Resources.CloudExceptionDetails);
8183

8284
if (error.Error.Details != null)
8385
{
8486
foreach (ARMExceptionDetails detail in error.Error.Details)
8587
{
86-
exceptionMessage = exceptionMessage + string.Concat(
87-
string.IsNullOrEmpty(detail.ErrorCode) ? "" : "\nErrorCode: " + detail.ErrorCode,
88-
string.IsNullOrEmpty(detail.Message) ? "" : "\nMessage: " + detail.Message,
89-
"\n");
88+
if (!string.IsNullOrEmpty(detail.ErrorCode))
89+
exceptionMessage.AppendLine("ErrorCode: " + detail.ErrorCode);
90+
if (!string.IsNullOrEmpty(detail.Message))
91+
exceptionMessage.AppendLine("Message: " + detail.Message);
92+
93+
exceptionMessage.AppendLine();
9094
}
9195
}
9296
else
9397
{
94-
exceptionMessage = exceptionMessage + string.Concat(
95-
string.IsNullOrEmpty(error.Error.ErrorCode) ? "" : "\nErrorCode: " + error.Error.ErrorCode,
96-
string.IsNullOrEmpty(error.Error.Message) ? "" : "\nMessage: " + error.Error.Message,
97-
"\n");
98+
if (!string.IsNullOrEmpty(error.Error.ErrorCode))
99+
exceptionMessage.AppendLine("ErrorCode: " + error.Error.ErrorCode);
100+
if (!string.IsNullOrEmpty(error.Error.Message))
101+
exceptionMessage.AppendLine("Message: " + error.Error.Message);
98102
}
99103

100-
throw new InvalidOperationException(exceptionMessage);
104+
throw new InvalidOperationException(exceptionMessage.ToString());
101105
}
102106
else
103107
{

‎src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/SiteRecoveryCmdletBase.cs

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2727
using Properties = Microsoft.Azure.Commands.SiteRecovery.Properties;
2828
using Newtonsoft.Json;
29+
using System.Text;
2930

3031
namespace Microsoft.Azure.Commands.SiteRecovery
3132
{
@@ -83,31 +84,38 @@ public void HandleException(Exception ex)
8384
string originalMessage = cloudException.Error.OriginalMessage;
8485
error = JsonConvert.DeserializeObject<ARMError>(originalMessage);
8586

86-
string exceptionMessage = Properties.Resources.CloudExceptionDetails;
87+
StringBuilder exceptionMessage = new StringBuilder();
88+
exceptionMessage.Append(Properties.Resources.CloudExceptionDetails);
8789

8890
if (error.Error.Details != null)
8991
{
9092
foreach (ARMExceptionDetails detail in error.Error.Details)
9193
{
92-
exceptionMessage = exceptionMessage + string.Concat(
93-
string.IsNullOrEmpty(detail.ErrorCode) ? "" : "\nErrorCode: " + detail.ErrorCode,
94-
string.IsNullOrEmpty(detail.Message) ? "" : "\nMessage: " + detail.Message,
95-
string.IsNullOrEmpty(detail.PossibleCauses) ? "" : "\nPossible Causes: " + detail.PossibleCauses,
96-
string.IsNullOrEmpty(detail.RecommendedAction) ? "" : "\nRecommended Action: " + detail.RecommendedAction,
97-
string.IsNullOrEmpty(detail.ClientRequestId) ? "" : "\nClientRequestId: " + detail.ClientRequestId,
98-
string.IsNullOrEmpty(detail.ActivityId) ? "" : "\nActivityId: " + detail.ActivityId,
99-
"\n");
94+
if (!string.IsNullOrEmpty(detail.ErrorCode))
95+
exceptionMessage.AppendLine("ErrorCode: " + detail.ErrorCode);
96+
if (!string.IsNullOrEmpty(detail.Message))
97+
exceptionMessage.AppendLine("Message: " + detail.Message);
98+
if (!string.IsNullOrEmpty(detail.PossibleCauses))
99+
exceptionMessage.AppendLine("Possible Causes: " + detail.PossibleCauses);
100+
if (!string.IsNullOrEmpty(detail.RecommendedAction))
101+
exceptionMessage.AppendLine("Recommended Action: " + detail.RecommendedAction);
102+
if (!string.IsNullOrEmpty(detail.ClientRequestId))
103+
exceptionMessage.AppendLine("ClientRequestId: " + detail.ClientRequestId);
104+
if (!string.IsNullOrEmpty(detail.ActivityId))
105+
exceptionMessage.AppendLine("ActivityId: " + detail.ActivityId);
106+
107+
exceptionMessage.AppendLine();
100108
}
101109
}
102110
else
103111
{
104-
exceptionMessage = exceptionMessage + string.Concat(
105-
string.IsNullOrEmpty(error.Error.ErrorCode) ? "" : "\nErrorCode: " + error.Error.ErrorCode,
106-
string.IsNullOrEmpty(error.Error.Message) ? "" : "\nMessage: " + error.Error.Message,
107-
"\n");
112+
if (!string.IsNullOrEmpty(error.Error.ErrorCode))
113+
exceptionMessage.AppendLine("ErrorCode: " + error.Error.ErrorCode);
114+
if (!string.IsNullOrEmpty(error.Error.Message))
115+
exceptionMessage.AppendLine("Message: " + error.Error.Message);
108116
}
109117

110-
throw new InvalidOperationException(exceptionMessage);
118+
throw new InvalidOperationException(exceptionMessage.ToString());
111119
}
112120
else
113121
{

‎src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -966,11 +966,13 @@ public ASRJob(Job job)
966966
this.ClientRequestId = job.Properties.ActivityId;
967967
this.State = job.Properties.State;
968968
this.StateDescription = job.Properties.StateDescription;
969-
this.EndTime = job.Properties.EndTime.HasValue ? job.Properties.EndTime.Value.ToLocalTime() : (DateTime?)null;
970-
this.StartTime = job.Properties.StartTime.HasValue ? job.Properties.StartTime.Value.ToLocalTime() : (DateTime?)null;
971969
this.Name = job.Name;
972970
this.TargetObjectId = job.Properties.TargetObjectId;
973971
this.TargetObjectName = job.Properties.TargetObjectName;
972+
if(job.Properties.EndTime.HasValue)
973+
this.EndTime = job.Properties.EndTime.Value.ToLocalTime();
974+
if(job.Properties.StartTime.HasValue)
975+
this.StartTime = job.Properties.StartTime.Value.ToLocalTime();
974976
if (job.Properties.AllowedActions != null && job.Properties.AllowedActions.Count > 0)
975977
{
976978
this.AllowedActions = new List<string>();

0 commit comments

Comments
 (0)