ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-01 09:35:41 -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

6
extensions/big-data-cluster/src/bigDataCluster/controller/clusterControllerApi.ts
View File

@@ -32,7 +32,7 @@ export class KerberosAuth extends SslAuth implements Authentication {
super();
}
applyToRequest(requestOptions: request.Options): void {
override applyToRequest(requestOptions: request.Options): void {
super.applyToRequest(requestOptions);
if (requestOptions && requestOptions.headers) {
requestOptions.headers['Authorization'] = `Negotiate ${this.kerberosToken}`;
@@ -45,7 +45,7 @@ export class BasicAuth extends SslAuth implements Authentication {
super();
}
applyToRequest(requestOptions: request.Options): void {
override applyToRequest(requestOptions: request.Options): void {
super.applyToRequest(requestOptions);
requestOptions.auth = {
username: this.username, password: this.password
@@ -56,7 +56,7 @@ export class BasicAuth extends SslAuth implements Authentication {
export class OAuthWithSsl extends SslAuth implements Authentication {
public accessToken: string = '';
applyToRequest(requestOptions: request.Options): void {
override applyToRequest(requestOptions: request.Options): void {
super.applyToRequest(requestOptions);
if (requestOptions && requestOptions.headers) {
requestOptions.headers['Authorization'] = `Bearer ${this.accessToken}`;

14
extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeNode.ts
View File

@@ -28,7 +28,7 @@ abstract class ControllerTreeNode extends TreeNode {
return this.children as ControllerTreeNode[];
}
public refresh(): void {
public override refresh(): void {
super.refresh();
this.treeChangeHandler.notifyNodeChanged(this);
}
@@ -98,7 +98,7 @@ export class ControllerRootNode extends ControllerTreeNode {
super('root', undefined, treeChangeHandler, undefined, BdcItemType.controllerRoot);
}
public async getChildren(): Promise<ControllerNode[]> {
public override async getChildren(): Promise<ControllerNode[]> {
return this.children as ControllerNode[];
}
@@ -168,7 +168,7 @@ export class ControllerNode extends ControllerTreeNode {
this.description = description;
}
public async getChildren(): Promise<ControllerTreeNode[] | undefined> {
public override async getChildren(): Promise<ControllerTreeNode[] | undefined> {
if (this.children && this.children.length > 0) {
this.clearChildren();
}
@@ -209,7 +209,7 @@ export class ControllerNode extends ControllerTreeNode {
this._password = pw;
}
public set label(label: string) {
public override set label(label: string) {
super.label = label || this.generateLabel();
}
@@ -229,15 +229,15 @@ export class ControllerNode extends ControllerTreeNode {
return label;
}
public get label(): string {
public override get label(): string {
return super.label;
}
public set description(description: string) {
public override set description(description: string) {
super.description = description || super.label;
}
public get description(): string {
public override get description(): string {
return super.description;
}
}