Skip to content

Commit 431e632

Browse files
author
Samuel Anudeep
committed
Removed custom request headers, as client request ID will be passed via the Delegating Handler
1 parent 74ad567 commit 431e632

File tree

8 files changed

+73
-85
lines changed

8 files changed

+73
-85
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ContainerAPIs.cs

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
1516
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
1617
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
18+
using Microsoft.Rest.Azure;
19+
using Microsoft.Rest.Azure.OData;
1720
using System;
1821
using System.Collections.Generic;
1922
using System.Linq;
@@ -30,15 +33,22 @@ public partial class ServiceClientAdapter
3033
/// <param name="parameters">Query parameters</param>
3134
/// <returns>List of protection containers</returns>
3235
public IEnumerable<ProtectionContainerResource> ListContainers(
33-
ProtectionContainerListQueryParams queryParams)
36+
ODataQuery<BMSContainerQueryObject> queryFilter,
37+
string skipToken = default(string))
3438
{
35-
var listResponse = BmsAdapter.Client.Containers.ListAsync(
36-
BmsAdapter.GetResourceGroupName(),
37-
BmsAdapter.GetResourceName(),
38-
queryParams,
39-
BmsAdapter.GetCustomRequestHeaders(),
40-
BmsAdapter.CmdletCancellationToken).Result;
41-
return listResponse.ItemList.ProtectionContainers;
39+
Func<IPage<ProtectionContainerResource>> listAsync =
40+
() => BmsAdapter.Client.ProtectionContainers.ListWithHttpMessagesAsync(
41+
BmsAdapter.GetResourceName(),
42+
BmsAdapter.GetResourceGroupName(),
43+
queryFilter,
44+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
45+
46+
Func<string, IPage<ProtectionContainerResource>> listNextAsync =
47+
nextLink => BmsAdapter.Client.ProtectionContainers.ListNextWithHttpMessagesAsync(
48+
nextLink,
49+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
50+
51+
return HelperUtils.GetPagedList(listAsync, listNextAsync);
4252
}
4353

4454
/// <summary>
@@ -55,8 +65,7 @@ public IEnumerable<BackupEngineResource> ListBackupEngines(BackupEngineListQuery
5565
BmsAdapter.GetResourceName(),
5666
queryParams,
5767
paginationParam,
58-
BmsAdapter.GetCustomRequestHeaders(),
59-
BmsAdapter.CmdletCancellationToken).Result;
68+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
6069
return listResponse.ItemList.BackupEngines;
6170
}
6271

@@ -71,9 +80,8 @@ public BaseRecoveryServicesJobResponse RefreshContainers()
7180
var response = BmsAdapter.Client.Containers.RefreshAsync(
7281
resourceGroupName,
7382
resourceName,
74-
BmsAdapter.GetCustomRequestHeaders(),
75-
AzureFabricName,
76-
BmsAdapter.CmdletCancellationToken).Result;
83+
AzureFabricName,
84+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
7785
return response;
7886
}
7987

