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

Eula handling for Azdata (#12035)

Browse Source 
* Eula handling for Azdata

* PR feedback

* pr feedback

* pr feedback

* remove extra await

Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
Arvind Ranasaria
2020-08-31 18:57:22 -07:00
committed by GitHub
parent 85e6d785ff
commit 23bd05ea68
4 changed files with 63 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
extensions/azdata/src/extension.ts
View File

@@ -3,15 +3,28 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
import * as azdataExt from 'azdata-ext';
import { findAzdata, IAzdataTool, manuallyInstallOrUpgradeAzdata } from './azdata';
import * as vscode from 'vscode';
import { findAzdata, IAzdataTool, manuallyInstallOrUpgradeAzdata, promptForEula } from './azdata';
import Logger from './common/logger';
import * as constants from './constants';
import * as loc from './localizedConstants';
let localAzdata: IAzdataTool | undefined = undefined;
let eulaAccepted: boolean = false;
export async function activate(context: vscode.ExtensionContext): Promise<azdataExt.IExtension> {
localAzdata = await checkForAzdata();
eulaAccepted = !!context.globalState.get(constants.acceptEula);
if (!eulaAccepted) {
// Don't block on this since we want extension to finish activating without requiring user actions.
// If EULA has not been accepted then we will check again while executing azdata commands.
promptForEula(context.globalState)
.then(userResponse => {
eulaAccepted = userResponse;
})
.catch(err => console.log(err));
}
// Don't block on this since we want the extension to finish activating without user actions
manuallyInstallOrUpgradeAzdata(context, localAzdata)
.catch(err => console.log(err));
@@ -20,22 +33,22 @@ export async function activate(context: vscode.ExtensionContext): Promise<azdata
arc: {
dc: {
create: async (namespace: string, name: string, connectivityMode: string, resourceGroup: string, location: string, subscription: string, profileName?: string, storageClass?: string) => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.dc.create(namespace, name, connectivityMode, resourceGroup, location, subscription, profileName, storageClass);
},
endpoint: {
list: async () => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.dc.endpoint.list();
}
},
config: {
list: async () => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.dc.config.list();
},
show: async () => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.dc.config.show();
}
}
@@ -43,11 +56,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<azdata
postgres: {
server: {
list: async () => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.postgres.server.list();
},
show: async (name: string) => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.postgres.server.show(name);
}
}
@@ -55,36 +68,43 @@ export async function activate(context: vscode.ExtensionContext): Promise<azdata
sql: {
mi: {
delete: async (name: string) => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.sql.mi.delete(name);
},
list: async () => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.sql.mi.list();
},
show: async (name: string) => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.arc.sql.mi.show(name);
}
}
}
},
login: async (endpoint: string, username: string, password: string) => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.login(endpoint, username, password);
},
version: async () => {
throwIfNoAzdata();
await throwIfNoAzdataOrEulaNotAccepted(context);
return localAzdata!.version();
}
}
};
}
function throwIfNoAzdata(): void {
async function throwIfNoAzdataOrEulaNotAccepted(context: vscode.ExtensionContext): Promise<void> {
if (!localAzdata) {
throw new Error(loc.noAzdata);
}
if (!eulaAccepted) {
eulaAccepted = await promptForEula(context.globalState);
}
if (!eulaAccepted) {
Logger.log(loc.eulaNotAccepted);
throw new Error(loc.eulaNotAccepted);
}
}
async function checkForAzdata(): Promise<IAzdataTool | undefined> {