Skip to content

Commit a6cc1da

Browse files
cormacpaynecormacpayne
authored
Merge pull request #4086 from jaredmoo/sqlracefix2
Remove redundant setting of client request id in SQL cmdlets
2 parents 387f72f + 6b4719e commit a6cc1da

File tree

77 files changed

+493
-614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+493
-614
lines changed

‎src/ResourceManager/Sql/Commands.Sql/Advisor/Service/AzureSqlAdvisorCommunicatorBase.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,13 @@ public AzureSqlAdvisorCommunicatorBase(IAzureContext context)
6363
/// id tracing headers for the current cmdlet invocation.
6464
/// </summary>
6565
/// <returns>The SQL Management client for the currently selected subscription.</returns>
66-
protected SqlManagementClient GetCurrentSqlClient(string clientRequestId)
66+
protected SqlManagementClient GetCurrentSqlClient()
6767
{
6868
// Get the SQL management client for the current subscription
6969
if (SqlClient == null)
7070
{
7171
SqlClient = AzureSession.Instance.ClientFactory.CreateClient<SqlManagementClient>(Context, AzureEnvironment.Endpoint.ResourceManager);
7272
}
73-
74-
SqlClient.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
75-
SqlClient.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, clientRequestId);
7673
return SqlClient;
7774
}
7875
}

‎src/ResourceManager/Sql/Commands.Sql/Advisor/Service/AzureSqlDatabaseAdvisorAdapter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public AzureSqlDatabaseAdvisorAdapter(IAzureContext context)
5656
/// <returns>The Azure Sql Database Advisor object</returns>
5757
internal AzureSqlDatabaseAdvisorModel GetDatabaseAdvisor(string resourceGroupName, string serverName, string databaseName, string advisorName, bool expandRecommendedActions)
5858
{
59-
var response = Communicator.Get(resourceGroupName, serverName, databaseName, advisorName, expandRecommendedActions, Util.GenerateTracingId());
59+
var response = Communicator.Get(resourceGroupName, serverName, databaseName, advisorName, expandRecommendedActions);
6060
return new AzureSqlDatabaseAdvisorModel(resourceGroupName, serverName, databaseName, response);
6161
}
6262

@@ -70,7 +70,7 @@ internal AzureSqlDatabaseAdvisorModel GetDatabaseAdvisor(string resourceGroupNam
7070
/// <returns>A list of database advisor objects</returns>
7171
internal ICollection<AzureSqlDatabaseAdvisorModel> ListDatabaseAdvisors(string resourceGroupName, string serverName, string databaseName, bool expandRecommendedActions)
7272
{
73-
var response = Communicator.List(resourceGroupName, serverName, databaseName, expandRecommendedActions, Util.GenerateTracingId());
73+
var response = Communicator.List(resourceGroupName, serverName, databaseName, expandRecommendedActions);
7474
return response.Select(adv => new AzureSqlDatabaseAdvisorModel(resourceGroupName, serverName, databaseName, adv)).ToList();
7575
}
7676

@@ -81,7 +81,7 @@ internal ICollection<AzureSqlDatabaseAdvisorModel> ListDatabaseAdvisors(string r
8181
/// <returns>The upserted Azure Sql Database Advisor</returns>
8282
internal AzureSqlDatabaseAdvisorModel UpdateAutoExecuteStatus(AzureSqlDatabaseAdvisorModel model)
8383
{
84-
var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.DatabaseName, model.AdvisorName, model.AutoExecuteStatus, Util.GenerateTracingId());
84+
var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.DatabaseName, model.AdvisorName, model.AutoExecuteStatus);
8585
return new AzureSqlDatabaseAdvisorModel(model.ResourceGroupName, model.ServerName, model.DatabaseName, response);
8686
}
8787
}

‎src/ResourceManager/Sql/Commands.Sql/Advisor/Service/AzureSqlDatabaseAdvisorCommunicator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,27 @@ public AzureSqlDatabaseAdvisorCommunicator(IAzureContext context) : base(context
3636
/// <summary>
3737
/// Gets the Azure Sql Database Advisor
3838
/// </summary>
39-
public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string databaseName, string advisorName, bool expandRecommendedActions, string clientRequestId)
39+
public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string databaseName, string advisorName, bool expandRecommendedActions)
4040
{
4141
string expand = expandRecommendedActions ? ExpandKey : null;
42-
return GetCurrentSqlClient(clientRequestId).DatabaseAdvisors.Get(resourceGroupName, serverName, databaseName, advisorName, expand).Advisor;
42+
return GetCurrentSqlClient().DatabaseAdvisors.Get(resourceGroupName, serverName, databaseName, advisorName, expand).Advisor;
4343
}
4444

