diff --git a/extensions/azdata/images/extension.png b/extensions/azdata/images/extension.png index 32aa11618b..c86d6d1e00 100644 Binary files a/extensions/azdata/images/extension.png and b/extensions/azdata/images/extension.png differ diff --git a/extensions/azdata/package.json b/extensions/azdata/package.json index bbbaba11b6..91160f23e6 100644 --- a/extensions/azdata/package.json +++ b/extensions/azdata/package.json @@ -19,6 +19,19 @@ "url": "https://github.com/Microsoft/azuredatastudio.git" }, "main": "./out/extension", + "contributes": { + "configuration": { + "type": "object", + "title": "%azdata.config.title%", + "properties": { + "azdata.logDebugInfo": { + "type": "boolean", + "default": false, + "description": "%azdata.config.debug%" + } + } + } + }, "dependencies": { "request": "^2.88.2", "semver": "^7.3.2", diff --git a/extensions/azdata/package.nls.json b/extensions/azdata/package.nls.json index 3438aff512..f1c8086963 100644 --- a/extensions/azdata/package.nls.json +++ b/extensions/azdata/package.nls.json @@ -1,4 +1,6 @@ { "azdata.displayName": "azdata", - "azdata.description": "Support for Azure Data CLI. See https://docs.microsoft.com/cli/azure/?view=azure-cli-latest for more information." + "azdata.description": "Support for Azure Data CLI. See https://docs.microsoft.com/cli/azure/?view=azure-cli-latest for more information.", + "azdata.config.title": "azdata Configuration", + "azdata.config.debug": "Log debug info to the output channel for all executed azdata commands" } diff --git a/extensions/azdata/src/azdata.ts b/extensions/azdata/src/azdata.ts index dc2730564a..bbdab65f9d 100644 --- a/extensions/azdata/src/azdata.ts +++ b/extensions/azdata/src/azdata.ts @@ -12,6 +12,7 @@ import { HttpClient } from './common/httpClient'; import Logger from './common/logger'; import { getErrorMessage, searchForCmd } from './common/utils'; import * as loc from './localizedConstants'; +import { azdataConfigSection, debugConfigKey } from './constants'; export const azdataHostname = 'https://aka.ms'; export const azdataUri = 'azdata-msi'; @@ -118,6 +119,10 @@ export class AzdataTool implements IAzdataTool { } public async executeCommand(args: string[], additionalEnvVars?: { [key: string]: string }): Promise> { + const debug = vscode.workspace.getConfiguration(azdataConfigSection).get(debugConfigKey); + if (debug) { + args.push('--debug'); + } try { const output = JSON.parse((await executeCommand(`"${this.path}"`, args.concat(['--output', 'json']), additionalEnvVars)).stdout); return { diff --git a/extensions/azdata/src/constants.ts b/extensions/azdata/src/constants.ts new file mode 100644 index 0000000000..8e84ed117d --- /dev/null +++ b/extensions/azdata/src/constants.ts @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export const azdataConfigSection = 'azdata'; + +export const debugConfigKey = 'logDebugInfo';