use azurecore and azureresource as typings (#11892)

* use azurecore and azureresource as typings

* Remove unrelated file

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';
-import { DataProvider, Account, TreeItem } from 'azdata';
+declare module 'azureResource' {
+	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 { GetResourceGroupsResult, GetSubscriptionsResult } from '../azurecore';
+import { azureResource } from 'azureResource';
+import { GetResourceGroupsResult, GetSubscriptionsResult } from 'azurecore';
 import { isArray } from 'util';
 import { AzureResourceGroupService } from './providers/resourceGroup/resourceGroupService';
 import { TokenCredentials } from '@azure/ms-rest-js';