Skip to content

Commit e065298

Browse files
mkheranimkherani
committed
PR comments
1 parent e57be42 commit e065298

File tree

8 files changed

+71
-39
lines changed

8 files changed

+71
-39
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/RemoveAzureRmRecoveryServicesBackupProtectionPolicy.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ public class RemoveAzureRmRecoveryServicesBackupProtectionPolicy : RecoveryServi
3636
internal const string PolicyNameParameterSet = "PolicyName";
3737
internal const string PolicyObjectParameterSet = "PolicyObject";
3838

39-
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsgs.Policy.Name, ParameterSetName = PolicyNameParameterSet)]
39+
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsgs.Policy.Name,
40+
ParameterSetName = PolicyNameParameterSet)]
4041
[ValidateNotNullOrEmpty]
4142
public string Name { get; set; }
4243

43-
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsgs.Policy.ProtectionPolicy, ValueFromPipeline = true,
44+
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsgs.Policy.ProtectionPolicy,
45+
ValueFromPipeline = true,
4446
ParameterSetName = PolicyObjectParameterSet)]
4547
[ValidateNotNullOrEmpty]
4648
public PolicyBase Policy { get; set; }

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesBackupProtectionPolicy.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
3030
/// <summary>
3131
/// Update existing protection policy
3232
/// </summary>
33-
[Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesBackupProtectionPolicy"), OutputType(typeof(List<CmdletModel.JobBase>))]
33+
[Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesBackupProtectionPolicy"),
34+
OutputType(typeof(List<CmdletModel.JobBase>))]
3435
public class SetAzureRmRecoveryServicesBackupProtectionPolicy : RecoveryServicesBackupCmdletBase
3536
{
36-
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsgs.Policy.ProtectionPolicy, ValueFromPipeline = true)]
37+
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsgs.Policy.ProtectionPolicy,
38+
ValueFromPipeline = true)]
3739
[ValidateNotNullOrEmpty]
3840
public PolicyBase Policy { get; set; }
3941

@@ -79,7 +81,7 @@ public override void ExecuteCmdlet()
7981

8082
IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(
8183
Policy.WorkloadType,
82-
Policy.BackupManagementType);
84+
Policy.BackupManagementType);
8385
ProtectionPolicyResponse policyResponse = psBackupProvider.ModifyPolicy();
8486
WriteDebug("ModifyPolicy http response from service: " +
8587
policyResponse.StatusCode.ToString());

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/RecoveryPoint/GetAzureRmRecoveryServicesBackupRecoveryPoint.cs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,25 @@ public class GetAzureRmRecoveryServicesBackupRecoveryPoint : RecoveryServicesBac
3030
internal const string DateTimeFilterParameterSet = "DateTimeFilter";
3131
internal const string RecoveryPointIdParameterSet = "RecoveryPointId";
3232

33-
[Parameter(Mandatory = true, ParameterSetName = DateTimeFilterParameterSet, ValueFromPipeline = false, Position = 0, HelpMessage = ParamHelpMsgs.RecoveryPoint.StartDate)]
33+
[Parameter(Mandatory = true, ParameterSetName = DateTimeFilterParameterSet,
34+
ValueFromPipeline = false, Position = 0, HelpMessage = ParamHelpMsgs.RecoveryPoint.StartDate)]
3435
[ValidateNotNullOrEmpty]
3536
public DateTime StartDate { get; set; }
3637

37-
[Parameter(Mandatory = true, ParameterSetName = DateTimeFilterParameterSet, ValueFromPipeline = false, Position = 1, HelpMessage = ParamHelpMsgs.RecoveryPoint.EndDate)]
38+
[Parameter(Mandatory = true, ParameterSetName = DateTimeFilterParameterSet, ValueFromPipeline = false,
39+
Position = 1, HelpMessage = ParamHelpMsgs.RecoveryPoint.EndDate)]
3840
[ValidateNotNullOrEmpty]
3941
public DateTime EndDate { get; set; }
4042

41-
[Parameter(Mandatory = true, ParameterSetName = DateTimeFilterParameterSet, ValueFromPipeline = true, Position = 2, HelpMessage = ParamHelpMsgs.RecoveryPoint.Item)]
42-
[Parameter(Mandatory = true, ParameterSetName = RecoveryPointIdParameterSet, ValueFromPipeline = true, Position = 0, HelpMessage = ParamHelpMsgs.RecoveryPoint.Item)]
43+
[Parameter(Mandatory = true, ParameterSetName = DateTimeFilterParameterSet,
44+
ValueFromPipeline = true, Position = 2, HelpMessage = ParamHelpMsgs.RecoveryPoint.Item)]
45+
[Parameter(Mandatory = true, ParameterSetName = RecoveryPointIdParameterSet,
46+
ValueFromPipeline = true, Position = 0, HelpMessage = ParamHelpMsgs.RecoveryPoint.Item)]
4347
[ValidateNotNullOrEmpty]
4448
public ItemBase Item { get; set; }
4549

