From a92b2e069155ed0b647acf2b876fb980d2a5a90c Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Tue, 23 Jul 2019 18:34:17 -0700 Subject: [PATCH] deployment extension not working on Linux (#6476) * add webpack for built in extensions * fix the casing issue * Rename azCLITool.ts to azCliTool.ts * Rename kubectlTool.ts to kubeCtlTool.ts * fix the error * fix the packaging issue --- .../extension.webpack.config.js | 19 +++++++++++++++++++ .../extension.webpack.config.js | 17 +++++++++++++++++ extensions/resource-deployment/package.json | 2 +- .../resource-deployment/src/interfaces.ts | 2 +- .../tools/{azCLITool.ts => azCliTool.ts} | 2 +- .../src/services/tools/azdataTool.ts | 2 +- .../tools/{kubectlTool.ts => kubeCtlTool.ts} | 2 +- .../src/services/toolsService.ts | 4 ++-- .../src/test/notebookService.test.ts | 2 +- .../src/test/toolsService.test.ts | 2 +- extensions/resource-deployment/yarn.lock | 8 ++++---- extensions/shared.tsconfig.json | 3 ++- 12 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 extensions/big-data-cluster/extension.webpack.config.js create mode 100644 extensions/resource-deployment/extension.webpack.config.js rename extensions/resource-deployment/src/services/tools/{azCLITool.ts => azCliTool.ts} (99%) rename extensions/resource-deployment/src/services/tools/{kubectlTool.ts => kubeCtlTool.ts} (99%) diff --git a/extensions/big-data-cluster/extension.webpack.config.js b/extensions/big-data-cluster/extension.webpack.config.js new file mode 100644 index 0000000000..6af716f5e4 --- /dev/null +++ b/extensions/big-data-cluster/extension.webpack.config.js @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/extension.ts' + }, + externals: { + } +}); diff --git a/extensions/resource-deployment/extension.webpack.config.js b/extensions/resource-deployment/extension.webpack.config.js new file mode 100644 index 0000000000..b63c59c65d --- /dev/null +++ b/extensions/resource-deployment/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index cbf1008c95..96144adc08 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -183,7 +183,7 @@ } ], "dependencies": { - "vscode-nls": "^3.2.1" + "vscode-nls": "^4.0.0" }, "devDependencies": { "typemoq": "^2.1.0", diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts index b412a11a91..22291dc691 100644 --- a/extensions/resource-deployment/src/interfaces.ts +++ b/extensions/resource-deployment/src/interfaces.ts @@ -47,7 +47,7 @@ export enum ToolType { AzCli, KubeCtl, Docker, - MSSQLCtl + Azdata } export interface ITool { diff --git a/extensions/resource-deployment/src/services/tools/azCLITool.ts b/extensions/resource-deployment/src/services/tools/azCliTool.ts similarity index 99% rename from extensions/resource-deployment/src/services/tools/azCLITool.ts rename to extensions/resource-deployment/src/services/tools/azCliTool.ts index 3116b42dfa..0f5e9a69c5 100644 --- a/extensions/resource-deployment/src/services/tools/azCLITool.ts +++ b/extensions/resource-deployment/src/services/tools/azCliTool.ts @@ -23,4 +23,4 @@ export class AzCliTool implements ITool { get displayName(): string { return localize('resourceDeployment.AzCLIDisplayName', 'Azure CLI'); } -} \ No newline at end of file +} diff --git a/extensions/resource-deployment/src/services/tools/azdataTool.ts b/extensions/resource-deployment/src/services/tools/azdataTool.ts index a79c18a99e..c947f1573a 100644 --- a/extensions/resource-deployment/src/services/tools/azdataTool.ts +++ b/extensions/resource-deployment/src/services/tools/azdataTool.ts @@ -17,7 +17,7 @@ export class AzdataTool implements ITool { } get type(): ToolType { - return ToolType.MSSQLCtl; + return ToolType.Azdata; } get displayName(): string { diff --git a/extensions/resource-deployment/src/services/tools/kubectlTool.ts b/extensions/resource-deployment/src/services/tools/kubeCtlTool.ts similarity index 99% rename from extensions/resource-deployment/src/services/tools/kubectlTool.ts rename to extensions/resource-deployment/src/services/tools/kubeCtlTool.ts index 4590498add..c47d154d22 100644 --- a/extensions/resource-deployment/src/services/tools/kubectlTool.ts +++ b/extensions/resource-deployment/src/services/tools/kubeCtlTool.ts @@ -23,4 +23,4 @@ export class KubeCtlTool implements ITool { get displayName(): string { return localize('resourceDeployment.KubeCtlDisplayName', 'kubectl'); } -} \ No newline at end of file +} diff --git a/extensions/resource-deployment/src/services/toolsService.ts b/extensions/resource-deployment/src/services/toolsService.ts index d4a3eb3ad9..df8be4c9f5 100644 --- a/extensions/resource-deployment/src/services/toolsService.ts +++ b/extensions/resource-deployment/src/services/toolsService.ts @@ -14,12 +14,12 @@ export interface IToolsService { } export class ToolsService implements IToolsService { + private supportedTools: ITool[]; + constructor() { this.supportedTools = [new DockerTool(), new AzCliTool(), new AzdataTool(), new KubeCtlTool()]; } - private supportedTools: ITool[]; - getToolByName(toolName: string): ITool | undefined { return this.supportedTools.find(t => t.name === toolName); } diff --git a/extensions/resource-deployment/src/test/notebookService.test.ts b/extensions/resource-deployment/src/test/notebookService.test.ts index 01037f3551..36768d5176 100644 --- a/extensions/resource-deployment/src/test/notebookService.test.ts +++ b/extensions/resource-deployment/src/test/notebookService.test.ts @@ -7,7 +7,7 @@ import * as TypeMoq from 'typemoq'; import 'mocha'; -import { NotebookService } from '../services/NotebookService'; +import { NotebookService } from '../services/notebookService'; import assert = require('assert'); import { NotebookInfo } from '../interfaces'; import { IPlatformService } from '../services/platformService'; diff --git a/extensions/resource-deployment/src/test/toolsService.test.ts b/extensions/resource-deployment/src/test/toolsService.test.ts index a6d36a4ebb..f487b4913f 100644 --- a/extensions/resource-deployment/src/test/toolsService.test.ts +++ b/extensions/resource-deployment/src/test/toolsService.test.ts @@ -20,7 +20,7 @@ suite('Tools Service Tests', function (): void { { name: 'azcli', type: ToolType.AzCli }, { name: 'docker', type: ToolType.Docker }, { name: 'kubectl', type: ToolType.KubeCtl }, - { name: 'mssqlctl', type: ToolType.MSSQLCtl }]; + { name: 'azdata', type: ToolType.Azdata }]; const missingTypes: string[] = []; diff --git a/extensions/resource-deployment/yarn.lock b/extensions/resource-deployment/yarn.lock index f25cf91f7e..8bb371b0d0 100644 --- a/extensions/resource-deployment/yarn.lock +++ b/extensions/resource-deployment/yarn.lock @@ -598,10 +598,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vscode-nls@^3.2.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" - integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw== +vscode-nls@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c" + integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A== vscode-test@^0.4.1: version "0.4.1" diff --git a/extensions/shared.tsconfig.json b/extensions/shared.tsconfig.json index bb42dd479c..1a505e319b 100644 --- a/extensions/shared.tsconfig.json +++ b/extensions/shared.tsconfig.json @@ -7,6 +7,7 @@ "noImplicitAny": true, "noImplicitReturns": true, "noUnusedLocals": true, - "noUnusedParameters": true + "noUnusedParameters": true, + "forceConsistentCasingInFileNames": true } } \ No newline at end of file