Merge pull request #3320 from yaakoviyun/dev

Change GetStorageKeysAsync to use AzureEnvironment.Endpoint.ServiceManagement URL

Author: cormacpayne

src/ResourceManager/Sql/Commands.Sql/Common/AzureEndpointsCommunicator.cs

@@ -85,8 +85,13 @@ public async Task<Dictionary<StorageKeyKind, string>> GetStorageKeysAsync(string
         {
             SqlManagementClient client = GetCurrentSqlClient("none");
 
-            string url = "https://management.azure.com";
-            url = url + "/subscriptions/" + (client.Credentials.SubscriptionId != null ? client.Credentials.SubscriptionId.Trim() : "");
+            string url = Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ServiceManagement).ToString();
+            if (!url.EndsWith("/"))
+            {
+                url = url + "/";
+            }
+
+            url = url + "subscriptions/" + (client.Credentials.SubscriptionId != null ? client.Credentials.SubscriptionId.Trim() : "");
             url = url + "/resourceGroups/" + resourceGroupName;
             url = url + "/providers/Microsoft.ClassicStorage/storageAccounts/" + storageAccountName;
             url = url + "/listKeys?api-version=2014-06-01";