ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

azdata debug logging on all commands and always accept eula (#12001)

Browse Source
This commit is contained in:
Charles Gagnon
2020-08-28 12:46:41 -07:00
committed by GitHub
parent 94958236cd
commit d8aa9b8d7f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/azdata/src/azdata.ts
View File

@@ -7,7 +7,7 @@ import * as azdataExt from 'azdata-ext';
import * as os from 'os'; import * as os from 'os';
import { SemVer } from 'semver'; import { SemVer } from 'semver';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { executeCommand, executeSudoCommand, ExitCodeError } from './common/childProcess'; import { executeCommand, executeSudoCommand, ExitCodeError, ProcessOutput } from './common/childProcess';
import { HttpClient } from './common/httpClient'; import { HttpClient } from './common/httpClient';
import Logger from './common/logger'; import Logger from './common/logger';
import { getErrorMessage, searchForCmd } from './common/utils'; import { getErrorMessage, searchForCmd } from './common/utils';
@@ -108,23 +108,19 @@ export class AzdataTool implements IAzdataTool {
* It also updates the cachedVersion property based on the return value from the tool. * It also updates the cachedVersion property based on the return value from the tool.
*/ */
public async version(): Promise<azdataExt.AzdataOutput<string>> { public async version(): Promise<azdataExt.AzdataOutput<string>> {
const output = await executeCommand(`"${this.path}"`, ['--version']); const output = await executeAzdataCommand(`"${this.path}"`, ['--version']);
this.cachedVersion = new SemVer(parseVersion(output.stdout)); this.cachedVersion = new SemVer(parseVersion(output.stdout));
return { return {
logs: [], logs: [],
stdout: output.stdout.split(os.EOL), stdout: output.stdout.split(os.EOL),
stderr: output.stderr.split(os.EOL), stderr: output.stderr.split(os.EOL),
result: '' result: output.stdout
}; };
} }
public async executeCommand<R>(args: string[], additionalEnvVars?: { [key: string]: string }): Promise<azdataExt.AzdataOutput<R>> { public async executeCommand<R>(args: string[], additionalEnvVars?: { [key: string]: string }): Promise<azdataExt.AzdataOutput<R>> {
const debug = vscode.workspace.getConfiguration(azdataConfigSection).get(debugConfigKey);
if (debug) {
args.push('--debug');
}
try { try {
const output = JSON.parse((await executeCommand(`"${this.path}"`, args.concat(['--output', 'json']), additionalEnvVars)).stdout); const output = JSON.parse((await executeAzdataCommand(`"${this.path}"`, args.concat(['--output', 'json']), additionalEnvVars)).stdout);
return { return {
logs: <string[]>output.log, logs: <string[]>output.log,
stdout: <string[]>output.stdout, stdout: <string[]>output.stdout,
@@ -291,7 +287,7 @@ async function installAzdataLinux(): Promise<void> {
async function findSpecificAzdata(): Promise<IAzdataTool> { async function findSpecificAzdata(): Promise<IAzdataTool> {
const promise = ((process.platform === 'win32') ? searchForCmd('azdata.cmd') : searchForCmd('azdata')); const promise = ((process.platform === 'win32') ? searchForCmd('azdata.cmd') : searchForCmd('azdata'));
const path = `"${await promise}"`; // throws if azdata is not found const path = `"${await promise}"`; // throws if azdata is not found
const versionOutput = await executeCommand(`${path}`, ['--version']); const versionOutput = await executeAzdataCommand(path, ['--version']);
return new AzdataTool(path, parseVersion(versionOutput.stdout)); return new AzdataTool(path, parseVersion(versionOutput.stdout));
} }
@@ -359,6 +355,15 @@ async function discoverLatestStableAzdataVersionDarwin(): Promise<SemVer> {
return new SemVer(azdataPackageVersionInfo.versions.stable); return new SemVer(azdataPackageVersionInfo.versions.stable);
} }
async function executeAzdataCommand(command: string, args: string[], additionalEnvVars: { [key: string]: string } = {}): Promise<ProcessOutput> {
additionalEnvVars = Object.assign(additionalEnvVars, { 'ACCEPT_EULA': 'yes' });
const debug = vscode.workspace.getConfiguration(azdataConfigSection).get(debugConfigKey);
if (debug) {
args.push('--debug');
}
return executeCommand(command, args, additionalEnvVars);
}
/** /**
* Gets the latest azdata version for linux clients * Gets the latest azdata version for linux clients
* This method requires sudo permission so not suitable to be run during startup. * This method requires sudo permission so not suitable to be run during startup.