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

Update some key az CLI references (#16032)

Browse Source
This commit is contained in:
Charles Gagnon
2021-07-07 14:43:30 -07:00
committed by GitHub
parent 9a8c9041df
commit 3f0ea580f5
4 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/azcli/src/constants.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
// config setting keys
export const azdataConfigSection: string = 'azdata';
export const azdataConfigSection: string = 'azcli';
export const azdataAcceptEulaKey: string = 'acceptEula';
export const azdataInstallKey: string = 'install';
export const azdataUpdateKey: string = 'update';
@@ -13,8 +13,8 @@ export const debugConfigKey = 'logDebugInfo';
// context keys && memento keys
export const eulaAccepted = 'azdata.eulaAccepted';
export const azdataFound = 'azdata.found';
export const eulaAccepted = 'azcli.eulaAccepted';
export const azdataFound = 'azcli.found';
// other constants
export const azdataHostname = 'https://aka.ms';

13
extensions/azcli/src/extension.ts
View File

@@ -4,28 +4,26 @@
*--------------------------------------------------------------------------------------------*/
import * as azdataExt from 'azdata-ext';
import * as rd from 'resource-deployment';
import * as vscode from 'vscode';
import { getExtensionApi } from './api';
import { checkAndInstallAzdata, checkAndUpdateAzdata, findAzdata, isEulaAccepted, promptForEula } from './azdata';
import Logger from './common/logger';
import * as constants from './constants';
import * as loc from './localizedConstants';
import { ArcControllerConfigProfilesOptionsSource } from './providers/arcControllerConfigProfilesOptionsSource';
import { AzdataToolService } from './services/azdataToolService';
export async function activate(context: vscode.ExtensionContext): Promise<azdataExt.IExtension> {
const azdataToolService = new AzdataToolService();
let eulaAccepted: boolean = false;
vscode.commands.registerCommand('azdata.acceptEula', async () => {
vscode.commands.registerCommand('azcli.acceptEula', async () => {
await promptForEula(context.globalState, true /* userRequested */);
});
vscode.commands.registerCommand('azdata.install', async () => {
vscode.commands.registerCommand('azcli.install', async () => {
azdataToolService.localAzdata = await checkAndInstallAzdata(true /* userRequested */);
});
vscode.commands.registerCommand('azdata.update', async () => {
vscode.commands.registerCommand('azcli.update', async () => {
if (await checkAndUpdateAzdata(azdataToolService.localAzdata, true /* userRequested */)) { // if an update was performed
azdataToolService.localAzdata = await findAzdata(); // find and save the currently installed azdata
}
@@ -64,8 +62,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<azdata
const azdataApi = getExtensionApi(context.globalState, azdataToolService, localAzdataDiscovered);
// register option source(s)
const rdApi = <rd.IExtension>vscode.extensions.getExtension(rd.extension.name)?.exports;
context.subscriptions.push(rdApi.registerOptionsSourceProvider(new ArcControllerConfigProfilesOptionsSource(azdataApi)));
// TODO: Uncomment this once azdata extension is removed
// const rdApi = <rd.IExtension>vscode.extensions.getExtension(rd.extension.name)?.exports;
// context.subscriptions.push(rdApi.registerOptionsSourceProvider(new ArcControllerConfigProfilesOptionsSource(azdataApi)));
return azdataApi;
}