46-
[Parameter(Mandatory = true, ParameterSetName = RecoveryPointIdParameterSet, ValueFromPipeline = false, Position = 1, HelpMessage = ParamHelpMsgs.RecoveryPoint.RecoveryPointId)]
50+
[Parameter(Mandatory = true, ParameterSetName = RecoveryPointIdParameterSet,
51+
ValueFromPipeline = false, Position = 1, HelpMessage = ParamHelpMsgs.RecoveryPoint.RecoveryPointId)]
4752
[ValidateNotNullOrEmpty]
4853
public string RecoveryPointId { get; set; }
4954

@@ -75,8 +80,10 @@ public override void ExecuteCmdlet()
7580

7681
parameter.Add(GetRecoveryPointParams.StartDate, StartDate);
7782
parameter.Add(GetRecoveryPointParams.EndDate, EndDate);
78-
PsBackupProviderManager providerManager = new PsBackupProviderManager(parameter, ServiceClientAdapter);
79-
IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(Item.ContainerType, Item.BackupManagementType);
83+
PsBackupProviderManager providerManager =
84+
new PsBackupProviderManager(parameter, ServiceClientAdapter);
85+
IPsBackupProvider psBackupProvider =
86+
providerManager.GetProviderInstance(Item.ContainerType, Item.BackupManagementType);
8087
var rpList = psBackupProvider.ListRecoveryPoints();
8188

8289
WriteDebug(String.Format("RPCount in Response = {0}", rpList.Count));
@@ -90,8 +97,10 @@ public override void ExecuteCmdlet()
9097
StartDate, EndDate, RecoveryPointId));
9198

9299
parameter.Add(GetRecoveryPointParams.RecoveryPointId, RecoveryPointId);
93-
PsBackupProviderManager providerManager = new PsBackupProviderManager(parameter, ServiceClientAdapter);
94-
IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(Item.ContainerType, Item.BackupManagementType);
100+
PsBackupProviderManager providerManager =
101+
new PsBackupProviderManager(parameter, ServiceClientAdapter);
102+
IPsBackupProvider psBackupProvider =
103+
providerManager.GetProviderInstance(Item.ContainerType, Item.BackupManagementType);
95104
WriteObject(psBackupProvider.GetRecoveryPointDetails());
96105
}
97106
else

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Restore/RestoreAzureRMRecoveryServicesBackupItem.cs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,18 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
3333
[Cmdlet(VerbsData.Restore, "AzureRmRecoveryServicesBackupItem"), OutputType(typeof(JobBase))]
3434
public class RestoreAzureRmRecoveryServicesBackupItem : RecoveryServicesBackupCmdletBase
3535
{
36-
[Parameter(Mandatory = true, ValueFromPipeline = true, Position = 0, HelpMessage = ParamHelpMsgs.RestoreDisk.RecoveryPoint)]
36+
[Parameter(Mandatory = true, ValueFromPipeline = true, Position = 0,
37+
HelpMessage = ParamHelpMsgs.RestoreDisk.RecoveryPoint)]
3738
[ValidateNotNullOrEmpty]
3839
public RecoveryPointBase RecoveryPoint { get; set; }
3940

40-
[Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountName)]
41+
[Parameter(Mandatory = true, Position = 1,
42+
HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountName)]
4143
[ValidateNotNullOrEmpty]
4244
public string StorageAccountName { get; set; }
4345

44-
[Parameter(Mandatory = true, Position = 2, HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountResourceGroupName)]
46+
[Parameter(Mandatory = true, Position = 2,
47+
HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountResourceGroupName)]
4548
[ValidateNotNullOrEmpty]
4649
public string StorageAccountResourceGroupName { get; set; }
4750

