Remove redundant setting of client request id in SQL cmdlets

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

@@ -63,16 +63,13 @@ public AzureSqlAdvisorCommunicatorBase(IAzureContext context)
         /// id tracing headers for the current cmdlet invocation.
         /// </summary>
         /// <returns>The SQL Management client for the currently selected subscription.</returns>
-        protected SqlManagementClient GetCurrentSqlClient(string clientRequestId)
+        protected SqlManagementClient GetCurrentSqlClient()
         {
             // Get the SQL management client for the current subscription
             if (SqlClient == null)
             {
                 SqlClient = AzureSession.Instance.ClientFactory.CreateClient<SqlManagementClient>(Context, AzureEnvironment.Endpoint.ResourceManager);
             }
-
-            SqlClient.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
-            SqlClient.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, clientRequestId);
             return SqlClient;
         }
     }

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

@@ -56,7 +56,7 @@ public AzureSqlDatabaseAdvisorAdapter(IAzureContext context)
         /// <returns>The Azure Sql Database Advisor object</returns>
         internal AzureSqlDatabaseAdvisorModel GetDatabaseAdvisor(string resourceGroupName, string serverName, string databaseName, string advisorName, bool expandRecommendedActions)
         {
-            var response = Communicator.Get(resourceGroupName, serverName, databaseName, advisorName, expandRecommendedActions, Util.GenerateTracingId());
+            var response = Communicator.Get(resourceGroupName, serverName, databaseName, advisorName, expandRecommendedActions);
             return new AzureSqlDatabaseAdvisorModel(resourceGroupName, serverName, databaseName, response);
         }
 
@@ -70,7 +70,7 @@ internal AzureSqlDatabaseAdvisorModel GetDatabaseAdvisor(string resourceGroupNam
         /// <returns>A list of database advisor objects</returns>
         internal ICollection<AzureSqlDatabaseAdvisorModel> ListDatabaseAdvisors(string resourceGroupName, string serverName, string databaseName, bool expandRecommendedActions)
         {
-            var response = Communicator.List(resourceGroupName, serverName, databaseName, expandRecommendedActions, Util.GenerateTracingId());
+            var response = Communicator.List(resourceGroupName, serverName, databaseName, expandRecommendedActions);
             return response.Select(adv => new AzureSqlDatabaseAdvisorModel(resourceGroupName, serverName, databaseName, adv)).ToList();
         }
 
@@ -81,7 +81,7 @@ internal ICollection<AzureSqlDatabaseAdvisorModel> ListDatabaseAdvisors(string r
         /// <returns>The upserted Azure Sql Database Advisor</returns>
         internal AzureSqlDatabaseAdvisorModel UpdateAutoExecuteStatus(AzureSqlDatabaseAdvisorModel model)
         {
-            var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.DatabaseName, model.AdvisorName, model.AutoExecuteStatus, Util.GenerateTracingId());
+            var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.DatabaseName, model.AdvisorName, model.AutoExecuteStatus);
             return new AzureSqlDatabaseAdvisorModel(model.ResourceGroupName, model.ServerName, model.DatabaseName, response);
         }
     }

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

@@ -36,27 +36,27 @@ public AzureSqlDatabaseAdvisorCommunicator(IAzureContext context) : base(context
         /// <summary>
         /// Gets the Azure Sql Database Advisor
         /// </summary>
-        public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string databaseName, string advisorName, bool expandRecommendedActions, string clientRequestId)
+        public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string databaseName, string advisorName, bool expandRecommendedActions)
         {
             string expand = expandRecommendedActions ? ExpandKey : null;
-            return GetCurrentSqlClient(clientRequestId).DatabaseAdvisors.Get(resourceGroupName, serverName, databaseName, advisorName, expand).Advisor;
+            return GetCurrentSqlClient().DatabaseAdvisors.Get(resourceGroupName, serverName, databaseName, advisorName, expand).Advisor;
         }
 
         /// <summary>
         /// Lists Azure Sql Database Advisors
         /// </summary>
