ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

azdataToolOld -> azdataTool (#16517)

Browse Source
This commit is contained in:
Charles Gagnon
2021-08-02 10:28:46 -07:00
committed by GitHub
parent 91676afd0d
commit 3af2b4a13d
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/big-data-cluster/package.json
View File

@@ -247,7 +247,7 @@
"name": "azure-cli" "name": "azure-cli"
}, },
{ {
"name": "azdata-old", "name": "azdata",
"version": "20.3.4" "version": "20.3.4"
} }
], ],
@@ -265,7 +265,7 @@
"version": "1.13.0" "version": "1.13.0"
}, },
{ {
"name": "azdata-old", "name": "azdata",
"version": "20.3.4" "version": "20.3.4"
} }
], ],
@@ -283,7 +283,7 @@
"version": "1.13.0" "version": "1.13.0"
}, },
{ {
"name": "azdata-old", "name": "azdata",
"version": "20.3.4" "version": "20.3.4"
} }
], ],
@@ -301,7 +301,7 @@
"version": "1.13.0" "version": "1.13.0"
}, },
{ {
"name": "azdata-old", "name": "azdata",
"version": "20.3.4" "version": "20.3.4"
} }
], ],
@@ -319,7 +319,7 @@
"version": "1.13.0" "version": "1.13.0"
}, },
{ {
"name": "azdata-old", "name": "azdata",
"version": "20.3.4" "version": "20.3.4"
} }
], ],

5
extensions/resource-deployment/src/services/tools/azdataToolOld.ts → extensions/resource-deployment/src/services/tools/azdataTool.ts
View File

@@ -14,13 +14,12 @@ import { dependencyType, ToolBase } from './toolBase';
import { SemVerProxy } from './SemVerProxy'; import { SemVerProxy } from './SemVerProxy';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
export const AzdataToolName = 'azdata-old'; export const AzdataToolName = 'azdata';
const win32InstallationRoot = `${process.env['ProgramFiles(x86)']}\\Microsoft SDKs\\Azdata\\CLI\\wbin`; const win32InstallationRoot = `${process.env['ProgramFiles(x86)']}\\Microsoft SDKs\\Azdata\\CLI\\wbin`;
const macInstallationRoot = '/usr/local/bin'; const macInstallationRoot = '/usr/local/bin';
const debianInstallationRoot = '/usr/local/bin'; const debianInstallationRoot = '/usr/local/bin';
// TODO: This is a temporary shim until we can convert the BDC deployment fully over to using the azdata extension export class AzdataTool extends ToolBase {
export class AzdataToolOld extends ToolBase {
constructor(platformService: IPlatformService) { constructor(platformService: IPlatformService) {
super(platformService); super(platformService);
} }

4
extensions/resource-deployment/src/services/toolsService.ts
View File

@@ -7,7 +7,7 @@ import { DockerTool } from './tools/dockerTool';
import { AzCliTool } from './tools/azCliTool'; import { AzCliTool } from './tools/azCliTool';
import { KubeCtlTool } from './tools/kubeCtlTool'; import { KubeCtlTool } from './tools/kubeCtlTool';
import { IPlatformService } from './platformService'; import { IPlatformService } from './platformService';
import { AzdataToolOld } from './tools/azdataToolOld'; import { AzdataTool } from './tools/azdataTool';
export interface IToolsService { export interface IToolsService {
getToolByName(toolName: string): ITool | undefined; getToolByName(toolName: string): ITool | undefined;
@@ -23,7 +23,7 @@ export class ToolsService implements IToolsService {
[ [
new DockerTool(this._platformService), new DockerTool(this._platformService),
new AzCliTool(this._platformService), new AzCliTool(this._platformService),
new AzdataToolOld(this._platformService), new AzdataTool(this._platformService),
new KubeCtlTool(this._platformService) new KubeCtlTool(this._platformService)
].map<[string, ITool]>((tool: ITool) => [tool.name, tool]) ].map<[string, ITool]>((tool: ITool) => [tool.name, tool])
); );

2
extensions/resource-deployment/src/test/services/toolsService.test.ts
View File

@@ -9,7 +9,7 @@ import * as TypeMoq from 'typemoq';
import { ToolsService } from '../../services/toolsService'; import { ToolsService } from '../../services/toolsService';
import { ITool, ToolType } from '../../interfaces'; import { ITool, ToolType } from '../../interfaces';
import { IPlatformService } from '../../services/platformService'; import { IPlatformService } from '../../services/platformService';
import { AzdataToolName } from '../../services/tools/azdataToolOld'; import { AzdataToolName } from '../../services/tools/azdataTool';
const tools: { name: string; type: ToolType }[] = [ const tools: { name: string; type: ToolType }[] = [