Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to vscode-azext-dev #2050

Merged
merged 3 commits into from
Jul 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gulpfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { gulp_installAzureAccount, gulp_installResourceGroups, gulp_webpack } from '@microsoft/vscode-azext-dev';
import * as fse from 'fs-extra';
import * as gulp from 'gulp';
import * as path from 'path';
import { gulp_installAzureAccount, gulp_installResourceGroups, gulp_webpack } from 'vscode-azureextensiondev';

declare let exports: { [key: string]: unknown };

Expand Down
80 changes: 40 additions & 40 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,7 @@
"devDependencies": {
"@azure/arm-resources": "^4.0.0",
"@microsoft/eslint-config-azuretools": "^0.1.0",
"@microsoft/vscode-azext-dev": "^0.1.4",
"@types/copy-webpack-plugin": "^6.4.0",
"@types/documentdb": "^1.10.2",
"@types/fs-extra": "^8.1.0",
Expand All @@ -1022,7 +1023,6 @@
"ts-node": "^7.0.1",
"typescript": "^4.4.3",
"vsce": "^1.87.0",
"vscode-azureextensiondev": "^0.10.4",
"vscode-test": "^1.5.2",
"webpack": "^5.28.0",
"webpack-cli": "^4.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzExtTreeItem, ExecuteActivityContext, IActionContext } from "@microsoft/vscode-azext-utils";
import { ISubscriptionContext } from "vscode-azureextensiondev";
import { AzExtTreeItem, ExecuteActivityContext, IActionContext, ISubscriptionContext } from "@microsoft/vscode-azext-utils";
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was mistakenly being imported from dev package


export interface IDeleteWizardContext extends IActionContext, ExecuteActivityContext {
node: AzExtTreeItem;
Expand Down
2 changes: 1 addition & 1 deletion test/global.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Licensed under the MIT License. See LICENSE.md in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { TestOutputChannel, TestUserInput } from '@microsoft/vscode-azext-dev';
import * as vscode from 'vscode';
import { TestOutputChannel, TestUserInput } from 'vscode-azureextensiondev';
import { ext, registerOnActionStartHandler } from '../extension.bundle';

export const longRunningTestsEnabled: boolean = !/^(false|0)?$/i.test(process.env.ENABLE_LONG_RUNNING_TESTS || '');
Expand Down
2 changes: 1 addition & 1 deletion test/nightly/azureResourceGraph.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import { DatabaseAccountGetResults } from '@azure/arm-cosmosdb';
import { ContainerDefinition, CosmosClient, DatabaseDefinition, Resource } from '@azure/cosmos';
import { runWithTestActionContext } from '@microsoft/vscode-azext-dev';
import * as assert from 'assert';
import { runWithTestActionContext } from 'vscode-azureextensiondev';
import { createGraph, createGraphDatabase, randomUtils } from '../../extension.bundle';
import { longRunningTestsEnabled } from '../global.test';
import { getConnectionString } from './getConnectionString';
Expand Down
2 changes: 1 addition & 1 deletion test/nightly/azureResourceMongoDB.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
*--------------------------------------------------------------------------------------------*/

import { DatabaseAccountGetResults } from '@azure/arm-cosmosdb';
import { runWithTestActionContext } from '@microsoft/vscode-azext-dev';
import * as assert from 'assert';
import { Collection, MongoClient } from 'mongodb';
import { runWithTestActionContext } from 'vscode-azureextensiondev';
import { appendExtensionUserAgent, connectToMongoClient, createMongoCollection, createMongoDatabase, deleteMongoCollection, deleteMongoDB, DialogResponses, IDatabaseInfo, randomUtils } from '../../extension.bundle';
import { longRunningTestsEnabled } from '../global.test';
import { getConnectionString } from './getConnectionString';
Expand Down
2 changes: 1 addition & 1 deletion test/nightly/azureResourceSQL.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import { DatabaseAccountGetResults } from '@azure/arm-cosmosdb';
import { ContainerDefinition, CosmosClient, DatabaseDefinition, Resource } from '@azure/cosmos';
import { runWithTestActionContext } from '@microsoft/vscode-azext-dev';
import * as assert from 'assert';
import { runWithTestActionContext } from 'vscode-azureextensiondev';
import { createDocDBCollection, createDocDBDatabase, deleteDocDBCollection, deleteDocDBDatabase, DialogResponses, getCosmosClient, ParsedDocDBConnectionString, parseDocDBConnectionString, randomUtils } from '../../extension.bundle';
import { longRunningTestsEnabled } from '../global.test';
import { getConnectionString } from './getConnectionString';
Expand Down
2 changes: 1 addition & 1 deletion test/nightly/getConnectionString.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { runWithTestActionContext } from '@microsoft/vscode-azext-dev';
import * as vscode from 'vscode';
import { runWithTestActionContext } from 'vscode-azureextensiondev';
import { cosmosDBCopyConnectionString } from '../../extension.bundle';

export async function getConnectionString(accountName: string): Promise<string> {
Expand Down
2 changes: 1 addition & 1 deletion test/nightly/global.resource.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import { CosmosDBManagementClient, DatabaseAccountGetResults } from '@azure/arm-cosmosdb';
import { ResourceManagementClient } from '@azure/arm-resources';
import { uiUtils } from '@microsoft/vscode-azext-azureutils';
import { createTestActionContext, runWithTestActionContext, TestAzureAccount } from '@microsoft/vscode-azext-dev';
import * as assert from 'assert';
import * as vscode from 'vscode';
import { createTestActionContext, runWithTestActionContext, TestAzureAccount } from 'vscode-azureextensiondev';
import { AzExtTreeDataProvider, AzureAccountTreeItemWithAttached, createAzureClient, createCosmosDBClient, createServer, deleteAccount, DialogResponses, ext, randomUtils } from '../../extension.bundle';
import { longRunningTestsEnabled } from '../global.test';

Expand Down
2 changes: 1 addition & 1 deletion test/util/getIp.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { createTestActionContext } from '@microsoft/vscode-azext-dev';
import * as assert from 'assert';
import { isIPv4 } from 'net';
import { createTestActionContext } from 'vscode-azureextensiondev';
import { getPublicIpv4 } from '../../extension.bundle';

suite("getPublicIpv4", () => {
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
const process = require('process');
const webpack = require('webpack');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const dev = require("vscode-azureextensiondev");
const dev = require("@microsoft/vscode-azext-dev");

let DEBUG_WEBPACK = !!process.env.DEBUG_WEBPACK;

Expand Down