-        public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string databaseName, bool expandRecommendedActions, string clientRequestId)
+        public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string databaseName, bool expandRecommendedActions)
         {
             string expand = expandRecommendedActions ? ExpandKey : null;
-            return GetCurrentSqlClient(clientRequestId).DatabaseAdvisors.List(resourceGroupName, serverName, databaseName, expand).Advisors;
+            return GetCurrentSqlClient().DatabaseAdvisors.List(resourceGroupName, serverName, databaseName, expand).Advisors;
         }
 
         /// <summary>
         /// Update Advisor Auto Execute Status
         /// </summary>
-        public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string databaseName, string advisorName, string autoExecuteStatus, string clientRequestId)
+        public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string databaseName, string advisorName, string autoExecuteStatus)
         {
-            return GetCurrentSqlClient(clientRequestId).DatabaseAdvisors.Update(resourceGroupName, serverName, databaseName, advisorName,
+            return GetCurrentSqlClient().DatabaseAdvisors.Update(resourceGroupName, serverName, databaseName, advisorName,
                     new AdvisorUpdateParameters
                     {
                         Properties = new AdvisorUpdateProperties()

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

@@ -56,7 +56,7 @@ public AzureSqlElasticPoolAdvisorAdapter(IAzureContext context)
         /// <returns>The Azure Sql Elastic Pool Advisor object</returns>
         internal AzureSqlElasticPoolAdvisorModel GetElasticPoolAdvisor(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, bool expandRecommendedActions)
         {
-            var response = Communicator.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expandRecommendedActions, Util.GenerateTracingId());
+            var response = Communicator.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expandRecommendedActions);
             return new AzureSqlElasticPoolAdvisorModel(resourceGroupName, serverName, elasticPoolName, response);
         }
 
@@ -70,7 +70,7 @@ internal AzureSqlElasticPoolAdvisorModel GetElasticPoolAdvisor(string resourceGr
         /// <returns>A list of elastic pool advisor objects</returns>
         internal ICollection<AzureSqlElasticPoolAdvisorModel> ListElasticPoolAdvisors(string resourceGroupName, string serverName, string elasticPoolName, bool expandRecommendedActions)
         {
-            var response = Communicator.List(resourceGroupName, serverName, elasticPoolName, expandRecommendedActions, Util.GenerateTracingId());
+            var response = Communicator.List(resourceGroupName, serverName, elasticPoolName, expandRecommendedActions);
             return response.Select(adv => new AzureSqlElasticPoolAdvisorModel(resourceGroupName, serverName, elasticPoolName, adv)).ToList();
         }
 
@@ -81,7 +81,7 @@ internal ICollection<AzureSqlElasticPoolAdvisorModel> ListElasticPoolAdvisors(st
         /// <returns>The upserted Azure Sql Elastic Pool Advisor</returns>
         internal AzureSqlElasticPoolAdvisorModel UpdateAutoExecuteStatus(AzureSqlElasticPoolAdvisorModel model)
         {
-            var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.ElasticPoolName, model.AdvisorName, model.AutoExecuteStatus, Util.GenerateTracingId());
+            var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.ElasticPoolName, model.AdvisorName, model.AutoExecuteStatus);
             return new AzureSqlElasticPoolAdvisorModel(model.ResourceGroupName, model.ServerName, model.ElasticPoolName, response);
         }
     }

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

@@ -35,27 +35,27 @@ public AzureSqlElasticPoolAdvisorCommunicator(IAzureContext context) : base(cont
         /// <summary>
         /// Gets the Azure Sql Elastic Pool Advisor
         /// </summary>
-        public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, bool expandRecommendedActions, string clientRequestId)
+        public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, bool expandRecommendedActions)
         {
             string expand = expandRecommendedActions ? ExpandKey : null;
-            return GetCurrentSqlClient(clientRequestId).ElasticPoolAdvisors.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expand).Advisor;
+            return GetCurrentSqlClient().ElasticPoolAdvisors.Get(resourceGroupName, serverName, elasticPoolName, advisorName, expand).Advisor;
         }
 
         /// <summary>
         /// Lists Azure Sql Elastic Pool Advisors
         /// </summary>
