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

Add Storage Class params to MIAA deploy (#11993)

Browse Source
This commit is contained in:
Charles Gagnon
2020-08-27 18:19:31 -07:00
committed by GitHub
parent 57ce9fae6f
commit 100072cabd
21 changed files with 148 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/resource-deployment/src/services/tools/toolBase.ts
View File

@@ -40,7 +40,7 @@ export const messageByDependencyType: Map<dependencyType, string> = new Map<depe
]);
export abstract class ToolBase implements ITool {
constructor(private _platformService: IPlatformService) {
constructor(protected platformService: IPlatformService) {
this.startVersionAndStatusUpdate();
}
@@ -77,7 +77,7 @@ export abstract class ToolBase implements ITool {
}
protected logToOutputChannel(data: string | Buffer, header?: string): void {
this._platformService.logToOutputChannel(data, header); // data and header are localized by caller
this.platformService.logToOutputChannel(data, header); // data and header are localized by caller
}
public get onDidUpdateData(): vscode.Event<ITool> {
@@ -101,11 +101,11 @@ export abstract class ToolBase implements ITool {
return this.status === ToolStatus.NotInstalled && this.autoInstallSupported;
}
public get storagePath(): string {
return this._platformService.storagePath();
return this.platformService.storagePath();
}
public get osDistribution(): OsDistribution {
return this._platformService.osDistribution();
return this.platformService.osDistribution();
}
protected get version(): SemVer | undefined {
@@ -136,7 +136,7 @@ export abstract class ToolBase implements ITool {
protected async getPip3InstallLocation(packageName: string): Promise<string> {
const command = `pip3 show ${packageName}`;
const pip3ShowOutput: string = await this._platformService.runCommand(command, { sudo: false, ignoreError: true });
const pip3ShowOutput: string = await this.platformService.runCommand(command, { sudo: false, ignoreError: true });
const installLocation = /^Location\: (.*)$/gim.exec(pip3ShowOutput);
let retValue = installLocation && installLocation[1];
if (retValue === undefined || retValue === null) {
@@ -150,11 +150,11 @@ export abstract class ToolBase implements ITool {
}
public get outputChannelName(): string {
return this._platformService.outputChannelName();
return this.platformService.outputChannelName();
}
public showOutputChannel(preserveFocus?: boolean | undefined): void {
this._platformService.showOutputChannel(preserveFocus);
this.platformService.showOutputChannel(preserveFocus);
}
@@ -197,7 +197,7 @@ export abstract class ToolBase implements ITool {
throw new Error(localize('toolBase.installCore.CannotInstallTool', "Cannot install tool:{0}::{1} as installation commands are unknown for your OS distribution, Please install {0} manually before proceeding", this.displayName, this.description));
}
for (let i: number = 0; i < installationCommands.length; i++) {
await this._platformService.runCommand(installationCommands[i].command,
await this.platformService.runCommand(installationCommands[i].command,
{
workingDirectory: installationCommands[i].workingDirectory || this.downloadPath,
additionalEnvironmentVariables: installationCommands[i].additionalEnvironmentVariables,
@@ -253,7 +253,7 @@ export abstract class ToolBase implements ITool {
private async updateVersionAndStatus(): Promise<void> {
this._statusDescription = '';
await this.addInstallationSearchPathsToSystemPath();
const commandOutput = await this._platformService.runCommand(
const commandOutput = await this.platformService.runCommand(
this.versionCommand.command,
{
workingDirectory: this.versionCommand.workingDirectory,
@@ -289,7 +289,7 @@ export abstract class ToolBase implements ITool {
}
protected async setInstallationPath() {
const commandOutput = await this._platformService.runCommand(
const commandOutput = await this.platformService.runCommand(
this.discoveryCommand.command,
{
workingDirectory: this.discoveryCommand.workingDirectory,