use azurecore and azureresource as typings (#11892)

* use azurecore and azureresource as typings

* Remove unrelated file

extensions/arc/src/common/utils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import * as azurecore from '../../../azurecore/src/azurecore';
+import * as azurecore from 'azurecore';
 import * as loc from '../localizedConstants';
 import { IconPathHelper, IconPath, ResourceType, ConnectionMode } from '../constants';
 

extensions/arc/src/typings/refs.d.ts

@@ -5,4 +5,5 @@
 
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
+/// <reference path='../../../azurecore/src/azurecore.d.ts'/>
 /// <reference path='../../../../src/vs/vscode.d.ts'/>

extensions/azurecore/src/azureResource/azure-resource.d.ts

@@ -3,49 +3,50 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TreeDataProvider } from 'vscode';
+declare module 'azureResource' {
-import { DataProvider, Account, TreeItem } from 'azdata';
+	import { TreeDataProvider } from 'vscode';
+	import { DataProvider, Account, TreeItem } from 'azdata';
+	export namespace azureResource {
+		export interface IAzureResourceProvider extends DataProvider {
+			getTreeDataProvider(): IAzureResourceTreeDataProvider;
+		}
+
+		export interface IAzureResourceTreeDataProvider extends TreeDataProvider<IAzureResourceNode> {
+		}
+
+		export interface IAzureResourceNode {
+			readonly account: Account;
+			readonly subscription: AzureResourceSubscription;
+			readonly tenantId: string;
+			readonly treeItem: TreeItem;
+		}
+
+		export interface AzureResource {
+			name: string;
+			id: string;
+			tenant?: string;
+		}
+
+		export interface AzureResourceSubscription extends AzureResource {
+		}
+
+		export interface AzureSqlResource extends AzureResource {
+			loginName: string;
+		}
+
+		export interface AzureResourceResourceGroup extends AzureResource {
+		}
+
+		export interface AzureResourceDatabase extends AzureSqlResource {
+			serverName: string;
+			serverFullName: string;
+		}
+
+		export interface AzureResourceDatabaseServer extends AzureSqlResource {
+			fullName: string;
+			defaultDatabaseName: string;
+		}
+
 
-export namespace azureResource {
-	export interface IAzureResourceProvider extends DataProvider {
-		getTreeDataProvider(): IAzureResourceTreeDataProvider;
 	}
-
-	export interface IAzureResourceTreeDataProvider extends TreeDataProvider<IAzureResourceNode> {
-	}
-
-	export interface IAzureResourceNode {
-		readonly account: Account;
-		readonly subscription: AzureResourceSubscription;
-		readonly tenantId: string;
-		readonly treeItem: TreeItem;
-	}
-
-	export interface AzureResource {
-		name: string;
-		id: string;
-		tenant?: string;
-	}
-
-	export interface AzureResourceSubscription extends AzureResource {
-	}
-
-	export interface AzureSqlResource extends AzureResource {
-		loginName: string;
-	}
-
-	export interface AzureResourceResourceGroup extends AzureResource {
-	}
-
-	export interface AzureResourceDatabase extends AzureSqlResource {
-		serverName: string;
-		serverFullName: string;
-	}
-
-	export interface AzureResourceDatabaseServer extends AzureSqlResource {
-		fullName: string;
-		defaultDatabaseName: string;
-	}
-
-
 }

extensions/azurecore/src/azureResource/commands.ts

@@ -10,7 +10,7 @@ import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
 import { AppContext } from '../appContext';
-import { azureResource } from './azure-resource';
+import { azureResource } from 'azureResource';
 import { TreeNode } from './treeNode';
 import { AzureResourceCredentialError } from './errors';
 import { AzureResourceTreeProvider } from './tree/treeProvider';

extensions/azurecore/src/azureResource/interfaces.ts

@@ -7,7 +7,7 @@ import * as msRest from '@azure/ms-rest-js';
 
 import { Account } from 'azdata';
 
-import { azureResource } from './azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureAccount, Tenant } from '../account-provider/interfaces';
 
 export interface IAzureResourceSubscriptionService {

extensions/azurecore/src/azureResource/providers/database/databaseProvider.ts

@@ -6,7 +6,7 @@
 
 import { ExtensionContext } from 'vscode';
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureResourceDatabaseTreeDataProvider } from './databaseTreeDataProvider';
 import { IAzureResourceService } from '../../interfaces';
 

extensions/azurecore/src/azureResource/providers/database/databaseService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ServiceClientCredentials } from '@azure/ms-rest-js';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../../interfaces';
 import { serversQuery, DbServerGraphData } from '../databaseServer/databaseServerService';
 import { ResourceGraphClient } from '@azure/arm-resourcegraph';

extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureResourceItemType } from '../../../azureResource/constants';
 import { generateGuid } from '../../utils';
 import { IAzureResourceService } from '../../interfaces';

extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerProvider.ts

@@ -5,7 +5,7 @@
 
 import { ExtensionContext } from 'vscode';
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../../interfaces';
 import { AzureResourceDatabaseServerTreeDataProvider } from './databaseServerTreeDataProvider';
 

extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerService.ts

@@ -5,7 +5,7 @@
 
 
 import { ResourceServiceBase, GraphData } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 
 export interface DbServerGraphData extends GraphData {

extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts

@@ -12,7 +12,7 @@ import { AzureResourceItemType } from '../../../azureResource/constants';
 import { generateGuid } from '../../utils';
 import { IAzureResourceService } from '../../interfaces';
 import { ResourceTreeDataProviderBase } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export class AzureResourceDatabaseServerTreeDataProvider extends ResourceTreeDataProviderBase<azureResource.AzureResourceDatabaseServer> {
 	private static readonly containerId = 'azure.resource.providers.databaseServer.treeDataProvider.databaseServerContainer';

extensions/azurecore/src/azureResource/providers/kusto/kustoProvider.ts

@@ -5,7 +5,7 @@
 
 import { ExtensionContext } from 'vscode';
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../../interfaces';
 import { KustoTreeDataProvider as KustoTreeDataProvider } from './kustoTreeDataProvider';
 

extensions/azurecore/src/azureResource/providers/kusto/kustoService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { ResourceServiceBase, GraphData } from '../resourceTreeDataProviderBase';
 
 export interface KustoGraphData extends GraphData {

extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts

@@ -12,7 +12,7 @@ import { AzureResourceItemType } from '../../constants';
 import { generateGuid } from '../../utils';
 import { IAzureResourceService } from '../../interfaces';
 import { ResourceTreeDataProviderBase } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export class KustoTreeDataProvider extends ResourceTreeDataProviderBase<azureResource.AzureResourceDatabaseServer> {
 	private static readonly containerId = 'azure.resource.providers.KustoContainer';

extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerProvider.ts

@@ -5,7 +5,7 @@
 
 import { ExtensionContext } from 'vscode';
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../../interfaces';
 import { PostgresServerArcTreeDataProvider as PostgresServerArcTreeDataProvider } from './postgresServerTreeDataProvider';
 

extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ResourceServiceBase, GraphData } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export interface PostgresArcServerGraphData extends GraphData {
 	properties: {

extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts

@@ -12,7 +12,7 @@ import { AzureResourceItemType } from '../../constants';
 import { generateGuid } from '../../utils';
 import { IAzureResourceService } from '../../interfaces';
 import { ResourceTreeDataProviderBase } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export class PostgresServerArcTreeDataProvider extends ResourceTreeDataProviderBase<azureResource.AzureResourceDatabaseServer> {
 	private static readonly containerId = 'azure.resource.providers.postgresArcServer.treeDataProvider.postgresServerContainer';

extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerProvider.ts

@@ -5,7 +5,7 @@
 
 import { ExtensionContext } from 'vscode';
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../../interfaces';
 import { PostgresServerTreeDataProvider as PostgresServerTreeDataProvider } from './postgresServerTreeDataProvider';
 

extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerService.ts

@@ -5,7 +5,7 @@
 
 
 import { ResourceServiceBase, GraphData } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 
 interface DbServerGraphData extends GraphData {

extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts

@@ -12,7 +12,7 @@ import { AzureResourceItemType } from '../../constants';
 import { generateGuid } from '../../utils';
 import { IAzureResourceService } from '../../interfaces';
 import { ResourceTreeDataProviderBase } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export class PostgresServerTreeDataProvider extends ResourceTreeDataProviderBase<azureResource.AzureResourceDatabaseServer> {
 	private static readonly containerId = 'azure.resource.providers.databaseServer.treeDataProvider.postgresServerContainer';

extensions/azurecore/src/azureResource/providers/resourceGroup/resourceGroupService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DbServerGraphData } from '../databaseServer/databaseServerService';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { ResourceServiceBase } from '../resourceTreeDataProviderBase';
 
 export class AzureResourceGroupService extends ResourceServiceBase<DbServerGraphData, azureResource.AzureResourceResourceGroup> {

extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts

@@ -6,7 +6,7 @@
 import * as azdata from 'azdata';
 import * as msRest from '@azure/ms-rest-js';
 
-import { azureResource } from '../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../interfaces';
 import { AzureResourceErrorMessageUtil } from '../utils';
 import { ResourceGraphClient } from '@azure/arm-resourcegraph';

extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceProvider.ts

@@ -5,7 +5,7 @@
 
 import { ExtensionContext } from 'vscode';
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../../interfaces';
 import { SqlInstanceTreeDataProvider as SqlInstanceTreeDataProvider } from './sqlInstanceTreeDataProvider';
 

extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { ResourceServiceBase, GraphData } from '../resourceTreeDataProviderBase';
 
 interface SqlInstanceGraphData extends GraphData {

extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts

@@ -12,7 +12,7 @@ import { AzureResourceItemType } from '../../constants';
 import { generateGuid } from '../../utils';
 import { IAzureResourceService } from '../../interfaces';
 import { ResourceTreeDataProviderBase } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export class SqlInstanceTreeDataProvider extends ResourceTreeDataProviderBase<azureResource.AzureResourceDatabaseServer> {
 	private static readonly containerId = 'azure.resource.providers.sqlInstanceContainer';

extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcProvider.ts

@@ -5,7 +5,7 @@
 
 import { ExtensionContext } from 'vscode';
 
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceService } from '../../interfaces';
 import { SqlInstanceArcTreeDataProvider as SqlInstanceArcTreeDataProvider } from './sqlInstanceArcTreeDataProvider';
 

extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ResourceServiceBase, GraphData } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export interface SqlInstanceArcGraphData extends GraphData {
 	properties: {

extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts

@@ -12,7 +12,7 @@ import { AzureResourceItemType } from '../../constants';
 import { generateGuid } from '../../utils';
 import { IAzureResourceService } from '../../interfaces';
 import { ResourceTreeDataProviderBase } from '../resourceTreeDataProviderBase';
-import { azureResource } from '../../azure-resource';
+import { azureResource } from 'azureResource';
 
 export class SqlInstanceArcTreeDataProvider extends ResourceTreeDataProviderBase<azureResource.AzureResourceDatabaseServer> {
 	private static readonly containerId = 'azure.resource.providers.sqlInstanceArcContainer';

extensions/azurecore/src/azureResource/resourceService.ts

@@ -6,7 +6,7 @@
 import { extensions, TreeItem } from 'vscode';
 import { Account } from 'azdata';
 
-import { azureResource } from './azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceNodeWithProviderId } from './interfaces';
 
 export class AzureResourceService {

extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts

@@ -5,7 +5,7 @@
 
 import { Account } from 'azdata';
 
-import { azureResource } from '../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceSubscriptionFilterService, IAzureResourceCacheService } from '../interfaces';
 
 interface AzureResourceSelectedSubscriptionsCache {

extensions/azurecore/src/azureResource/services/subscriptionService.ts

@@ -6,7 +6,7 @@
 import { Account } from 'azdata';
 import { SubscriptionClient } from '@azure/arm-subscriptions';
 
-import { azureResource } from '../azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceSubscriptionService } from '../interfaces';
 
 export class AzureResourceSubscriptionService implements IAzureResourceSubscriptionService {

extensions/azurecore/src/azureResource/tree/accountTreeNode.ts

@@ -11,7 +11,7 @@ import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
 import { AppContext } from '../../appContext';
-import { azureResource } from '../azure-resource';
+import { azureResource } from 'azureResource';
 import { TreeNode } from '../treeNode';
 import { AzureResourceCredentialError } from '../errors';
 import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';

extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts

@@ -9,7 +9,7 @@ import { AppContext } from '../../appContext';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { azureResource } from '../azure-resource';
+import { azureResource } from 'azureResource';
 import { TreeNode } from '../treeNode';
 import { IAzureResourceNodeWithProviderId } from '../interfaces';
 import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';

extensions/azurecore/src/azureResource/utils.ts

@@ -5,8 +5,8 @@
 
 import * as azdata from 'azdata';
 import * as nls from 'vscode-nls';
-import { azureResource } from './azure-resource';
+import { azureResource } from 'azureResource';
-import { GetResourceGroupsResult, GetSubscriptionsResult } from '../azurecore';
+import { GetResourceGroupsResult, GetSubscriptionsResult } from 'azurecore';
 import { isArray } from 'util';
 import { AzureResourceGroupService } from './providers/resourceGroup/resourceGroupService';
 import { TokenCredentials } from '@azure/ms-rest-js';

extensions/azurecore/src/azurecore.d.ts

@@ -3,75 +3,76 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as azdata from 'azdata';
+declare module 'azurecore' {
-import { azureResource } from './azureResource/azure-resource';
+	import * as azdata from 'azdata';
-
+	import { azureResource } from 'azureResource';
-/**
- * Covers defining what the azurecore extension exports to other extensions
- *
- * IMPORTANT: THIS IS NOT A HARD DEFINITION unlike vscode; therefore no enums or classes should be defined here
- * (const enums get evaluated when typescript -> javascript so those are fine)
- */
-export const enum extension {
-	name = 'Microsoft.azurecore'
-}
-
-/**
- * Enumeration of the Azure datacenter regions. See https://docs.microsoft.com/dotnet/api/microsoft.azure.management.resourcemanager.fluent.core.region
- */
-export const enum AzureRegion {
-	australiacentral = 'australiacentral',
-	australiacentral2 = 'australiacentral2',
-	australiaeast = 'australiaeast',
-	australiasoutheast = 'australiasoutheast',
-	brazilsouth = 'brazilsouth',
-	canadacentral = 'canadacentral',
-	canadaeast = 'canadaeast',
-	centralindia = 'centralindia',
-	centralus = 'centralus',
-	eastasia = 'eastasia',
-	eastus = 'eastus',
-	eastus2 = 'eastus2',
-	francecentral = 'francecentral',
-	francesouth = 'francesouth',
-	germanynorth = 'germanynorth',
-	germanywestcentral = 'germanywestcentral',
-	japaneast = 'japaneast',
-	japanwest = 'japanwest',
-	koreacentral = 'koreacentral',
-	koreasouth = 'koreasouth',
-	northcentralus = 'northcentralus',
-	northeurope = 'northeurope',
-	norwayeast = 'norwayeast',
-	norwaywest = 'norwaywest',
-	southafricanorth = 'southafricanorth',
-	southafricawest = 'southafricawest',
-	southcentralus = 'southcentralus',
-	southeastasia = 'southeastasia',
-	southindia = 'southindia',
-	switzerlandnorth = 'switzerlandnorth',
-	switzerlandwest = 'switzerlandwest',
-	uaecentral = 'uaecentral',
-	uaenorth = 'uaenorth',
-	uksouth = 'uksouth',
-	ukwest = 'ukwest',
-	westcentralus = 'westcentralus',
-	westeurope = 'westeurope',
-	westindia = 'westindia',
-	westus = 'westus',
-	westus2 = 'westus2',
-}
-
-export interface IExtension {
-	getSubscriptions(account?: azdata.Account, ignoreErrors?: boolean): Thenable<GetSubscriptionsResult>;
-	getResourceGroups(account?: azdata.Account, subscription?: azureResource.AzureResourceSubscription, ignoreErrors?: boolean): Thenable<GetResourceGroupsResult>;
 	/**
-	 * Converts a region value (@see AzureRegion) into the localized Display Name
+	 * Covers defining what the azurecore extension exports to other extensions
-	 * @param region The region value
+	 *
+	 * IMPORTANT: THIS IS NOT A HARD DEFINITION unlike vscode; therefore no enums or classes should be defined here
+	 * (const enums get evaluated when typescript -> javascript so those are fine)
 	 */
-	getRegionDisplayName(region?: string): string;
+	export const enum extension {
-	provideResources(): azureResource.IAzureResourceProvider[];
+		name = 'Microsoft.azurecore'
-}
+	}
 
-export type GetSubscriptionsResult = { subscriptions: azureResource.AzureResourceSubscription[], errors: Error[] };
+	/**
-export type GetResourceGroupsResult = { resourceGroups: azureResource.AzureResourceResourceGroup[], errors: Error[] };
+	 * Enumeration of the Azure datacenter regions. See https://docs.microsoft.com/dotnet/api/microsoft.azure.management.resourcemanager.fluent.core.region
+	 */
+	export const enum AzureRegion {
+		australiacentral = 'australiacentral',
+		australiacentral2 = 'australiacentral2',
+		australiaeast = 'australiaeast',
+		australiasoutheast = 'australiasoutheast',
+		brazilsouth = 'brazilsouth',
+		canadacentral = 'canadacentral',
+		canadaeast = 'canadaeast',
+		centralindia = 'centralindia',
+		centralus = 'centralus',
+		eastasia = 'eastasia',
+		eastus = 'eastus',
+		eastus2 = 'eastus2',
+		francecentral = 'francecentral',
+		francesouth = 'francesouth',
+		germanynorth = 'germanynorth',
+		germanywestcentral = 'germanywestcentral',
+		japaneast = 'japaneast',
+		japanwest = 'japanwest',
+		koreacentral = 'koreacentral',
+		koreasouth = 'koreasouth',
+		northcentralus = 'northcentralus',
+		northeurope = 'northeurope',
+		norwayeast = 'norwayeast',
+		norwaywest = 'norwaywest',
+		southafricanorth = 'southafricanorth',
+		southafricawest = 'southafricawest',
+		southcentralus = 'southcentralus',
+		southeastasia = 'southeastasia',
+		southindia = 'southindia',
+		switzerlandnorth = 'switzerlandnorth',
+		switzerlandwest = 'switzerlandwest',
+		uaecentral = 'uaecentral',
+		uaenorth = 'uaenorth',
+		uksouth = 'uksouth',
+		ukwest = 'ukwest',
+		westcentralus = 'westcentralus',
+		westeurope = 'westeurope',
+		westindia = 'westindia',
+		westus = 'westus',
+		westus2 = 'westus2',
+	}
+
+	export interface IExtension {
+		getSubscriptions(account?: azdata.Account, ignoreErrors?: boolean): Thenable<GetSubscriptionsResult>;
+		getResourceGroups(account?: azdata.Account, subscription?: azureResource.AzureResourceSubscription, ignoreErrors?: boolean): Thenable<GetResourceGroupsResult>;
+		/**
+		 * Converts a region value (@see AzureRegion) into the localized Display Name
+		 * @param region The region value
+		 */
+		getRegionDisplayName(region?: string): string;
+		provideResources(): azureResource.IAzureResourceProvider[];
+	}
+
+	export type GetSubscriptionsResult = { subscriptions: azureResource.AzureResourceSubscription[], errors: Error[] };
+	export type GetResourceGroupsResult = { resourceGroups: azureResource.AzureResourceResourceGroup[], errors: Error[] };
+}

extensions/azurecore/src/extension.ts

@@ -35,8 +35,8 @@ import { SqlInstanceArcProvider } from './azureResource/providers/sqlinstanceArc
 import { SqlInstanceArcResourceService } from './azureResource/providers/sqlinstanceArc/sqlInstanceArcService';
 import { PostgresServerArcProvider } from './azureResource/providers/postgresArcServer/postgresServerProvider';
 import { PostgresServerArcService } from './azureResource/providers/postgresArcServer/postgresServerService';
-import { azureResource } from './azureResource/azure-resource';
+import { azureResource } from 'azureResource';
-import * as azurecore from './azurecore';
+import * as azurecore from 'azurecore';
 import * as azureResourceUtils from './azureResource/utils';
 import * as utils from './utils';
 import * as loc from './localizedConstants';

extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts

@@ -10,7 +10,7 @@ import * as vscode from 'vscode';
 import * as sinon from 'sinon';
 import 'mocha';
 
-import { azureResource } from '../../../../azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureResourceDatabaseTreeDataProvider } from '../../../../azureResource/providers/database/databaseTreeDataProvider';
 import { AzureResourceItemType } from '../../../../azureResource/constants';
 import { IAzureResourceService } from '../../../../azureResource/interfaces';

extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts

@@ -10,7 +10,7 @@ import * as vscode from 'vscode';
 import * as sinon from 'sinon';
 import 'mocha';
 
-import { azureResource } from '../../../../azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureResourceDatabaseServerTreeDataProvider } from '../../../../azureResource/providers/databaseServer/databaseServerTreeDataProvider';
 import { AzureResourceItemType } from '../../../../azureResource/constants';
 import { IAzureResourceService } from '../../../../azureResource/interfaces';

extensions/azurecore/src/test/azureResource/resourceService.test.ts

@@ -8,7 +8,7 @@ import * as TypeMoq from 'typemoq';
 import 'mocha';
 import { fail } from 'assert';
 
-import { azureResource } from '../../azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureResourceService } from '../../azureResource/resourceService';
 import { AzureAccount } from '../../account-provider/interfaces';
 import settings from '../../account-provider/providerSettings';

extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts

@@ -8,7 +8,7 @@ import * as TypeMoq from 'typemoq';
 import * as vscode from 'vscode';
 import 'mocha';
 
-import { azureResource } from '../../azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureResourceService } from '../../azureResource/resourceService';
 import { AzureResourceResourceTreeNode } from '../../azureResource/resourceTreeNode';
 import { AppContext } from '../../appContext';

extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts

@@ -12,7 +12,7 @@ import 'mocha';
 import { TokenCredentials } from '@azure/ms-rest-js';
 import { AppContext } from '../../../appContext';
 
-import { azureResource } from '../../../azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 import {
 	IAzureResourceCacheService,
 	IAzureResourceSubscriptionService,

extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts

@@ -10,7 +10,7 @@ import * as vscode from 'vscode';
 import 'mocha';
 import { AppContext } from '../../../appContext';
 
-import { azureResource } from '../../../azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
 import { AzureResourceSubscriptionTreeNode } from '../../../azureResource/tree/subscriptionTreeNode';
 import { AzureResourceItemType, AzureResourceServiceNames } from '../../../azureResource/constants';

extensions/azurecore/src/test/utils.test.ts

@@ -6,7 +6,7 @@
 import * as should from 'should';
 import 'mocha';
 import { getRegionDisplayName } from '../utils';
-import { AzureRegion } from '../azurecore';
+import { AzureRegion } from 'azurecore';
 import * as loc from '../localizedConstants';
 
 describe('Azurecore Utils Tests', function (): void {

extensions/azurecore/src/utils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as loc from './localizedConstants';
-import { AzureRegion } from './azurecore';
+import { AzureRegion } from 'azurecore';
 
 /**
  * Converts a region value (@see AzureRegion) into the localized Display Name

extensions/machine-learning/src/common/apiWrapper.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
-import * as azurecore from '../../../azurecore/src/azurecore';
+import * as azurecore from 'azurecore';
 
 /**
  * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into

extensions/machine-learning/src/test/stubs.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import * as azurecore from '../../../azurecore/src/azurecore';
+import * as azurecore from 'azurecore';
-import { azureResource } from '../../../azurecore/src/azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 
 export class AzurecoreApiStub implements azurecore.IExtension {
 	getSubscriptions(_account?: azdata.Account | undefined, _ignoreErrors?: boolean | undefined): Thenable<azurecore.GetSubscriptionsResult> {

extensions/machine-learning/src/typings/ref.d.ts

@@ -6,4 +6,6 @@
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
-/// <reference types='@types/node'/>
+/// <reference path='../../../azurecore/src/azurecore.d.ts'/>
+/// <reference path='../../../azurecore/src/azureResource/azure-resource.d.ts'/>
+/// <reference types='@types/node'/>

extensions/resource-deployment/src/services/apiService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as azurecore from '../../../azurecore/src/azurecore';
+import * as azurecore from 'azurecore';
 import * as vscode from 'vscode';
 
 export interface IApiService {

extensions/resource-deployment/src/typings/ref.d.ts

@@ -6,4 +6,6 @@
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
+/// <reference path='../../../azurecore/src/azurecore.d.ts'/>
+/// <reference path='../../../azurecore/src/azureResource/azure-resource.d.ts'/>
 /// <reference types='@types/node'/>

extensions/resource-deployment/src/ui/deployClusterWizard/pages/azureSettingsPage.ts

@@ -11,7 +11,7 @@ import { createSection, getDropdownComponent, InputComponentInfo, InputComponent
 import { WizardPageBase } from '../../wizardPageBase';
 import { AksName_VariableName, Location_VariableName, ResourceGroup_VariableName, SubscriptionId_VariableName, VMCount_VariableName, VMSize_VariableName } from '../constants';
 import { DeployClusterWizard } from '../deployClusterWizard';
-import { AzureRegion } from '../../../../../azurecore/src/azurecore';
+import { AzureRegion } from 'azurecore';
 const localize = nls.loadMessageBundle();
 const MissingRequiredInformationErrorMessage = localize('deployCluster.MissingRequiredInfoError', "Please fill out the required fields marked with red asterisks.");
 

extensions/resource-deployment/src/ui/modelViewUtils.ts

@@ -8,7 +8,7 @@ import { EOL, homedir as os_homedir } from 'os';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
-import { azureResource } from '../../../azurecore/src/azureResource/azure-resource';
+import { azureResource } from 'azureResource';
 import { AzureAccountFieldInfo, AzureLocationsFieldInfo, ComponentCSSStyles, DialogInfoBase, FieldInfo, FieldType, FilePickerFieldInfo, KubeClusterContextFieldInfo, LabelPosition, NoteBookEnvironmentVariablePrefix, OptionsInfo, OptionsType, PageInfoBase, RowInfo, SectionInfo, TextCSSStyles } from '../interfaces';
 import * as loc from '../localizedConstants';
 import { apiService } from '../services/apiService';

extensions/sql-migration/src/typings/ref.d.ts

@@ -6,4 +6,5 @@
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
+/// <reference path='../../../azurecore/src/azurecore.d.ts'/>
 /// <reference types='@types/node'/>