4545
/// <summary>
4646
/// Lists Azure Sql Database Advisors
4747
/// </summary>
48-
public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string databaseName, bool expandRecommendedActions, string clientRequestId)
48+
public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string databaseName, bool expandRecommendedActions)
4949
{
5050
string expand = expandRecommendedActions ? ExpandKey : null;
51-
return GetCurrentSqlClient(clientRequestId).DatabaseAdvisors.List(resourceGroupName, serverName, databaseName, expand).Advisors;
51+
return GetCurrentSqlClient().DatabaseAdvisors.List(resourceGroupName, serverName, databaseName, expand).Advisors;
5252
}
5353

5454
/// <summary>
5555
/// Update Advisor Auto Execute Status
5656
/// </summary>
57-
public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string databaseName, string advisorName, string autoExecuteStatus, string clientRequestId)
57+
public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string databaseName, string advisorName, string autoExecuteStatus)
5858
{
59-
return GetCurrentSqlClient(clientRequestId).DatabaseAdvisors.Update(resourceGroupName, serverName, databaseName, advisorName,
59+
return GetCurrentSqlClient().DatabaseAdvisors.Update(resourceGroupName, serverName, databaseName, advisorName,
6060
new AdvisorUpdateParameters
6161
{
6262
Properties = new AdvisorUpdateProperties()

‎src/ResourceManager/Sql/Commands.Sql/Advisor/Service/AzureSqlElasticPoolAdvisorAdapter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public AzureSqlElasticPoolAdvisorAdapter(IAzureContext context)
5656
/// <returns>The Azure Sql Elastic Pool Advisor object</returns>
5757
internal AzureSqlElasticPoolAdvisorModel GetElasticPoolAdvisor(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, bool expandRecommendedActions)
5858
{
59-
var response = Communicator.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expandRecommendedActions, Util.GenerateTracingId());
59+
var response = Communicator.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expandRecommendedActions);
6060
return new AzureSqlElasticPoolAdvisorModel(resourceGroupName, serverName, elasticPoolName, response);
6161
}
6262

@@ -70,7 +70,7 @@ internal AzureSqlElasticPoolAdvisorModel GetElasticPoolAdvisor(string resourceGr
7070
/// <returns>A list of elastic pool advisor objects</returns>
7171
internal ICollection<AzureSqlElasticPoolAdvisorModel> ListElasticPoolAdvisors(string resourceGroupName, string serverName, string elasticPoolName, bool expandRecommendedActions)
7272
{
73-
var response = Communicator.List(resourceGroupName, serverName, elasticPoolName, expandRecommendedActions, Util.GenerateTracingId());
73+
var response = Communicator.List(resourceGroupName, serverName, elasticPoolName, expandRecommendedActions);
7474
return response.Select(adv => new AzureSqlElasticPoolAdvisorModel(resourceGroupName, serverName, elasticPoolName, adv)).ToList();
7575
}
7676

@@ -81,7 +81,7 @@ internal ICollection<AzureSqlElasticPoolAdvisorModel> ListElasticPoolAdvisors(st
8181
/// <returns>The upserted Azure Sql Elastic Pool Advisor</returns>
8282
internal AzureSqlElasticPoolAdvisorModel UpdateAutoExecuteStatus(AzureSqlElasticPoolAdvisorModel model)
8383
{
84-
var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.ElasticPoolName, model.AdvisorName, model.AutoExecuteStatus, Util.GenerateTracingId());
84+
var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.ElasticPoolName, model.AdvisorName, model.AutoExecuteStatus);
8585
return new AzureSqlElasticPoolAdvisorModel(model.ResourceGroupName, model.ServerName, model.ElasticPoolName, response);
8686
}
8787
}

‎src/ResourceManager/Sql/Commands.Sql/Advisor/Service/AzureSqlElasticPoolAdvisorCommunicator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,27 @@ public AzureSqlElasticPoolAdvisorCommunicator(IAzureContext context) : base(cont
3535
/// <summary>
3636
/// Gets the Azure Sql Elastic Pool Advisor
3737
/// </summary>
38-
public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, bool expandRecommendedActions, string clientRequestId)
38+
public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, bool expandRecommendedActions)
3939
{
4040
string expand = expandRecommendedActions ? ExpandKey : null;
41-
return GetCurrentSqlClient(clientRequestId).ElasticPoolAdvisors.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expand).Advisor;
41+
return GetCurrentSqlClient().ElasticPoolAdvisors.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expand).Advisor;
4242
}
4343

