Remove all traces of azure accounts (#1308)
This commit is contained in:
Nathan
GitHub
Родитель
5bc61909ef
Коммит
e451720c61
|
|
@ -28,10 +28,9 @@ export * from './src/commands/storageAccountActionHandlers';
|
|||
export * from './src/commands/table/tableActionHandlers';
|
||||
export * from './src/commands/table/tableGroupActionHandlers';
|
||||
// Export activate/deactivate for main.js
|
||||
export { ResolvedStorageAccount } from './src/StorageAccountResolver';
|
||||
export { activate, deactivate } from './src/extension';
|
||||
export { ext } from './src/extensionVariables';
|
||||
export { AzureAccountTreeItem } from './src/tree/AzureAccountTreeItem';
|
||||
export { ResolvedStorageAccount } from './src/StorageAccountResolver';
|
||||
export { StorageAccountTreeItem } from './src/tree/StorageAccountTreeItem';
|
||||
export { delay } from './src/utils/delay';
|
||||
export { getRandomHexString } from './src/utils/stringUtils';
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
* Licensed under the MIT License. See License.md in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { gulp_installResourceGroups, gulp_webpack } from '@microsoft/vscode-azext-dev';
|
||||
import * as cp from 'child_process';
|
||||
import * as fs from 'fs';
|
||||
import * as gulp from 'gulp';
|
||||
import * as path from 'path';
|
||||
import { gulp_installAzureAccount, gulp_installResourceGroups, gulp_webpack } from '@microsoft/vscode-azext-dev';
|
||||
|
||||
async function prepareForWebpack(): Promise<void> {
|
||||
const mainJsPath: string = path.join(__dirname, 'main.js');
|
||||
|
|
@ -35,6 +35,6 @@ async function setAzCopyExePermissions(): Promise<void> {
|
|||
|
||||
exports['webpack-dev'] = gulp.series(prepareForWebpack, () => gulp_webpack('development'));
|
||||
exports['webpack-prod'] = gulp.series(prepareForWebpack, () => gulp_webpack('production'));
|
||||
exports.preTest = gulp.series(gulp_installAzureAccount, gulp_installResourceGroups);
|
||||
exports.preTest = gulp.series(gulp_installResourceGroups);
|
||||
exports.cleanReadme = cleanReadme;
|
||||
exports.setAzCopyExePermissions = setAzCopyExePermissions;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"@azure/storage-queue": "^12.7.0",
|
||||
"@microsoft/vscode-azext-azureappservice": "^0.7.0",
|
||||
"@microsoft/vscode-azext-azureutils": "^2.0.1",
|
||||
"@microsoft/vscode-azext-utils": "^2.0.1",
|
||||
"@microsoft/vscode-azext-utils": "^2.5.0",
|
||||
"@microsoft/vscode-azureresources-api": "^2.0.4",
|
||||
"glob": "^7.1.2",
|
||||
"jsdom": "^21.1.1",
|
||||
|
|
@ -906,6 +906,96 @@
|
|||
"@microsoft/dynamicproto-js": "^1.1.7"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-channel-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.2.1.tgz",
|
||||
"integrity": "sha512-+aWBBbIW4/Tf4sLGZmWhd5chktBpKQpnCbkuoTHGe+AWO8Q8fsDa4w2Y89OGuEg9OJ3kr2VKTUU7LgILKFz/cg==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-common": "3.2.1",
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tslib": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-channel-js/node_modules/@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tslib": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-channel-js/node_modules/@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-channel-js/node_modules/@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-common": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.2.1.tgz",
|
||||
"integrity": "sha512-vRYQ1SIZJEz1eFbs2AQiLtev5L+zmjZ1Jkj3BWfIxJLd6n0cVR4NZETBSyMuk11KH7MIOrDLvh1CzjBIJIpDAg==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tslib": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-common/node_modules/@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tslib": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-common/node_modules/@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-common/node_modules/@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-core-js": {
|
||||
"version": "2.8.14",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.14.tgz",
|
||||
|
|
@ -923,6 +1013,53 @@
|
|||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
|
||||
"integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg=="
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-web-basic": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.2.1.tgz",
|
||||
"integrity": "sha512-aPvZX8VOSwLwnXpLpRnFXUB5Znw+9mcsp4/UMWi6V0SVGKTlyGEDn/xcHAN2uKEcb5aD/w9UYdAsbPWEW6yEpw==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-channel-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-common": "3.2.1",
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tslib": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-web-basic/node_modules/@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tslib": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-web-basic/node_modules/@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/applicationinsights-web-basic/node_modules/@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/dynamicproto-js": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
|
||||
|
|
@ -1246,12 +1383,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-2.0.1.tgz",
|
||||
"integrity": "sha512-T8PMZPHOpQl86lqpY9ngnAAg99O+vTBWQYJkXzxRzpHqIuF2ecaTAnN2+F/Xev3/O0BoGbMjXMva9rzJ+l+GxQ==",
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-2.5.0.tgz",
|
||||
"integrity": "sha512-K++jZjALHfbBsU3E64w/PK8tVibG6g4i0yZcP2wUxkZh053Wf1ZDlMlRSHvuH8oQeOXIcFVRvLwPDqhx8o0cuA==",
|
||||
"dependencies": {
|
||||
"@microsoft/vscode-azureresources-api": "^2.0.4",
|
||||
"@vscode/extension-telemetry": "^0.6.2",
|
||||
"@vscode/extension-telemetry": "^0.9.0",
|
||||
"dayjs": "^1.11.2",
|
||||
"escape-string-regexp": "^2.0.0",
|
||||
"html-to-text": "^8.2.0",
|
||||
|
|
@ -1264,6 +1401,73 @@
|
|||
"@azure/ms-rest-azure-env": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils/node_modules/@microsoft/1ds-core-js": {
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.2.1.tgz",
|
||||
"integrity": "sha512-fcowL6s42sj4+yU0nko9gkGDCGbeQEGgYxXnwejSAjMw9MKZ0jjYRvxFBR+Aip6aCzf0WV0Jw0j4FA72EXMbIg==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils/node_modules/@microsoft/1ds-post-js": {
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.2.1.tgz",
|
||||
"integrity": "sha512-MeGvTxBbADo8um8ylTJST+gDcIpKx0mLtLtcbJtgSdL+SerITf2wvweobE3/NMQiWI8URtCb1XIYKauW7lqVlg==",
|
||||
"dependencies": {
|
||||
"@microsoft/1ds-core-js": "4.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils/node_modules/@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"tslib": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils/node_modules/@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils/node_modules/@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils/node_modules/@vscode/extension-telemetry": {
|
||||
"version": "0.9.6",
|
||||
"resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.6.tgz",
|
||||
"integrity": "sha512-qWK2GNw+b69QRYpjuNM9g3JKToMICoNIdc0rQMtvb4gIG9vKKCZCVCz+ZOx6XM/YlfWAyuPiyxcjIY0xyF+Djg==",
|
||||
"dependencies": {
|
||||
"@microsoft/1ds-core-js": "^4.1.2",
|
||||
"@microsoft/1ds-post-js": "^4.1.2",
|
||||
"@microsoft/applicationinsights-web-basic": "^3.1.2"
|
||||
},
|
||||
"engines": {
|
||||
"vscode": "^1.75.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-utils/node_modules/uuid": {
|
||||
"version": "9.0.0",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
|
||||
|
|
@ -1277,6 +1481,19 @@
|
|||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azureresources-api/-/vscode-azureresources-api-2.0.4.tgz",
|
||||
"integrity": "sha512-LridV1h2rCydrBzEpwy+pUIUx61GpZNwrK04G7LdlhoxHrzuM/WAoy8jXaSC/FSKSsXD1QXuE6u/YofEfsuKeg=="
|
||||
},
|
||||
"node_modules/@nevware21/ts-async": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.1.tgz",
|
||||
"integrity": "sha512-O2kN8n2HpDWJ7Oji+oTMnhITrCndmrNvrHbGDwAIBydx+FWvLE/vrw4QwnRRMvSCa2AJrcP59Ryklxv30KfkWQ==",
|
||||
"dependencies": {
|
||||
"@nevware21/ts-utils": ">= 0.11.2 < 2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@nevware21/ts-utils": {
|
||||
"version": "0.11.2",
|
||||
"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.2.tgz",
|
||||
"integrity": "sha512-80W8BkS09kkGuUHJX50Fqq+QqAslxUaOQytH+3JhRacXs1EpEt2JOOkYKytqFZAYir3SeH9fahniEaDzIBxlUw=="
|
||||
},
|
||||
"node_modules/@nodelib/fs.scandir": {
|
||||
"version": "2.1.5",
|
||||
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
|
||||
|
|
@ -14180,6 +14397,88 @@
|
|||
"@microsoft/dynamicproto-js": "^1.1.7"
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-channel-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.2.1.tgz",
|
||||
"integrity": "sha512-+aWBBbIW4/Tf4sLGZmWhd5chktBpKQpnCbkuoTHGe+AWO8Q8fsDa4w2Y89OGuEg9OJ3kr2VKTUU7LgILKFz/cg==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-common": "3.2.1",
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-common": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.2.1.tgz",
|
||||
"integrity": "sha512-vRYQ1SIZJEz1eFbs2AQiLtev5L+zmjZ1Jkj3BWfIxJLd6n0cVR4NZETBSyMuk11KH7MIOrDLvh1CzjBIJIpDAg==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-core-js": {
|
||||
"version": "2.8.14",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.14.tgz",
|
||||
|
|
@ -14194,6 +14493,49 @@
|
|||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
|
||||
"integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg=="
|
||||
},
|
||||
"@microsoft/applicationinsights-web-basic": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.2.1.tgz",
|
||||
"integrity": "sha512-aPvZX8VOSwLwnXpLpRnFXUB5Znw+9mcsp4/UMWi6V0SVGKTlyGEDn/xcHAN2uKEcb5aD/w9UYdAsbPWEW6yEpw==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-channel-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-common": "3.2.1",
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
},
|
||||
"dependencies": {
|
||||
"@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"@microsoft/dynamicproto-js": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
|
||||
|
|
@ -14472,12 +14814,12 @@
|
|||
}
|
||||
},
|
||||
"@microsoft/vscode-azext-utils": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-2.0.1.tgz",
|
||||
"integrity": "sha512-T8PMZPHOpQl86lqpY9ngnAAg99O+vTBWQYJkXzxRzpHqIuF2ecaTAnN2+F/Xev3/O0BoGbMjXMva9rzJ+l+GxQ==",
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-2.5.0.tgz",
|
||||
"integrity": "sha512-K++jZjALHfbBsU3E64w/PK8tVibG6g4i0yZcP2wUxkZh053Wf1ZDlMlRSHvuH8oQeOXIcFVRvLwPDqhx8o0cuA==",
|
||||
"requires": {
|
||||
"@microsoft/vscode-azureresources-api": "^2.0.4",
|
||||
"@vscode/extension-telemetry": "^0.6.2",
|
||||
"@vscode/extension-telemetry": "^0.9.0",
|
||||
"dayjs": "^1.11.2",
|
||||
"escape-string-regexp": "^2.0.0",
|
||||
"html-to-text": "^8.2.0",
|
||||
|
|
@ -14487,6 +14829,67 @@
|
|||
"vscode-uri": "^3.0.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"@microsoft/1ds-core-js": {
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.2.1.tgz",
|
||||
"integrity": "sha512-fcowL6s42sj4+yU0nko9gkGDCGbeQEGgYxXnwejSAjMw9MKZ0jjYRvxFBR+Aip6aCzf0WV0Jw0j4FA72EXMbIg==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-core-js": "3.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/1ds-post-js": {
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.2.1.tgz",
|
||||
"integrity": "sha512-MeGvTxBbADo8um8ylTJST+gDcIpKx0mLtLtcbJtgSdL+SerITf2wvweobE3/NMQiWI8URtCb1XIYKauW7lqVlg==",
|
||||
"requires": {
|
||||
"@microsoft/1ds-core-js": "4.2.1",
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-core-js": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.1.tgz",
|
||||
"integrity": "sha512-euxkDrF5BroAY7wgviaTVZdMvRAENQtUW4pDTsIjJK26shi1m5fPCc5l+vMn7kO2wQEaEgAOVw+/kSQgXDHN+Q==",
|
||||
"requires": {
|
||||
"@microsoft/applicationinsights-shims": "3.0.1",
|
||||
"@microsoft/dynamicproto-js": "^2.0.3",
|
||||
"@nevware21/ts-async": ">= 0.5.1 < 2.x",
|
||||
"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/applicationinsights-shims": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
||||
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"@microsoft/dynamicproto-js": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
||||
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
||||
}
|
||||
},
|
||||
"@vscode/extension-telemetry": {
|
||||
"version": "0.9.6",
|
||||
"resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.6.tgz",
|
||||
"integrity": "sha512-qWK2GNw+b69QRYpjuNM9g3JKToMICoNIdc0rQMtvb4gIG9vKKCZCVCz+ZOx6XM/YlfWAyuPiyxcjIY0xyF+Djg==",
|
||||
"requires": {
|
||||
"@microsoft/1ds-core-js": "^4.1.2",
|
||||
"@microsoft/1ds-post-js": "^4.1.2",
|
||||
"@microsoft/applicationinsights-web-basic": "^3.1.2"
|
||||
}
|
||||
},
|
||||
"uuid": {
|
||||
"version": "9.0.0",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
|
||||
|
|
@ -14499,6 +14902,19 @@
|
|||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azureresources-api/-/vscode-azureresources-api-2.0.4.tgz",
|
||||
"integrity": "sha512-LridV1h2rCydrBzEpwy+pUIUx61GpZNwrK04G7LdlhoxHrzuM/WAoy8jXaSC/FSKSsXD1QXuE6u/YofEfsuKeg=="
|
||||
},
|
||||
"@nevware21/ts-async": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.1.tgz",
|
||||
"integrity": "sha512-O2kN8n2HpDWJ7Oji+oTMnhITrCndmrNvrHbGDwAIBydx+FWvLE/vrw4QwnRRMvSCa2AJrcP59Ryklxv30KfkWQ==",
|
||||
"requires": {
|
||||
"@nevware21/ts-utils": ">= 0.11.2 < 2.x"
|
||||
}
|
||||
},
|
||||
"@nevware21/ts-utils": {
|
||||
"version": "0.11.2",
|
||||
"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.2.tgz",
|
||||
"integrity": "sha512-80W8BkS09kkGuUHJX50Fqq+QqAslxUaOQytH+3JhRacXs1EpEt2JOOkYKytqFZAYir3SeH9fahniEaDzIBxlUw=="
|
||||
},
|
||||
"@nodelib/fs.scandir": {
|
||||
"version": "2.1.5",
|
||||
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@
|
|||
"@azure/storage-queue": "^12.7.0",
|
||||
"@microsoft/vscode-azext-azureappservice": "^0.7.0",
|
||||
"@microsoft/vscode-azext-azureutils": "^2.0.1",
|
||||
"@microsoft/vscode-azext-utils": "^2.0.1",
|
||||
"@microsoft/vscode-azext-utils": "^2.5.0",
|
||||
"@microsoft/vscode-azureresources-api": "^2.0.4",
|
||||
"glob": "^7.1.2",
|
||||
"jsdom": "^21.1.1",
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import type { Subscription } from '@azure/arm-resources-subscriptions';
|
||||
import { TokenCredential } from '@azure/core-auth';
|
||||
import { Environment } from '@azure/ms-rest-azure-env';
|
||||
import type { TokenCredentialsBase } from '@azure/ms-rest-nodeauth';
|
||||
import { apiUtils } from '@microsoft/vscode-azext-utils';
|
||||
import { ReadStream } from 'fs';
|
||||
import * as vscode from 'vscode';
|
||||
import { CancellationToken, Event, Progress, Terminal } from 'vscode';
|
||||
|
||||
|
||||
export type AzureLoginStatus = 'Initializing' | 'LoggingIn' | 'LoggedIn' | 'LoggedOut';
|
||||
|
||||
export interface AzureAccountExtensionApi {
|
||||
readonly apiVersion: string;
|
||||
readonly status: AzureLoginStatus;
|
||||
readonly filters: AzureResourceFilter[];
|
||||
readonly sessions: AzureSession[];
|
||||
readonly subscriptions: AzureAccountSubscription[];
|
||||
readonly onStatusChanged: Event<AzureLoginStatus>;
|
||||
readonly onFiltersChanged: Event<void>;
|
||||
readonly onSessionsChanged: Event<void>;
|
||||
readonly onSubscriptionsChanged: Event<void>;
|
||||
readonly waitForFilters: () => Promise<boolean>;
|
||||
readonly waitForLogin: () => Promise<boolean>;
|
||||
readonly waitForSubscriptions: () => Promise<boolean>;
|
||||
createCloudShell(os: 'Linux' | 'Windows'): CloudShell;
|
||||
}
|
||||
|
||||
export interface AzureSession {
|
||||
readonly environment: Environment;
|
||||
readonly userId: string;
|
||||
readonly tenantId: string;
|
||||
|
||||
/**
|
||||
* The credentials object for azure-sdk-for-js modules https://github.com/azure/azure-sdk-for-js
|
||||
*/
|
||||
readonly credentials2: TokenCredentialsBase & TokenCredential;
|
||||
}
|
||||
|
||||
export interface AzureAccountSubscription {
|
||||
readonly session: AzureSession;
|
||||
readonly subscription: Subscription;
|
||||
}
|
||||
|
||||
export type AzureResourceFilter = AzureAccountSubscription;
|
||||
|
||||
export type CloudShellStatus = 'Connecting' | 'Connected' | 'Disconnected';
|
||||
|
||||
export interface UploadOptions {
|
||||
contentLength?: number;
|
||||
progress?: Progress<{ message?: string; increment?: number }>;
|
||||
token?: CancellationToken;
|
||||
}
|
||||
|
||||
export interface CloudShell {
|
||||
readonly status: CloudShellStatus;
|
||||
readonly onStatusChanged: Event<CloudShellStatus>;
|
||||
readonly waitForConnection: () => Promise<boolean>;
|
||||
readonly terminal: Promise<Terminal>;
|
||||
readonly session: Promise<AzureSession>;
|
||||
readonly uploadFile: (filename: string, stream: ReadStream, options?: UploadOptions) => Promise<void>;
|
||||
}
|
||||
|
||||
export async function getAzureAccountExtensionApi(): Promise<AzureAccountExtensionApi> {
|
||||
const extension = vscode.extensions.getExtension<apiUtils.AzureExtensionApiProvider>('ms-vscode.azure-account');
|
||||
|
||||
if (extension) {
|
||||
if (!extension.isActive) {
|
||||
await extension.activate();
|
||||
}
|
||||
|
||||
let azureAccountApi: AzureAccountExtensionApi | undefined;
|
||||
if ('getApi' in extension.exports) {
|
||||
azureAccountApi = extension.exports.getApi<AzureAccountExtensionApi>('1');
|
||||
} else {
|
||||
// support versions of the Azure Account extension <0.10.0
|
||||
azureAccountApi = extension.exports as unknown as AzureAccountExtensionApi;
|
||||
}
|
||||
|
||||
if (azureAccountApi) {
|
||||
await azureAccountApi.waitForSubscriptions();
|
||||
}
|
||||
|
||||
return azureAccountApi;
|
||||
}
|
||||
|
||||
throw new Error("Unable to get Azure Account extension API.");
|
||||
}
|
||||
|
|
@ -18,9 +18,9 @@ import { IActionContext, UserCancelledError, callWithTelemetryAndErrorHandling,
|
|||
import { AzureSubscription } from '@microsoft/vscode-azureresources-api';
|
||||
import * as mime from 'mime';
|
||||
import * as vscode from 'vscode';
|
||||
import { AzureAccountSubscription, getAzureAccountExtensionApi } from "./AzureAccountExtension";
|
||||
import { download } from "./commands/downloadFile";
|
||||
import { maxRemoteFileEditSizeBytes, maxRemoteFileEditSizeMB } from "./constants";
|
||||
import { ext } from './extensionVariables';
|
||||
import { BlobTreeItem } from './tree/blob/BlobTreeItem';
|
||||
import { createStorageClient } from './utils/azureClients';
|
||||
import { BlobPathUtils } from './utils/blobPathUtils';
|
||||
|
|
@ -51,8 +51,7 @@ export class BlobContainerFS implements vscode.FileSystemProvider {
|
|||
}
|
||||
|
||||
private async getSubscriptions(): Promise<AzureSubscription[]> {
|
||||
const azureAccountApi = await getAzureAccountExtensionApi();
|
||||
return azureAccountApi.subscriptions.map(sub => this.createAzureSubscription(sub));
|
||||
return await ext.rgApi.getSubscriptions(false);
|
||||
}
|
||||
|
||||
private getStorageAccountId(uri: vscode.Uri): string | null {
|
||||
|
|
@ -540,33 +539,4 @@ export class BlobContainerFS implements vscode.FileSystemProvider {
|
|||
|
||||
return result;
|
||||
}
|
||||
|
||||
private createAzureSubscription(subscription: AzureAccountSubscription): AzureSubscription {
|
||||
return {
|
||||
authentication: {
|
||||
getSession: async scopes => {
|
||||
const token = await subscription.session.credentials2.getToken(scopes ?? []);
|
||||
|
||||
if (!token) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return {
|
||||
accessToken: token.token,
|
||||
account: {
|
||||
id: subscription.session.userId,
|
||||
label: subscription.session.userId
|
||||
},
|
||||
id: 'microsoft',
|
||||
scopes: scopes ?? []
|
||||
};
|
||||
}
|
||||
},
|
||||
name: subscription.subscription.displayName || 'TODO: ever undefined?',
|
||||
environment: subscription.session.environment,
|
||||
isCustomCloud: subscription.session.environment.name === 'AzureCustomCloud',
|
||||
subscriptionId: subscription.subscription.subscriptionId || 'TODO: ever undefined?',
|
||||
tenantId: subscription.session.tenantId
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
import { IAzExtOutputChannel } from "@microsoft/vscode-azext-utils";
|
||||
import { AzureHostExtensionApi } from "@microsoft/vscode-azext-utils/hostapi";
|
||||
import { ExtensionContext, UIKind, Uri, env } from "vscode";
|
||||
import { AzureAccountTreeItem } from '../src/tree/AzureAccountTreeItem';
|
||||
import { AzureStorageFS } from "./AzureStorageFS";
|
||||
import { AttachedStorageAccountsTreeItem } from "./tree/AttachedStorageAccountsTreeItem";
|
||||
|
||||
|
|
@ -18,7 +17,6 @@ export namespace ext {
|
|||
export let outputChannel: IAzExtOutputChannel;
|
||||
export let ignoreBundle: boolean | undefined;
|
||||
|
||||
export let azureAccountTreeItem: AzureAccountTreeItem;
|
||||
export let attachedStorageAccountsTreeItem: AttachedStorageAccountsTreeItem;
|
||||
export let azureStorageFS: AzureStorageFS;
|
||||
export let azureStorageWorkspaceFS: AzureStorageFS;
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.md in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { AzureAccountTreeItemBase } from "@microsoft/vscode-azext-azureutils";
|
||||
import { AzExtTreeItem, IActionContext, ISubscriptionContext } from "@microsoft/vscode-azext-utils";
|
||||
import { ext } from "../extensionVariables";
|
||||
import { AttachedStorageAccountsTreeItem } from "./AttachedStorageAccountsTreeItem";
|
||||
import { SubscriptionTreeItem } from "./SubscriptionTreeItem";
|
||||
|
||||
export class AzureAccountTreeItem extends AzureAccountTreeItemBase {
|
||||
public constructor(testAccount?: {}) {
|
||||
super(undefined, testAccount);
|
||||
ext.attachedStorageAccountsTreeItem = new AttachedStorageAccountsTreeItem(this);
|
||||
}
|
||||
|
||||
public createSubscriptionTreeItem(root: ISubscriptionContext): SubscriptionTreeItem {
|
||||
return new SubscriptionTreeItem(this, root);
|
||||
}
|
||||
|
||||
public async loadMoreChildrenImpl(clearCache: boolean, context: IActionContext): Promise<AzExtTreeItem[]> {
|
||||
const children: AzExtTreeItem[] = await super.loadMoreChildrenImpl(clearCache, context);
|
||||
children.push(ext.attachedStorageAccountsTreeItem);
|
||||
return children;
|
||||
}
|
||||
|
||||
public compareChildrenImpl(item1: AzExtTreeItem, item2: AzExtTreeItem): number {
|
||||
if (item1 instanceof AttachedStorageAccountsTreeItem) {
|
||||
return 1;
|
||||
} else if (item2 instanceof AttachedStorageAccountsTreeItem) {
|
||||
return -1;
|
||||
} else {
|
||||
return super.compareChildrenImpl(item1, item2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,12 +4,8 @@
|
|||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { StorageManagementClient } from '@azure/arm-storage';
|
||||
import { createTestActionContext, TestAzureAccount } from '@microsoft/vscode-azext-dev';
|
||||
import * as vscode from 'vscode';
|
||||
import { AzureAccountTreeItem, createAzureClient, ext } from '../../extension.bundle';
|
||||
import { longRunningTestsEnabled } from '../global.test';
|
||||
|
||||
export let testAccount: TestAzureAccount;
|
||||
export let webSiteClient: StorageManagementClient;
|
||||
export const resourceGroupsToDelete: string[] = [];
|
||||
|
||||
|
|
@ -17,10 +13,6 @@ suiteSetup(async function (this: Mocha.Context): Promise<void> {
|
|||
this.skip();
|
||||
if (longRunningTestsEnabled) {
|
||||
this.timeout(2 * 60 * 1000);
|
||||
testAccount = new TestAzureAccount(vscode);
|
||||
await testAccount.signIn();
|
||||
ext.azureAccountTreeItem = new AzureAccountTreeItem(testAccount);
|
||||
webSiteClient = createAzureClient([await createTestActionContext(), testAccount.getSubscriptionContext()], StorageManagementClient);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -30,6 +22,5 @@ suiteTeardown(async function (this: Mocha.Context): Promise<void> {
|
|||
// await Promise.all(resourceGroupsToDelete.map(async resource => {
|
||||
// await beginDeleteResourceGroup(resource);
|
||||
// }));
|
||||
// ext.azureAccountTreeItem.dispose();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче