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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/resource-deployment/src/services/tools/SemVerProxy.ts
View File

@@ -35,7 +35,6 @@ function fourPart2SemVer(version: string): string {
<version core> ::= <major> "." <minor> "." <patch>
*/
export class SemVerProxy extends SemVer {
public readonly version: string;
constructor(version: string | SemVerProxy, loose?: boolean) {
let ver: string;

4
extensions/resource-deployment/src/services/tools/azCliTool.ts
View File

@@ -39,7 +39,7 @@ export class AzCliTool extends ToolBase {
return 'https://docs.microsoft.com/cli/azure/install-azure-cli';
}
protected async getSearchPaths(): Promise<string[]> {
protected override async getSearchPaths(): Promise<string[]> {
switch (this.osDistribution) {
case OsDistribution.win32:
return [win32InstallationRoot];
@@ -69,7 +69,7 @@ export class AzCliTool extends ToolBase {
};
}
protected dependenciesByOsType: Map<OsDistribution, dependencyType[]> = new Map<OsDistribution, dependencyType[]>([
protected override dependenciesByOsType: Map<OsDistribution, dependencyType[]> = new Map<OsDistribution, dependencyType[]>([
[OsDistribution.debian, []],
[OsDistribution.win32, []],
[OsDistribution.darwin, [dependencyType.Brew]],

10
extensions/resource-deployment/src/services/tools/azdataTool.ts
View File

@@ -45,11 +45,11 @@ export class AzdataTool extends ToolBase {
return 'https://docs.microsoft.com/sql/big-data-cluster/deploy-install-azdata';
}
public isEulaAccepted(): boolean {
public override async isEulaAccepted(): Promise<boolean> {
if (!this.azdataApi) {
return false;
}
if (this.azdataApi.isEulaAccepted()) {
if (await this.azdataApi.isEulaAccepted()) {
return true;
} else {
this.setStatusDescription(loc.azdataEulaNotAccepted);
@@ -57,7 +57,7 @@ export class AzdataTool extends ToolBase {
}
}
public async promptForEula(): Promise<boolean> {
public override async promptForEula(): Promise<boolean> {
const eulaAccepted = await this.azdataApi.promptForEula();
if (!eulaAccepted) {
this.setStatusDescription(loc.azdataEulaDeclined);
@@ -82,7 +82,7 @@ export class AzdataTool extends ToolBase {
/**
* updates the version and status for the tool.
*/
protected async updateVersionAndStatus(): Promise<void> {
protected override async updateVersionAndStatus(): Promise<void> {
this.azdataApi = await vscode.extensions.getExtension(azdataExt.extension.name)?.activate();
if (!this.azdataApi) {
this.setInstallationPathOrAdditionalInformation(localize('deploy.azdataExtMissing', "The Azure Data CLI extension must be installed to deploy this resource. Please install it through the extension gallery and try again."));
@@ -113,7 +113,7 @@ export class AzdataTool extends ToolBase {
}
protected async getSearchPaths(): Promise<string[]> {
protected override async getSearchPaths(): Promise<string[]> {
switch (this.osDistribution) {
case OsDistribution.win32:
return [win32InstallationRoot];

4
extensions/resource-deployment/src/services/tools/azdataToolOld.ts
View File

@@ -64,7 +64,7 @@ export class AzdataToolOld extends ToolBase {
}
return version;
}
protected async getSearchPaths(): Promise<string[]> {
protected override async getSearchPaths(): Promise<string[]> {
switch (this.osDistribution) {
case OsDistribution.win32:
return [win32InstallationRoot];
@@ -103,7 +103,7 @@ export class AzdataToolOld extends ToolBase {
[OsDistribution.others, '']
]);
protected dependenciesByOsType: Map<OsDistribution, dependencyType[]> = new Map<OsDistribution, dependencyType[]>([
protected override dependenciesByOsType: Map<OsDistribution, dependencyType[]> = new Map<OsDistribution, dependencyType[]>([
[OsDistribution.debian, []],
[OsDistribution.win32, []],
[OsDistribution.darwin, [dependencyType.Brew]],

4
extensions/resource-deployment/src/services/tools/kubeCtlTool.ts
View File

@@ -98,7 +98,7 @@ export class KubeCtlTool extends ToolBase {
command: this.discoveryCommandString('kubectl')
};
}
protected async getSearchPaths(): Promise<string[]> {
protected override async getSearchPaths(): Promise<string[]> {
switch (this.osDistribution) {
case OsDistribution.win32:
return [this.storagePath];
@@ -113,7 +113,7 @@ export class KubeCtlTool extends ToolBase {
[OsDistribution.others, defaultInstallationCommands]
]);
protected dependenciesByOsType: Map<OsDistribution, dependencyType[]> = new Map<OsDistribution, dependencyType[]>([
protected override dependenciesByOsType: Map<OsDistribution, dependencyType[]> = new Map<OsDistribution, dependencyType[]>([
[OsDistribution.debian, []],
[OsDistribution.win32, []],
[OsDistribution.darwin, [dependencyType.Brew]],

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

@@ -58,7 +58,7 @@ export abstract class ToolBase implements ITool {
protected abstract readonly versionCommand: Command;
public isEulaAccepted(): boolean { return true; }
public isEulaAccepted(): Promise<boolean> { return Promise.resolve(true); }
public promptForEula(): Promise<boolean> { return Promise.resolve(true); }