From dd8207dd3f1db5183d5faf055edc1f58a79cc024 Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Wed, 2 Jun 2021 15:00:11 -0700 Subject: [PATCH] Adding more regions to migration target page (#15606) * adding more regions to target page * Making location fetching dynamic * vbump migration to 0.1.2 --- extensions/sql-migration/package.json | 2 +- extensions/sql-migration/src/api/azure.ts | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/extensions/sql-migration/package.json b/extensions/sql-migration/package.json index 92c5d83f54..6056a1a5bb 100644 --- a/extensions/sql-migration/package.json +++ b/extensions/sql-migration/package.json @@ -2,7 +2,7 @@ "name": "sql-migration", "displayName": "%displayName%", "description": "%description%", - "version": "0.1.1", + "version": "0.1.2", "publisher": "Microsoft", "preview": true, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", diff --git a/extensions/sql-migration/src/api/azure.ts b/extensions/sql-migration/src/api/azure.ts index 3d7ce1f28d..831d49ffd7 100644 --- a/extensions/sql-migration/src/api/azure.ts +++ b/extensions/sql-migration/src/api/azure.ts @@ -28,18 +28,17 @@ export async function getSubscriptions(account: azdata.Account): Promise { const api = await getAzureCoreAPI(); const response = await api.getLocations(account, subscription, true); + const dataMigrationResourceProvider = (await api.makeAzureRestRequest(account, subscription, `/subscriptions/${subscription.id}/providers/Microsoft.DataMigration?api-version=2021-04-01`, azurecore.HttpRequestMethod.GET)).response.data; + const sqlMigratonResource = dataMigrationResourceProvider.resourceTypes.find((r: any) => r.resourceType === 'SqlMigrationServices'); + const sqlMigrationResourceLocations = sqlMigratonResource.locations; + if (response.errors.length > 0) { throw new Error(response.errors.toString()); } sortResourceArrayByName(response.locations); - const supportedLocations = [ - 'eastus2', - 'eastus2euap', - 'eastus', - 'canadacentral' - ]; + const filteredLocations = response.locations.filter(loc => { - return supportedLocations.includes(loc.name); + return sqlMigrationResourceLocations.includes(loc.displayName); }); return filteredLocations; }