4444
/// <summary>
4545
/// Lists Azure Sql Elastic Pool Advisors
4646
/// </summary>
47-
public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string elasticPoolName, bool expandRecommendedActions, string clientRequestId)
47+
public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string elasticPoolName, bool expandRecommendedActions)
4848
{
4949
string expand = expandRecommendedActions ? ExpandKey : null;
50-
return GetCurrentSqlClient(clientRequestId).ElasticPoolAdvisors.List(resourceGroupName, serverName, elasticPoolName, expand).Advisors;
50+
return GetCurrentSqlClient().ElasticPoolAdvisors.List(resourceGroupName, serverName, elasticPoolName, expand).Advisors;
5151
}
5252

5353
/// <summary>
5454
/// Update Advisor Auto Execute Status
5555
/// </summary>
56-
public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, string autoExecuteStatus, string clientRequestId)
56+
public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, string autoExecuteStatus)
5757
{
58-
return GetCurrentSqlClient(clientRequestId).ElasticPoolAdvisors.Update(resourceGroupName, serverName, elasticPoolName, advisorName,
58+
return GetCurrentSqlClient().ElasticPoolAdvisors.Update(resourceGroupName, serverName, elasticPoolName, advisorName,
5959
new AdvisorUpdateParameters
6060
{
6161
Properties = new AdvisorUpdateProperties()

‎src/ResourceManager/Sql/Commands.Sql/Advisor/Service/AzureSqlServerAdvisorAdapter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public AzureSqlServerAdvisorAdapter(IAzureContext context)
5454
/// <returns>The Azure Sql Server Advisor object</returns>
5555
internal AzureSqlServerAdvisorModel GetServerAdvisor(string resourceGroupName, string serverName, string advisorName, bool expandRecommendedActions)
5656
{
57-
var response = Communicator.Get(resourceGroupName, serverName, advisorName, expandRecommendedActions, Util.GenerateTracingId());
57+
var response = Communicator.Get(resourceGroupName, serverName, advisorName, expandRecommendedActions);
5858
return new AzureSqlServerAdvisorModel(resourceGroupName, serverName, response);
5959
}
6060

@@ -67,7 +67,7 @@ internal AzureSqlServerAdvisorModel GetServerAdvisor(string resourceGroupName, s
6767
/// <returns>A list of database advisor objects</returns>
6868
internal ICollection<AzureSqlServerAdvisorModel> ListServerAdvisors(string resourceGroupName, string serverName, bool expandRecommendedActions)
6969
{
70-
var response = Communicator.List(resourceGroupName, serverName, expandRecommendedActions, Util.GenerateTracingId());
70+
var response = Communicator.List(resourceGroupName, serverName, expandRecommendedActions);
7171
return response.Select(adv => new AzureSqlServerAdvisorModel(resourceGroupName, serverName, adv)).ToList();
7272
}
7373

@@ -78,7 +78,7 @@ internal ICollection<AzureSqlServerAdvisorModel> ListServerAdvisors(string resou
7878
/// <returns>The upserted Azure Sql Server Advisor</returns>
7979
internal AzureSqlServerAdvisorModel UpdateAutoExecuteStatus(AzureSqlServerAdvisorModel model)
8080
{
81-
var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.AdvisorName, model.AutoExecuteStatus, Util.GenerateTracingId());
81+
var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.AdvisorName, model.AutoExecuteStatus);
8282
return new AzureSqlServerAdvisorModel(model.ResourceGroupName, model.ServerName, response);
8383
}
8484
}

‎src/ResourceManager/Sql/Commands.Sql/Advisor/Service/AzureSqlServerAdvisorCommunicator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,27 @@ public AzureSqlServerAdvisorCommunicator(IAzureContext context) : base(context)
3535
/// <summary>
3636
/// Gets the Azure Sql Server Advisor
3737
/// </summary>
38-
public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string advisorName, bool expandRecommendedActions, string clientRequestId)
38+
public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string advisorName, bool expandRecommendedActions)
3939
{
4040
string expand = expandRecommendedActions ? ExpandKey : null;
41-
return GetCurrentSqlClient(clientRequestId).ServerAdvisors.Get(resourceGroupName, serverName, advisorName, expand).Advisor;
41+
return GetCurrentSqlClient().ServerAdvisors.Get(resourceGroupName, serverName, advisorName, expand).Advisor;
4242
}
4343

4444
/// <summary>
4545
/// Lists Azure Sql Server Advisors
4646
/// </summary>
47-
public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, bool expandRecommendedActions, string clientRequestId)
47+
public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, bool expandRecommendedActions)
4848
{
4949
string expand = expandRecommendedActions ? ExpandKey : null;
50-
return GetCurrentSqlClient(clientRequestId).ServerAdvisors.List(resourceGroupName, serverName, expand).Advisors;
50+
return GetCurrentSqlClient().ServerAdvisors.List(resourceGroupName, serverName, expand).Advisors;
5151
}
5252

