diff --git a/extensions/arc/src/common/utils.ts b/extensions/arc/src/common/utils.ts index b26208ffde..4d86c56c4c 100644 --- a/extensions/arc/src/common/utils.ts +++ b/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'; diff --git a/extensions/arc/src/typings/refs.d.ts b/extensions/arc/src/typings/refs.d.ts index dad0d96412..bc3ed06ab5 100644 --- a/extensions/arc/src/typings/refs.d.ts +++ b/extensions/arc/src/typings/refs.d.ts @@ -5,4 +5,5 @@ /// /// +/// /// diff --git a/extensions/azurecore/src/azureResource/azure-resource.d.ts b/extensions/azurecore/src/azureResource/azure-resource.d.ts index 7eadbeed6a..e8d1b4fd6e 100644 --- a/extensions/azurecore/src/azureResource/azure-resource.d.ts +++ b/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 { + } + + 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 { - } - - 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; - } - - } diff --git a/extensions/azurecore/src/azureResource/commands.ts b/extensions/azurecore/src/azureResource/commands.ts index 9da4ca33cc..21c77a1548 100644 --- a/extensions/azurecore/src/azureResource/commands.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/interfaces.ts b/extensions/azurecore/src/azureResource/interfaces.ts index 791f16d2a7..1e21f1e9e5 100644 --- a/extensions/azurecore/src/azureResource/interfaces.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/providers/database/databaseProvider.ts b/extensions/azurecore/src/azureResource/providers/database/databaseProvider.ts index 565f01ff5b..f4ade4e9af 100644 --- a/extensions/azurecore/src/azureResource/providers/database/databaseProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/database/databaseService.ts b/extensions/azurecore/src/azureResource/providers/database/databaseService.ts index a8f3231e0c..f8ca86a622 100644 --- a/extensions/azurecore/src/azureResource/providers/database/databaseService.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts index c5c988dcb5..0d4700e4fc 100644 --- a/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerProvider.ts b/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerProvider.ts index 63ba9cac08..307e6dc662 100644 --- a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerService.ts b/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerService.ts index e2a3aa5c9b..8b7227cb29 100644 --- a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts index 3508a5cad8..95acf8fc49 100644 --- a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts +++ b/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 { private static readonly containerId = 'azure.resource.providers.databaseServer.treeDataProvider.databaseServerContainer'; diff --git a/extensions/azurecore/src/azureResource/providers/kusto/kustoProvider.ts b/extensions/azurecore/src/azureResource/providers/kusto/kustoProvider.ts index 6c78a62386..3e29b093ce 100644 --- a/extensions/azurecore/src/azureResource/providers/kusto/kustoProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/kusto/kustoService.ts b/extensions/azurecore/src/azureResource/providers/kusto/kustoService.ts index 8a83efb7cf..2990b721ec 100644 --- a/extensions/azurecore/src/azureResource/providers/kusto/kustoService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts index 46e8400642..7902cc63fc 100644 --- a/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts +++ b/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 { private static readonly containerId = 'azure.resource.providers.KustoContainer'; diff --git a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerProvider.ts b/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerProvider.ts index 8b6e47af44..6fc0ea72c6 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerService.ts b/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerService.ts index 271bcd0a31..8296640808 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerService.ts +++ b/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: { diff --git a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts index 4eb71c285c..c3f2462f6d 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts +++ b/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 { private static readonly containerId = 'azure.resource.providers.postgresArcServer.treeDataProvider.postgresServerContainer'; diff --git a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerProvider.ts b/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerProvider.ts index 58b3d64da9..206fe62daa 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerService.ts b/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerService.ts index c47da73e91..c32f53df4a 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts index e90b1d4142..4ba16c4842 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts +++ b/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 { private static readonly containerId = 'azure.resource.providers.databaseServer.treeDataProvider.postgresServerContainer'; diff --git a/extensions/azurecore/src/azureResource/providers/resourceGroup/resourceGroupService.ts b/extensions/azurecore/src/azureResource/providers/resourceGroup/resourceGroupService.ts index 8220f9f9a5..a5cb65a664 100644 --- a/extensions/azurecore/src/azureResource/providers/resourceGroup/resourceGroupService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts b/extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts index 27815fdd1d..34d32da86e 100644 --- a/extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceProvider.ts b/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceProvider.ts index 1dc7e8cc86..0dff7ee4e4 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceService.ts b/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceService.ts index 97d576dc43..4bf40cdf94 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts index d1285d3555..607dfe04ca 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts +++ b/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 { private static readonly containerId = 'azure.resource.providers.sqlInstanceContainer'; diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcProvider.ts b/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcProvider.ts index 6a9acf0840..0ad6cfc86a 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcProvider.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcService.ts b/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcService.ts index d0a23602c9..ec31011c6d 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcService.ts +++ b/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: { diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts index 9edac29a9e..decbbd0126 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts +++ b/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 { private static readonly containerId = 'azure.resource.providers.sqlInstanceArcContainer'; diff --git a/extensions/azurecore/src/azureResource/resourceService.ts b/extensions/azurecore/src/azureResource/resourceService.ts index d99456a4b7..37edcaf111 100644 --- a/extensions/azurecore/src/azureResource/resourceService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts b/extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts index cf513f5850..6c00468db7 100644 --- a/extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/services/subscriptionService.ts b/extensions/azurecore/src/azureResource/services/subscriptionService.ts index 3d2ec0fb08..ce77a4f959 100644 --- a/extensions/azurecore/src/azureResource/services/subscriptionService.ts +++ b/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 { diff --git a/extensions/azurecore/src/azureResource/tree/accountTreeNode.ts b/extensions/azurecore/src/azureResource/tree/accountTreeNode.ts index 012938e865..7caaea91df 100644 --- a/extensions/azurecore/src/azureResource/tree/accountTreeNode.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts b/extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts index f5189bdfd4..45b5ebf3da 100644 --- a/extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts +++ b/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'; diff --git a/extensions/azurecore/src/azureResource/utils.ts b/extensions/azurecore/src/azureResource/utils.ts index 34bb7f1428..3799181a25 100644 --- a/extensions/azurecore/src/azureResource/utils.ts +++ b/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'; diff --git a/extensions/azurecore/src/azurecore.d.ts b/extensions/azurecore/src/azurecore.d.ts index 763dbdaf2d..1d39160eaa 100644 --- a/extensions/azurecore/src/azurecore.d.ts +++ b/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'; -import { azureResource } from './azureResource/azure-resource'; - -/** - * 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; - getResourceGroups(account?: azdata.Account, subscription?: azureResource.AzureResourceSubscription, ignoreErrors?: boolean): Thenable; +declare module 'azurecore' { + import * as azdata from 'azdata'; + import { azureResource } from 'azureResource'; /** - * Converts a region value (@see AzureRegion) into the localized Display Name - * @param region The region value + * 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) */ - getRegionDisplayName(region?: string): string; - provideResources(): azureResource.IAzureResourceProvider[]; -} + export const enum extension { + 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; + getResourceGroups(account?: azdata.Account, subscription?: azureResource.AzureResourceSubscription, ignoreErrors?: boolean): Thenable; + /** + * 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[] }; +} diff --git a/extensions/azurecore/src/extension.ts b/extensions/azurecore/src/extension.ts index 49acf85c5c..25dc3b4e7c 100644 --- a/extensions/azurecore/src/extension.ts +++ b/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 * as azurecore from './azurecore'; +import { azureResource } from 'azureResource'; +import * as azurecore from 'azurecore'; import * as azureResourceUtils from './azureResource/utils'; import * as utils from './utils'; import * as loc from './localizedConstants'; diff --git a/extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts b/extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts index 5cf1b7b561..05558665ec 100644 --- a/extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts +++ b/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'; diff --git a/extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts b/extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts index 092a970472..9ede7f79ad 100644 --- a/extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts +++ b/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'; diff --git a/extensions/azurecore/src/test/azureResource/resourceService.test.ts b/extensions/azurecore/src/test/azureResource/resourceService.test.ts index 723263fab1..e56eb9c01f 100644 --- a/extensions/azurecore/src/test/azureResource/resourceService.test.ts +++ b/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'; diff --git a/extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts b/extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts index 803e7050f9..4f07e3dde5 100644 --- a/extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts +++ b/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'; diff --git a/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts b/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts index 52cb4dfe59..19a29a5049 100644 --- a/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts +++ b/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, diff --git a/extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts b/extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts index d9f8e187aa..068e1ae1c6 100644 --- a/extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts +++ b/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'; diff --git a/extensions/azurecore/src/test/utils.test.ts b/extensions/azurecore/src/test/utils.test.ts index 6a53aa9596..ad727a5d8b 100644 --- a/extensions/azurecore/src/test/utils.test.ts +++ b/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 { diff --git a/extensions/azurecore/src/utils.ts b/extensions/azurecore/src/utils.ts index a6a4a61fba..c714104d49 100644 --- a/extensions/azurecore/src/utils.ts +++ b/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 diff --git a/extensions/machine-learning/src/common/apiWrapper.ts b/extensions/machine-learning/src/common/apiWrapper.ts index a05f9f8f78..7cf289614e 100644 --- a/extensions/machine-learning/src/common/apiWrapper.ts +++ b/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 diff --git a/extensions/machine-learning/src/test/stubs.ts b/extensions/machine-learning/src/test/stubs.ts index 408f7db6c3..9dcc623e64 100644 --- a/extensions/machine-learning/src/test/stubs.ts +++ b/extensions/machine-learning/src/test/stubs.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; -import * as azurecore from '../../../azurecore/src/azurecore'; -import { azureResource } from '../../../azurecore/src/azureResource/azure-resource'; +import * as azurecore from 'azurecore'; +import { azureResource } from 'azureResource'; export class AzurecoreApiStub implements azurecore.IExtension { getSubscriptions(_account?: azdata.Account | undefined, _ignoreErrors?: boolean | undefined): Thenable { diff --git a/extensions/machine-learning/src/typings/ref.d.ts b/extensions/machine-learning/src/typings/ref.d.ts index 4d46be908b..0e316762ac 100644 --- a/extensions/machine-learning/src/typings/ref.d.ts +++ b/extensions/machine-learning/src/typings/ref.d.ts @@ -6,4 +6,6 @@ /// /// /// -/// \ No newline at end of file +/// +/// +/// diff --git a/extensions/resource-deployment/src/services/apiService.ts b/extensions/resource-deployment/src/services/apiService.ts index 4e81006c9d..da06eaca4e 100644 --- a/extensions/resource-deployment/src/services/apiService.ts +++ b/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 { diff --git a/extensions/resource-deployment/src/typings/ref.d.ts b/extensions/resource-deployment/src/typings/ref.d.ts index cfdf5dd135..0e316762ac 100644 --- a/extensions/resource-deployment/src/typings/ref.d.ts +++ b/extensions/resource-deployment/src/typings/ref.d.ts @@ -6,4 +6,6 @@ /// /// /// +/// +/// /// diff --git a/extensions/resource-deployment/src/ui/deployClusterWizard/pages/azureSettingsPage.ts b/extensions/resource-deployment/src/ui/deployClusterWizard/pages/azureSettingsPage.ts index 1f21572259..0745d078df 100644 --- a/extensions/resource-deployment/src/ui/deployClusterWizard/pages/azureSettingsPage.ts +++ b/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."); diff --git a/extensions/resource-deployment/src/ui/modelViewUtils.ts b/extensions/resource-deployment/src/ui/modelViewUtils.ts index 8c85d23e2b..e2c186138b 100644 --- a/extensions/resource-deployment/src/ui/modelViewUtils.ts +++ b/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'; diff --git a/extensions/sql-migration/src/typings/ref.d.ts b/extensions/sql-migration/src/typings/ref.d.ts index cfdf5dd135..d9ac70a919 100644 --- a/extensions/sql-migration/src/typings/ref.d.ts +++ b/extensions/sql-migration/src/typings/ref.d.ts @@ -6,4 +6,5 @@ /// /// /// +/// ///