-        public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string elasticPoolName, bool expandRecommendedActions, string clientRequestId)
+        public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, string elasticPoolName, bool expandRecommendedActions)
         {
             string expand = expandRecommendedActions ? ExpandKey : null;
-            return GetCurrentSqlClient(clientRequestId).ElasticPoolAdvisors.List(resourceGroupName, serverName, elasticPoolName, expand).Advisors;
+            return GetCurrentSqlClient().ElasticPoolAdvisors.List(resourceGroupName, serverName, elasticPoolName, expand).Advisors;
         }
 
         /// <summary>
         /// Update Advisor Auto Execute Status
         /// </summary>
-        public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, string autoExecuteStatus, string clientRequestId)
+        public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string elasticPoolName, string advisorName, string autoExecuteStatus)
         {
-            return GetCurrentSqlClient(clientRequestId).ElasticPoolAdvisors.Update(resourceGroupName, serverName, elasticPoolName, advisorName,
+            return GetCurrentSqlClient().ElasticPoolAdvisors.Update(resourceGroupName, serverName, elasticPoolName, advisorName,
                     new AdvisorUpdateParameters
                     {
                         Properties = new AdvisorUpdateProperties()

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

@@ -54,7 +54,7 @@ public AzureSqlServerAdvisorAdapter(IAzureContext context)
         /// <returns>The Azure Sql Server Advisor object</returns>
         internal AzureSqlServerAdvisorModel GetServerAdvisor(string resourceGroupName, string serverName, string advisorName, bool expandRecommendedActions)
         {
-            var response = Communicator.Get(resourceGroupName, serverName, advisorName, expandRecommendedActions, Util.GenerateTracingId());
+            var response = Communicator.Get(resourceGroupName, serverName, advisorName, expandRecommendedActions);
             return new AzureSqlServerAdvisorModel(resourceGroupName, serverName, response);
         }
 
@@ -67,7 +67,7 @@ internal AzureSqlServerAdvisorModel GetServerAdvisor(string resourceGroupName, s
         /// <returns>A list of database advisor objects</returns>
         internal ICollection<AzureSqlServerAdvisorModel> ListServerAdvisors(string resourceGroupName, string serverName, bool expandRecommendedActions)
         {
-            var response = Communicator.List(resourceGroupName, serverName, expandRecommendedActions, Util.GenerateTracingId());
+            var response = Communicator.List(resourceGroupName, serverName, expandRecommendedActions);
             return response.Select(adv => new AzureSqlServerAdvisorModel(resourceGroupName, serverName, adv)).ToList();
         }
 
@@ -78,7 +78,7 @@ internal ICollection<AzureSqlServerAdvisorModel> ListServerAdvisors(string resou
         /// <returns>The upserted Azure Sql Server Advisor</returns>
         internal AzureSqlServerAdvisorModel UpdateAutoExecuteStatus(AzureSqlServerAdvisorModel model)
         {
-            var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.AdvisorName, model.AutoExecuteStatus, Util.GenerateTracingId());
+            var response = Communicator.UpdateAutoExecuteStatus(model.ResourceGroupName, model.ServerName, model.AdvisorName, model.AutoExecuteStatus);
             return new AzureSqlServerAdvisorModel(model.ResourceGroupName, model.ServerName, response);
         }
     }

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

@@ -35,27 +35,27 @@ public AzureSqlServerAdvisorCommunicator(IAzureContext context) : base(context)
         /// <summary>
         /// Gets the Azure Sql Server Advisor
         /// </summary>
-        public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string advisorName, bool expandRecommendedActions, string clientRequestId)
+        public Management.Sql.LegacySdk.Models.Advisor Get(string resourceGroupName, string serverName, string advisorName, bool expandRecommendedActions)
         {
             string expand = expandRecommendedActions ? ExpandKey : null;
-            return GetCurrentSqlClient(clientRequestId).ServerAdvisors.Get(resourceGroupName, serverName, advisorName, expand).Advisor;
+            return GetCurrentSqlClient().ServerAdvisors.Get(resourceGroupName, serverName, advisorName, expand).Advisor;
         }
 
         /// <summary>
         /// Lists Azure Sql Server Advisors
         /// </summary>
-        public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, bool expandRecommendedActions, string clientRequestId)
+        public IList<Management.Sql.LegacySdk.Models.Advisor> List(string resourceGroupName, string serverName, bool expandRecommendedActions)
         {
             string expand = expandRecommendedActions ? ExpandKey : null;
-            return GetCurrentSqlClient(clientRequestId).ServerAdvisors.List(resourceGroupName, serverName, expand).Advisors;
+            return GetCurrentSqlClient().ServerAdvisors.List(resourceGroupName, serverName, expand).Advisors;
         }
 
         /// <summary>
         /// Update Advisor Auto Execute Status
         /// </summary>
-        public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string advisorName, string autoExecuteStatus, string clientRequestId)
+        public Management.Sql.LegacySdk.Models.Advisor UpdateAutoExecuteStatus(string resourceGroupName, string serverName, string advisorName, string autoExecuteStatus)
         {
-            return GetCurrentSqlClient(clientRequestId).ServerAdvisors.Update(resourceGroupName, serverName, advisorName,
+            return GetCurrentSqlClient().ServerAdvisors.Update(resourceGroupName, serverName, advisorName,
                     new AdvisorUpdateParameters
                     {
                         Properties = new AdvisorUpdateProperties()

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

@@ -75,12 +75,12 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
         {
             if (AuditType == AuditType.Table)
             {
-                ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseAuditingPolicyModel, clientRequestId,
+                ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseAuditingPolicyModel,
                     DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
             }
             if (AuditType == AuditType.Blob)
             {
-                ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseBlobAuditingPolicyModel, clientRequestId,
+                ModelAdapter.SetDatabaseAuditingPolicy(model as DatabaseBlobAuditingPolicyModel,
                     DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
             }
             return null;
@@ -92,14 +92,14 @@ private AuditingPolicyModel GetEntityHelper()
             if (AuditType == AuditType.Table)
             {
                 DatabaseAuditingPolicyModel model;
-                ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out model);
+                ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, out model);
                 return model;
             }
 
             if (AuditType == AuditType.Blob)
             {
                 DatabaseBlobAuditingPolicyModel blobModel;
-                ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out blobModel);
+                ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, out blobModel);
                 return blobModel;
             }
 

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

@@ -82,12 +82,12 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel baseMo
         {
             if (AuditType == AuditType.Table)
             {
-                ModelAdapter.SetServerAuditingPolicy(baseModel as ServerAuditingPolicyModel, clientRequestId, 
+                ModelAdapter.SetServerAuditingPolicy(baseModel as ServerAuditingPolicyModel, 
                     DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
             }
             if (AuditType == AuditType.Blob)
             {
-                ModelAdapter.SetServerAuditingPolicy(baseModel as ServerBlobAuditingPolicyModel, clientRequestId,
+                ModelAdapter.SetServerAuditingPolicy(baseModel as ServerBlobAuditingPolicyModel,
                     DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
             }
             return null;
@@ -98,14 +98,14 @@ private AuditingPolicyModel GetEntityHelper()
             if (AuditType == AuditType.Table)
             {
                 ServerAuditingPolicyModel model;
-                ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, clientRequestId, out model);
+                ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, out model);
                 return model;
             }
 
             if (AuditType == AuditType.Blob)
             {
                 ServerBlobAuditingPolicyModel blobModel;
-                ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, clientRequestId, out blobModel);
+                ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, out blobModel);
                 return blobModel;
             }
 

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

@@ -102,7 +102,7 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
         /// <returns>A storage account name</returns>
         protected string GetStorageAccountName()
         {
-            var storageAccountName = ModelAdapter.GetServerStorageAccount(ResourceGroupName, ServerName, clientRequestId);
+            var storageAccountName = ModelAdapter.GetServerStorageAccount(ResourceGroupName, ServerName);
             if (string.IsNullOrEmpty(storageAccountName))
             {
                 throw new Exception(string.Format(Properties.Resources.UseServerWithoutStorageAccount));