Skip to content

Change GetStorageKeysAsync to use AzureEnvironment.Endpoint.ServiceManagement URL #3320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 22, 2016
Merged

Change GetStorageKeysAsync to use AzureEnvironment.Endpoint.ServiceManagement URL #3320

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13866a8
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
yaakoviyun Dec 16, 2016
da023b8
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
yaakoviyun Dec 20, 2016
2afcb79
Change GetStorageKeysAsync to use AzureEnvironment.Endpoint.ServiceMa…
yaakoviyun Dec 20, 2016
9b5c1f4
Merge branch 'dev' of https://github.com/yaakoviyun/azure-powershell …
yaakoviyun Dec 20, 2016
aeb7526
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
yaakoviyun Dec 20, 2016
12541f2
Updated code to fix the tests run
yaakoviyun Dec 22, 2016
bf219a3
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
yaakoviyun Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/ResourceManager/Sql/Commands.Sql/Common/AzureEndpointsCommunicator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down