@@ -52,7 +55,9 @@ public override void ExecuteCmdlet()
5255
base.ExecuteCmdlet();
5356
StorageAccountName = StorageAccountName.ToLower();
5457
WriteDebug("InsideRestore. going to create ResourceManager Client");
55-
ResourcesNS.ResourceManagementClient rmClient = AzureSession.ClientFactory.CreateClient<ResourcesNS.ResourceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
58+
ResourcesNS.ResourceManagementClient rmClient =
59+
AzureSession.ClientFactory.CreateClient<ResourcesNS.ResourceManagementClient>(
60+
DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
5661
WriteDebug("Client Created successfully");
5762
ResourceIdentity identity = new ResourceIdentity();
5863
identity.ResourceName = StorageAccountName;
@@ -63,14 +68,17 @@ public override void ExecuteCmdlet()
6368
ResourcesNS.Models.ResourceGetResult resource = null;
6469
try
6570
{
66-
WriteDebug(String.Format("Query Microsoft.ClassicStorage with name = {0}", StorageAccountName));
67-
resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName, identity, CancellationToken.None).Result;
71+
WriteDebug(String.Format("Query Microsoft.ClassicStorage with name = {0}",
72+
StorageAccountName));
73+
resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName,
74+
identity, CancellationToken.None).Result;
6875
}
6976
catch (Exception)
7077
{
7178
identity.ResourceProviderNamespace = "Microsoft.Storage/storageAccounts";
7279
identity.ResourceProviderApiVersion = "2016-01-01";
73-
resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName, identity, CancellationToken.None).Result;
80+
resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName,
81+
identity, CancellationToken.None).Result;
7482
}
7583

7684
string storageAccountId = resource.Resource.Id;
@@ -79,15 +87,17 @@ public override void ExecuteCmdlet()
7987

8088
WriteDebug(String.Format("StorageId = {0}", storageAccountId));
8189

82-
PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
90+
PsBackupProviderManager providerManager = new PsBackupProviderManager(
91+
new Dictionary<System.Enum, object>()
8392
{
8493
{RestoreBackupItemParams.RecoveryPoint, RecoveryPoint},
8594
{RestoreBackupItemParams.StorageAccountId, storageAccountId},
8695
{RestoreBackupItemParams.StorageAccountLocation, storageAccountlocation},
8796
{RestoreBackupItemParams.StorageAccountType, storageAccountType}
8897
}, ServiceClientAdapter);
8998

90-
IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(RecoveryPoint.WorkloadType, RecoveryPoint.BackupManagementType);
99+
IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(
100+
RecoveryPoint.WorkloadType, RecoveryPoint.BackupManagementType);
91101
var jobResponse = psBackupProvider.TriggerRestore();
92102

93103
WriteDebug(String.Format("Restore submitted"));

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,11 @@ public ResourceGroupListResponse GetResouceGroups()
8383
/// <param name="vaultName">Name of the vault</param>
8484
/// <param name="vaultStorageUpdateRequest">Backup Properties Update</param>
8585
/// <returns>Azure Operation response object.</returns>
86-
public AzureOperationResponse UpdateVaultStorageType(string resouceGroupName, string vaultName, UpdateVaultStorageTypeRequest vaultStorageUpdateRequest)
86+
public AzureOperationResponse UpdateVaultStorageType(string resouceGroupName, string vaultName,
87+
UpdateVaultStorageTypeRequest vaultStorageUpdateRequest)
8788
{
8889
return this.recoveryServicesClient.Vaults.UpdateStorageType(resouceGroupName, vaultName,
89-
vaultStorageUpdateRequest, this.GetRequestHeaders());
90+
vaultStorageUpdateRequest, this.GetRequestHeaders());
9091
}
9192

9293
/// <summary>
@@ -97,7 +98,8 @@ public AzureOperationResponse UpdateVaultStorageType(string resouceGroupName, st
9798
/// <returns>Azure Resource Storage response object.</returns>
9899
public GetResourceStorageConfigResponse GetVaultStorageType(string resouceGroupName, string vaultName)
99100
{
100-
return this.recoveryServicesClient.Vaults.GetResourceStorageConfig(resouceGroupName, vaultName, this.GetRequestHeaders());
101+
return this.recoveryServicesClient.Vaults.GetResourceStorageConfig(resouceGroupName,
102+
vaultName, this.GetRequestHeaders());
101103
}
102104
}
103105
}

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,8 @@ public BackupVaultCreds() { }
484484
/// <param name="resourceName">resource name</param>
485485
/// <param name="managementCert">management cert</param>
486486
/// <param name="acsNamespace">acs namespace</param>
487-
public BackupVaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace)
487+
public BackupVaultCreds(string subscriptionId, string resourceName, string managementCert,
488+
AcsNamespace acsNamespace)
488489
: base(subscriptionId, resourceName, managementCert, acsNamespace, Constants.BackupVaultType) { }
489490