@@ -89,8 +97,7 @@ public AzureOperationResponse UnregisterContainers(string containerName)
8997
resourceGroupName,
9098
resourceName,
9199
containerName,
92-
BmsAdapter.GetCustomRequestHeaders(),
93-
BmsAdapter.CmdletCancellationToken).Result;
100+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
94101
return response;
95102
}
96103
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ItemAPIs.cs

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public Microsoft.Rest.Azure.AzureOperationResponse CreateOrUpdateProtectedItem(
3838
string resourceGroupName = BmsAdapter.GetResourceGroupName();
3939

4040
return BmsAdapter.Client.ProtectedItems.CreateOrUpdateWithHttpMessagesAsync(
41-
resourceName,
42-
resourceGroupName,
43-
AzureFabricName,
44-
containerName,
45-
protectedItemName,
46-
request,
47-
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
41+
resourceName,
42+
resourceGroupName,
43+
AzureFabricName,
44+
containerName,
45+
protectedItemName,
46+
request,
47+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
4848
}
4949

5050
/// <summary>
@@ -61,12 +61,12 @@ public Microsoft.Rest.Azure.AzureOperationResponse DeleteProtectedItem(
6161
string resourceGroupName = BmsAdapter.GetResourceGroupName();
6262

6363
return BmsAdapter.Client.ProtectedItems.DeleteWithHttpMessagesAsync(
64-
resourceName,
65-
resourceGroupName,
66-
AzureFabricName,
67-
containerName,
68-
protectedItemName,
69-
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
64+
resourceName,
65+
resourceGroupName,
66+
AzureFabricName,
67+
containerName,
68+
protectedItemName,
69+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
7070
}
7171

7272
/// <summary>
@@ -85,13 +85,13 @@ public Microsoft.Rest.Azure.AzureOperationResponse<ProtectedItemResource> GetPro
8585
string resourceGroupName = BmsAdapter.GetResourceGroupName();
8686

8787
return BmsAdapter.Client.ProtectedItems.GetWithHttpMessagesAsync(
88-
resourceName,
89-
resourceGroupName,
90-
AzureFabricName,
91-
containerName,
92-
protectedItemName,
93-
queryFilter,
94-
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
88+
resourceName,
89+
resourceGroupName,
90+
AzureFabricName,
91+
containerName,
92+
protectedItemName,
93+
queryFilter,
94+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
9595
}
9696

9797
/// <summary>
@@ -108,22 +108,21 @@ public List<ProtectedItemResource> ListProtectedItem(
108108
string resourceName = BmsAdapter.GetResourceName();
109109
string resourceGroupName = BmsAdapter.GetResourceGroupName();
110110

111-
Func<Microsoft.Rest.Azure.IPage<ProtectedItemResource>> listAsync =
111+
Func<Microsoft.Rest.Azure.IPage<ProtectedItemResource>> listAsync =
112112
() => BmsAdapter.Client.ProtectedItems.ListWithHttpMessagesAsync(
113-
resourceName,
114-
resourceGroupName,
115-
queryFilter,
116-
skipToken,
117-
BmsAdapter.GetCustomRequestHeaders(),
118-
BmsAdapter.CmdletCancellationToken).Result;
113+
resourceName,
114+
resourceGroupName,
115+
queryFilter,
116+
skipToken,
117+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
119118

120119
Func<string, Microsoft.Rest.Azure.IPage<ProtectedItemResource>> listNextAsync =
121-
nextLink => BmsAdapter.Client.ProtectedItems.ListNextWithHttpMessagesAsync(nextLink,
122-
BmsAdapter.GetCustomRequestHeaders(),
123-
BmsAdapter.CmdletCancellationToken).Result;
120+
nextLink => BmsAdapter.Client.ProtectedItems.ListNextWithHttpMessagesAsync(
121+
nextLink,
122+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
124123

125124
return HelperUtils.GetPagedList<ProtectedItemResource>(listAsync, listNextAsync);
126-
}
125+
}
127126

128127
/// <summary>
129128
/// Triggers backup on the specified item
@@ -132,8 +131,8 @@ public List<ProtectedItemResource> ListProtectedItem(
132131
/// <param name="itemName">Name of the item</param>
133132
/// <returns>Job created by this operation</returns>
134133
public Microsoft.Rest.Azure.AzureOperationResponse TriggerBackup(
135-
string containerName,
136-
string itemName,
134+
string containerName,
135+
string itemName,
137136
DateTime? expiryDateTimeUtc)
138137
{
139138
BackupRequestResource triggerBackupRequest = new BackupRequestResource();
@@ -148,8 +147,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse TriggerBackup(
148147
containerName,
149148
itemName,
150149
triggerBackupRequest,
151-
BmsAdapter.GetCustomRequestHeaders(),
152-
BmsAdapter.CmdletCancellationToken).Result;
150+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
153151
}
154152
}
155153
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/JobAPIs.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ public JobResource GetJob(string jobId)
3838
resourceGroupName,
3939
resourceName,
4040
jobId,
41-
BmsAdapter.GetCustomRequestHeaders(),
42-
BmsAdapter.CmdletCancellationToken).Result;
41+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
4342
}
4443

4544
/// <summary>
@@ -79,13 +78,11 @@ public List<JobResource> GetJobs(
7978
resourceGroupName,
8079
queryFilter,
8180
skipToken,
82-
BmsAdapter.GetCustomRequestHeaders(),
83-
BmsAdapter.CmdletCancellationToken).Result;
81+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
8482

8583
Func<string, Microsoft.Rest.Azure.IPage<JobResource>> listNextAsync =
8684
nextLink => BmsAdapter.Client.ProtectedItems.ListNextWithHttpMessagesAsync(nextLink,
87-
BmsAdapter.GetCustomRequestHeaders(),
88-
BmsAdapter.CmdletCancellationToken).Result;
85+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
8986

9087
return HelperUtils.GetPagedList<JobResource>(listAsync, listNextAsync);
9188
}
@@ -104,8 +101,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse CancelJob(string jobId)
104101
resourceGroupName,
105102
resourceName,
106103
jobId,
107-
BmsAdapter.GetCustomRequestHeaders(),
108-
BmsAdapter.CmdletCancellationToken).Result;
104+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
109105
}
110106

111107
/// <summary>
@@ -124,8 +120,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse GetJobOperationStatus(string
124120
resourceName,
125121
jobId,
126122
operationId,
127-
BmsAdapter.GetCustomRequestHeaders(),
128-
BmsAdapter.CmdletCancellationToken).Result;
123+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
129124
}
130125

131126
#region private helpers

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/OperationStatusAPIs.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public BaseRecoveryServicesJobResponse GetRefreshContainerOperationResultByURL(
3636

3737
return BmsAdapter.Client.Containers.GetRefreshOperationResultByURLAsync(
3838
operationResultLink,
39-
BmsAdapter.CmdletCancellationToken).Result;
39+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
4040
}
4141

