From ceb4df5b8b9b274f48dc8cbec69f6809659ed3af Mon Sep 17 00:00:00 2001 From: Amir Omidi Date: Fri, 28 Aug 2020 12:56:08 -0700 Subject: [PATCH] Support SQL Servers for migrations (#11987) * Support SQL Servers * Use function but dont do anything with it for now --- .../azurecore/src/azureResource/azure-resource.d.ts | 4 ---- extensions/sql-migration/src/api/azure.ts | 13 ++++++++++--- .../src/wizard/subscriptionSelectionPage.ts | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/extensions/azurecore/src/azureResource/azure-resource.d.ts b/extensions/azurecore/src/azureResource/azure-resource.d.ts index 337846a481..f50e4698e1 100644 --- a/extensions/azurecore/src/azureResource/azure-resource.d.ts +++ b/extensions/azurecore/src/azureResource/azure-resource.d.ts @@ -40,10 +40,6 @@ declare module 'azureResource' { location: string; } - export interface AzureSqlManagedInstanceResource extends AzureGraphResource { - - } - export interface AzureResourceResourceGroup extends AzureResource { } diff --git a/extensions/sql-migration/src/api/azure.ts b/extensions/sql-migration/src/api/azure.ts index 2d2d37da36..f3bcd12681 100644 --- a/extensions/sql-migration/src/api/azure.ts +++ b/extensions/sql-migration/src/api/azure.ts @@ -25,11 +25,18 @@ export async function getSubscriptions(account: azdata.Account): Promise { const api = await getAzureCoreAPI(); - const result = await api.runGraphQuery(account, subscription, false, 'where type == "microsoft.sql/managedinstances"'); - + const result = await api.runGraphQuery(account, subscription, false, 'where type == "microsoft.sql/managedinstances"'); + return result.resources; +} + +export type SqlServer = azureResource.AzureGraphResource; +export async function getAvailableSqlServers(account: azdata.Account, subscription: Subscription): Promise { + const api = await getAzureCoreAPI(); + + const result = await api.runGraphQuery(account, subscription, false, 'where type == "microsoft.sql/servers"'); return result.resources; } diff --git a/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts b/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts index fd9cc2995d..fae6011764 100644 --- a/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts +++ b/extensions/sql-migration/src/wizard/subscriptionSelectionPage.ts @@ -8,7 +8,7 @@ import { MigrationWizardPage } from '../models/migrationWizardPage'; import { MigrationStateModel, StateChangeEvent } from '../models/stateMachine'; import { SUBSCRIPTION_SELECTION_PAGE_TITLE, SUBSCRIPTION_SELECTION_AZURE_ACCOUNT_TITLE, SUBSCRIPTION_SELECTION_AZURE_PRODUCT_TITLE, SUBSCRIPTION_SELECTION_AZURE_SUBSCRIPTION_TITLE } from '../models/strings'; import { Disposable } from 'vscode'; -import { getSubscriptions, Subscription, getAvailableManagedInstanceProducts, AzureProduct } from '../api/azure'; +import { getSubscriptions, Subscription, getAvailableManagedInstanceProducts, AzureProduct, getAvailableSqlServers } from '../api/azure'; interface GenericValue extends azdata.CategoryValue { value: T; @@ -104,6 +104,7 @@ export class SubscriptionSelectionPage extends MigrationWizardPage { const subscription = this.getPickedSubscription(); const results = await getAvailableManagedInstanceProducts(account!, subscription!); + await getAvailableSqlServers(account!, subscription!); this.populateProductValues(results); }