490491
/// <summary>
@@ -496,7 +497,8 @@ public BackupVaultCreds(string subscriptionId, string resourceName, string manag
496497
/// <param name="managementCert">management cert</param>
497498
/// <param name="acsNamespace">acs namespace</param>
498499
/// <param name="agentLinks">agent links</param>
499-
public BackupVaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace, string agentLinks)
500+
public BackupVaultCreds(string subscriptionId, string resourceName, string managementCert,
501+
AcsNamespace acsNamespace, string agentLinks)
500502
: this(subscriptionId, resourceName, managementCert, acsNamespace)
501503
{
502504
AgentLinks = agentLinks;

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRMRecoveryServicesVaultSettingsFile.cs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ public void GetAzureRMRecoveryServicesVaultBackupCredentials()
211211
subscriptionId, this.Vault.ResouceGroupName, this.Vault.Name, targetLocation));
212212

213213
// Generate certificate
214-
X509Certificate2 cert = CertUtils.CreateSelfSignedCertificate(VaultCertificateExpiryInHoursForBackup, subscriptionId.ToString(), this.Vault.Name);
214+
X509Certificate2 cert = CertUtils.CreateSelfSignedCertificate(
215+
VaultCertificateExpiryInHoursForBackup, subscriptionId.ToString(), this.Vault.Name);
215216

216217
AcsNamespace acsNamespace = null;
217218
string channelIntegrityKey = string.Empty;
@@ -230,11 +231,12 @@ public void GetAzureRMRecoveryServicesVaultBackupCredentials()
230231
// generate vault credentials
231232
string vaultCredsFileContent = GenerateVaultCreds(cert, subscriptionId, acsNamespace);
232233

233-
// NOTE: One of the scenarios for this cmdlet is to generate a file which will be an input to DPM servers.
234+
// NOTE: One of the scenarios for this cmdlet is to generate a file which will be an input
235+
// to DPM servers.
234236
// We found a bug in the DPM UI which is looking for a particular namespace in the input file.
235237
// The below is a hack to circumvent this issue and this would be removed once the bug can be fixed.
236238
vaultCredsFileContent = vaultCredsFileContent.Replace("Microsoft.Azure.Commands.AzureBackup.Models",
237-
"Microsoft.Azure.Portal.RecoveryServices.Models.Common");
239+
"Microsoft.Azure.Portal.RecoveryServices.Models.Common");
238240

239241
// prepare for download
240242
string fileName = string.Format("{0}_{1:ddd MMM dd yyyy}.VaultCredentials", displayName, DateTime.UtcNow);
@@ -290,17 +292,19 @@ private string GenerateVaultCreds(X509Certificate2 cert, string subscriptionId,
290292
/// <param name="subscriptionId">subscription Id</param>
291293
/// <param name="acsNamespace">acs namespace</param>
292294
/// <returns>xml file in string format</returns>
293-
private string GenerateVaultCredsForBackup(X509Certificate2 cert, string subscriptionId, AcsNamespace acsNamespace)
295+
private string GenerateVaultCredsForBackup(X509Certificate2 cert, string subscriptionId,
296+
AcsNamespace acsNamespace)
294297
{
295298
using (var output = new MemoryStream())
296299
{
297300
using (var writer = XmlWriter.Create(output, GetXmlWriterSettings()))
298301
{
299-
BackupVaultCreds backupVaultCreds = new BackupVaultCreds(subscriptionId,
300-
this.Vault.Name,
301-
CertUtils.SerializeCert(cert, X509ContentType.Pfx),
302-
acsNamespace,
303-
GetAgentLinks());
302+
BackupVaultCreds backupVaultCreds =
303+
new BackupVaultCreds(subscriptionId,
304+
this.Vault.Name,
305+
CertUtils.SerializeCert(cert, X509ContentType.Pfx),
306+
acsNamespace,
307+
GetAgentLinks());
304308
DataContractSerializer serializer = new DataContractSerializer(typeof(BackupVaultCreds));
305309
serializer.WriteObject(writer, backupVaultCreds);
306310

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/SetAzureRmRecoveryServicesBackupProperties.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ public override void ExecuteCmdlet()
5353
UpdateVaultStorageTypeRequest vaultStorageRequest = new UpdateVaultStorageTypeRequest();
5454
vaultStorageRequest.Properties = new StorageTypeProperties();
5555
vaultStorageRequest.Properties.StorageModelType = BackupStorageRedundancy.ToString();
56-
AzureOperationResponse storageResponse = RecoveryServicesClient.UpdateVaultStorageType(
57-
this.Vault.ResouceGroupName, this.Vault.Name, vaultStorageRequest);
56+
AzureOperationResponse storageResponse =
57+
RecoveryServicesClient.UpdateVaultStorageType(
58+
this.Vault.ResouceGroupName, this.Vault.Name, vaultStorageRequest);
5859
}
5960
else
6061
{

0 commit comments

Comments
 (0)