4242
/// <summary>
@@ -52,8 +52,7 @@ public BackUpOperationStatusResponse GetProtectedItemOperationStatusByURL(
5252

5353
return BmsAdapter.Client.GetOperationStatusByURLAsync(
5454
operationResultLink,
55-
BmsAdapter.GetCustomRequestHeaders(),
56-
BmsAdapter.CmdletCancellationToken).Result;
55+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
5756
}
5857
}
5958
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/PolicyAPIs.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse<ProtectionPolicyResource> Cre
4141
BmsAdapter.GetResourceName(),
4242
policyName,
4343
request,
44-
BmsAdapter.GetCustomRequestHeaders(),
45-
BmsAdapter.CmdletCancellationToken).Result;
44+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
4645
}
4746

4847
/// <summary>
@@ -56,8 +55,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse<ProtectionPolicyResource> Get
5655
BmsAdapter.GetResourceGroupName(),
5756
BmsAdapter.GetResourceName(),
5857
policyName,
59-
BmsAdapter.GetCustomRequestHeaders(),
60-
BmsAdapter.CmdletCancellationToken).Result;
58+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
6159
}
6260

6361
/// <summary>
@@ -75,14 +73,12 @@ public List<ProtectionPolicyResource> ListProtectionPolicy(
7573
BmsAdapter.GetResourceName(),
7674
queryFilter,
7775
skipToken,
78-
BmsAdapter.GetCustomRequestHeaders(),
79-
BmsAdapter.CmdletCancellationToken).Result;
76+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
8077

8178
Func<string, Microsoft.Rest.Azure.IPage<ProtectionPolicyResource>> listNextAsync =
8279
nextLink => BmsAdapter.Client.ProtectionPolicy.ListNextWithHttpMessagesAsync(
8380
nextLink,
84-
BmsAdapter.GetCustomRequestHeaders(),
85-
BmsAdapter.CmdletCancellationToken).Result;
81+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
8682

8783
return HelperUtils.GetPagedList<ProtectionPolicyResource>(listAsync, listNextAsync);
8884
}
@@ -96,8 +92,7 @@ public BackUpOperationStatusResponse GetProtectionPolicyOperationStatusByURL(str
9692
{
9793
return BmsAdapter.Client.GetOperationStatusByURLAsync(
9894
url,
99-
BmsAdapter.GetCustomRequestHeaders(),
100-
BmsAdapter.CmdletCancellationToken).Result;
95+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
10196
}
10297

10398
/// <summary>
@@ -111,8 +106,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse RemoveProtectionPolicy(
111106
BmsAdapter.GetResourceGroupName(),
112107
BmsAdapter.GetResourceName(),
113108
policyName,
114-
BmsAdapter.GetCustomRequestHeaders(),
115-
BmsAdapter.CmdletCancellationToken).Result;
109+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
116110
}
117111
}
118112
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ProtectableItemAPI.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public List<WorkloadProtectableItemResource> ListProtectableItem(
3939
resourceGroupName,
4040
queryFilter,
4141
skipToken,
42-
BmsAdapter.GetCustomRequestHeaders(),
43-
BmsAdapter.CmdletCancellationToken).Result;
42+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
4443
}
4544
}
4645
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RecoveryPointsAPIs.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ string recoveryPointId
4949
containerName,
5050
protectedItemName,
5151
recoveryPointId,
52-
BmsAdapter.GetCustomRequestHeaders(),
53-
BmsAdapter.CmdletCancellationToken).Result;
52+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
5453

5554
return response;
5655
}
@@ -80,13 +79,11 @@ ODataQuery<BMSRPQueryObject> queryFilter
8079
containerName,
8180
protectedItemName,
8281
queryFilter,
83-
BmsAdapter.GetCustomRequestHeaders(),
84-
BmsAdapter.CmdletCancellationToken).Result;
82+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
8583

8684
Func<string, Microsoft.Rest.Azure.IPage<RecoveryPointResource>> listNextAsync =
8785
nextLink => BmsAdapter.Client.RecoveryPoints.ListNextWithHttpMessagesAsync(nextLink,
88-
BmsAdapter.GetCustomRequestHeaders(),
89-
BmsAdapter.CmdletCancellationToken).Result;
86+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
9087

9188
var response = HelperUtils.GetPagedList<RecoveryPointResource>(listAsync, listNextAsync);
9289
return response;

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse RestoreDisk(AzureVmRecoveryPo
7878
protectedItemUri,
7979
recoveryPointId,
8080
triggerRestoreRequest,
81-
BmsAdapter.GetCustomRequestHeaders(),
82-
BmsAdapter.CmdletCancellationToken).Result;
81+
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
8382

8483
return response;
8584
}

0 commit comments

Comments
 (0)