azdataToolOld -> azdataTool (#16517)

extensions/big-data-cluster/package.json

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

extensions/resource-deployment/src/services/tools/azdataTool.ts

@@ -14,13 +14,12 @@ import { dependencyType, ToolBase } from './toolBase';
 import { SemVerProxy } from './SemVerProxy';
 
 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 macInstallationRoot = '/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 AzdataToolOld extends ToolBase {
+export class AzdataTool extends ToolBase {
 	constructor(platformService: IPlatformService) {
 		super(platformService);
 	}

extensions/resource-deployment/src/services/toolsService.ts

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

extensions/resource-deployment/src/test/services/toolsService.test.ts

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