5353
/// <summary>
5454
/// Update Advisor Auto Execute Status
5555
/// </summary>
56-
public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string advisorName, string autoExecuteStatus, string clientRequestId)
56+
public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string advisorName, string autoExecuteStatus)
5757
{
58-
return GetCurrentSqlClient(clientRequestId).ServerAdvisors.Update(resourceGroupName, serverName, advisorName,
58+
return GetCurrentSqlClient().ServerAdvisors.Update(resourceGroupName, serverName, advisorName,
5959
new AdvisorUpdateParameters
6060
{
6161
Properties = new AdvisorUpdateProperties()

‎src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseAuditingCmdletBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
7575
{
7676
if (AuditType == AuditType.Table)
7777
{
78-
ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseAuditingPolicyModel, clientRequestId,
78+
ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseAuditingPolicyModel,
7979
DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
8080
}
8181
if (AuditType == AuditType.Blob)
8282
{
83-
ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseBlobAuditingPolicyModel, clientRequestId,
83+
ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseBlobAuditingPolicyModel,
8484
DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
8585
}
8686
return null;
@@ -92,14 +92,14 @@ private AuditingPolicyModel GetEntityHelper()
9292
if (AuditType == AuditType.Table)
9393
{
9494
DatabaseAuditingPolicyModel model;
95-
ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out model);
95+
ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, out model);
9696
return model;
9797
}
9898

9999
if (AuditType == AuditType.Blob)
100100
{
101101
DatabaseBlobAuditingPolicyModel blobModel;
102-
ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out blobModel);
102+
ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, out blobModel);
103103
return blobModel;
104104
}
105105

‎src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseServerAuditingCmdletBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel baseMo
8282
{
8383
if (AuditType == AuditType.Table)
8484
{
85-
ModelAdapter.SetServerAuditingPolicy(baseModel as ServerAuditingPolicyModel, clientRequestId,
85+
ModelAdapter.SetServerAuditingPolicy(baseModel as ServerAuditingPolicyModel,
8686
DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
8787
}
8888
if (AuditType == AuditType.Blob)
8989
{
90-
ModelAdapter.SetServerAuditingPolicy(baseModel as ServerBlobAuditingPolicyModel, clientRequestId,
90+
ModelAdapter.SetServerAuditingPolicy(baseModel as ServerBlobAuditingPolicyModel,
9191
DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
9292
}
9393
return null;
@@ -98,14 +98,14 @@ private AuditingPolicyModel GetEntityHelper()
9898
if (AuditType == AuditType.Table)
9999
{
100100
ServerAuditingPolicyModel model;
101-
ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, clientRequestId, out model);
101+
ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, out model);
102102
return model;
103103
}
104104

105105
if (AuditType == AuditType.Blob)
106106
{
107107
ServerBlobAuditingPolicyModel blobModel;
108-
ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, clientRequestId, out blobModel);
108+
ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, out blobModel);
109109
return blobModel;
110110
}
111111

‎src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/UseAzureSqlServerAuditingPolicy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
102102
/// <returns>A storage account name</returns>
103103
protected string GetStorageAccountName()
104104
{
105-
var storageAccountName = ModelAdapter.GetServerStorageAccount(ResourceGroupName, ServerName, clientRequestId);
105+
var storageAccountName = ModelAdapter.GetServerStorageAccount(ResourceGroupName, ServerName);
106106
if (string.IsNullOrEmpty(storageAccountName))
107107
{
108108
throw new Exception(string.Format(Properties.Resources.UseServerWithoutStorageAccount));

0 commit comments

Comments
 (0)