Move protocol client out (#643)

* close

* connection is working

* formatting

* adds all

* formatting

* formatting and changing how features are initialized

* formatting

* changed named of typings file

* update

* updated to use dataprotocol npm

* formatting

* removed unneeded logging

* readd npm shrinkwrap

* still not working

* removed unnecessary codfe

* addressed comments

* readded azure resource provider

* fix capabilities cacheing

* added backwards capat for older protocol

* update shrinkwrap

* update shrinkwrap

* updated shrinkwrap

* fixed tests

* removed dead code

* remove dead code

* fix compile

* remove backcompat stuff

* change location of npm

* vbump sqltools

* merge master

* fix imports

* fix build breaks

* update for sqlops

* update yarn dependencies
This commit is contained in:
Anthony Dresser
2018-02-20 13:38:16 -08:00
committed by GitHub
parent 8a9ee40524
commit 8570910a43
159 changed files with 4421 additions and 7180 deletions

View File

@@ -5,7 +5,7 @@
'use strict';
import * as data from 'data';
import * as sqlops from 'sqlops';
import Event from 'vs/base/common/event';
import { IAccountManagementService } from 'sql/services/accountManagement/interfaces';
import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes';
@@ -15,10 +15,10 @@ export class AccountManagementTestService implements IAccountManagementService {
_serviceBrand: any;
public get addAccountProviderEvent(): Event<AccountProviderAddedEventParams> { return () => { return undefined; }; }
public get removeAccountProviderEvent(): Event<data.AccountProviderMetadata> { return () => { return undefined; }; }
public get removeAccountProviderEvent(): Event<sqlops.AccountProviderMetadata> { return () => { return undefined; }; }
public get updateAccountListEvent(): Event<UpdateAccountListEventParams> { return () => { return undefined; }; }
accountUpdated(account: data.Account): Thenable<void> {
accountUpdated(account: sqlops.Account): Thenable<void> {
return undefined;
}
@@ -42,23 +42,23 @@ export class AccountManagementTestService implements IAccountManagementService {
return undefined;
}
getAccountProviderMetadata(): Thenable<data.AccountProviderMetadata[]> {
getAccountProviderMetadata(): Thenable<sqlops.AccountProviderMetadata[]> {
return undefined;
}
getAccountsForProvider(providerId: string): Thenable<data.Account[]> {
getAccountsForProvider(providerId: string): Thenable<sqlops.Account[]> {
return undefined;
}
getSecurityToken(account: data.Account): Thenable<{}> {
getSecurityToken(account: sqlops.Account): Thenable<{}> {
return undefined;
}
removeAccount(accountKey: data.AccountKey): Thenable<boolean> {
removeAccount(accountKey: sqlops.AccountKey): Thenable<boolean> {
return undefined;
}
refreshAccount(account: data.Account): Thenable<data.Account> {
refreshAccount(account: sqlops.Account): Thenable<sqlops.Account> {
return undefined;
}
@@ -66,7 +66,7 @@ export class AccountManagementTestService implements IAccountManagementService {
return undefined;
}
registerProvider(providerMetadata: data.AccountProviderMetadata, provider: data.AccountProvider): void {
registerProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): void {
return undefined;
}
@@ -74,33 +74,33 @@ export class AccountManagementTestService implements IAccountManagementService {
return undefined;
}
unregisterProvider(providerMetadata: data.AccountProviderMetadata): void {
unregisterProvider(providerMetadata: sqlops.AccountProviderMetadata): void {
return undefined;
}
}
export class AccountProviderStub implements data.AccountProvider {
export class AccountProviderStub implements sqlops.AccountProvider {
autoOAuthCancelled(): Thenable<void> {
return Promise.resolve();
}
clear(account: data.AccountKey): Thenable<void> {
clear(account: sqlops.AccountKey): Thenable<void> {
return Promise.resolve();
}
getSecurityToken(account: data.Account): Thenable<{}> {
getSecurityToken(account: sqlops.Account): Thenable<{}> {
return Promise.resolve({});
}
initialize(storedAccounts: data.Account[]): Thenable<data.Account[]> {
initialize(storedAccounts: sqlops.Account[]): Thenable<sqlops.Account[]> {
return Promise.resolve(storedAccounts);
}
prompt(): Thenable<data.Account> {
prompt(): Thenable<sqlops.Account> {
return Promise.resolve(undefined);
}
refresh(account: data.Account): Thenable<data.Account> {
refresh(account: sqlops.Account): Thenable<sqlops.Account> {
return Promise.resolve(account);
}
}

View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import data = require('data');
import * as sqlops from 'sqlops';
import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo';
import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
import Event from 'vs/base/common/event';
@@ -16,14 +16,14 @@ export class CapabilitiesTestService implements ICapabilitiesService {
public _serviceBrand: any;
private _providers: data.CapabilitiesProvider[] = [];
private _providers: sqlops.CapabilitiesProvider[] = [];
private _capabilities: data.DataProtocolServerCapabilities[] = [];
private _capabilities: sqlops.DataProtocolServerCapabilities[] = [];
constructor() {
let connectionProvider: data.ConnectionProviderOptions = {
let connectionProvider: sqlops.ConnectionProviderOptions = {
options: [
{
name: 'serverName',
@@ -102,7 +102,7 @@ export class CapabilitiesTestService implements ICapabilitiesService {
/**
* Retrieve a list of registered server capabilities
*/
public getCapabilities(): data.DataProtocolServerCapabilities[] {
public getCapabilities(): sqlops.DataProtocolServerCapabilities[] {
return this._capabilities;
}
@@ -110,11 +110,11 @@ export class CapabilitiesTestService implements ICapabilitiesService {
* Register the capabilities provider and query the provider for its capabilities
* @param provider
*/
public registerProvider(provider: data.CapabilitiesProvider): void {
public registerProvider(provider: sqlops.CapabilitiesProvider): void {
}
// Event Emitters
public get onProviderRegisteredEvent(): Event<data.DataProtocolServerCapabilities> {
public get onProviderRegisteredEvent(): Event<sqlops.DataProtocolServerCapabilities> {
return undefined;
}

View File

@@ -9,7 +9,7 @@ import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/parts/conne
import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo';
import data = require('data');
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
// Test stubs for commonly used objects
@@ -31,7 +31,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer
return conEvent.event;
}
registerProvider(providerId: string, provider: data.ConnectionProvider): void {
registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void {
}
@@ -47,7 +47,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer
return undefined;
}
onConnectionComplete(handle: number, connectionInfoSummary: data.ConnectionInfoSummary): void {
onConnectionComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void {
}
@@ -55,11 +55,11 @@ export class TestConnectionManagementService implements IConnectionManagementSer
}
public onConnectionChangedNotification(handle: number, changedConnInfo: data.ChangedConnectionInfo): void {
public onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void {
}
getCurrentConnectionSummary(): data.ConnectionSummary {
getCurrentConnectionSummary(): sqlops.ConnectionSummary {
return undefined;
}
@@ -111,7 +111,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer
});
}
getAdvancedProperties(): data.ConnectionOption[] {
getAdvancedProperties(): sqlops.ConnectionOption[] {
return [];
}
@@ -177,7 +177,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer
return new Promise<IConnectionProfile>(() => connectionProfile);
}
public listDatabases(connectionUri: string): Thenable<data.ListDatabasesResult> {
public listDatabases(connectionUri: string): Thenable<sqlops.ListDatabasesResult> {
return Promise.resolve(undefined);
}
@@ -211,7 +211,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer
return true;
}
getCapabilities(providerName: string): data.DataProtocolServerCapabilities {
getCapabilities(providerName: string): sqlops.DataProtocolServerCapabilities {
return undefined;
}

View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as data from 'data';
import * as sqlops from 'sqlops';
export class ConnectionProviderStub implements data.ConnectionProvider {
export class ConnectionProviderStub implements sqlops.ConnectionProvider {
public readonly providerId = 'MSSQL';
connect(connectionUri: string, connectionInfo: data.ConnectionInfo): Thenable<boolean> {
connect(connectionUri: string, connectionInfo: sqlops.ConnectionInfo): Thenable<boolean> {
return undefined;
}
@@ -20,7 +20,7 @@ export class ConnectionProviderStub implements data.ConnectionProvider {
return undefined;
}
listDatabases(connectionUri: string): Thenable<data.ListDatabasesResult> {
listDatabases(connectionUri: string): Thenable<sqlops.ListDatabasesResult> {
return undefined;
}
@@ -32,7 +32,7 @@ export class ConnectionProviderStub implements data.ConnectionProvider {
return undefined;
}
registerOnConnectionComplete(handler: (connSummary: data.ConnectionInfoSummary) => any) {
registerOnConnectionComplete(handler: (connSummary: sqlops.ConnectionInfoSummary) => any) {
return undefined;
}
@@ -40,7 +40,7 @@ export class ConnectionProviderStub implements data.ConnectionProvider {
return undefined;
}
registerOnConnectionChanged(handler: (changedConnInfo: data.ChangedConnectionInfo) => any) {
registerOnConnectionChanged(handler: (changedConnInfo: sqlops.ChangedConnectionInfo) => any) {
return undefined;
}
}

View File

@@ -5,15 +5,15 @@
'use strict';
import * as data from 'data';
import * as sqlops from 'sqlops';
import { TPromise } from 'vs/base/common/winjs.base';
import {CredentialManagementEvents, ICredentialsService} from "sql/services/credentials/credentialsService";
import {IDisposable} from "vs/base/common/lifecycle";
import { CredentialManagementEvents, ICredentialsService } from 'sql/services/credentials/credentialsService';
import { IDisposable } from 'vs/base/common/lifecycle';
export class CredentialsTestProvider implements data.CredentialProvider {
export class CredentialsTestProvider implements sqlops.CredentialProvider {
handle: number;
public storedCredentials: {[K: string]: data.Credential} = {};
public storedCredentials: { [K: string]: sqlops.Credential } = {};
saveCredential(credentialId: string, password: string): Thenable<boolean> {
this.storedCredentials[credentialId] = {
@@ -23,7 +23,7 @@ export class CredentialsTestProvider implements data.CredentialProvider {
return TPromise.as(true);
}
readCredential(credentialId: string): Thenable<data.Credential> {
readCredential(credentialId: string): Thenable<sqlops.Credential> {
return TPromise.as(this.storedCredentials[credentialId]);
}
@@ -41,7 +41,7 @@ export class CredentialsTestService implements ICredentialsService {
return undefined;
}
readCredential(credentialId: string): Thenable<data.Credential> {
readCredential(credentialId: string): Thenable<sqlops.Credential> {
return undefined;
}

View File

@@ -2,35 +2,35 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import data = require('data');
import * as sqlops from 'sqlops';
// Test stubs for commonly used objects
export class ObjectExplorerProviderTestService implements data.ObjectExplorerProvider {
export class ObjectExplorerProviderTestService implements sqlops.ObjectExplorerProvider {
public readonly providerId = 'MSSQL';
public createNewSession(connInfo: data.ConnectionInfo): Thenable<data.ObjectExplorerCloseSessionResponse> {
public createNewSession(connInfo: sqlops.ConnectionInfo): Thenable<sqlops.ObjectExplorerCloseSessionResponse> {
return Promise.resolve(undefined);
}
public expandNode(nodeInfo: data.ExpandNodeInfo): Thenable<boolean> {
public expandNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable<boolean> {
return Promise.resolve(undefined);
}
public refreshNode(nodeInfo: data.ExpandNodeInfo): Thenable<boolean> {
public refreshNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable<boolean> {
return Promise.resolve(undefined);
}
public closeSession(closeSessionInfo: data.ObjectExplorerCloseSessionInfo): Thenable<data.ObjectExplorerCloseSessionResponse> {
public closeSession(closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): Thenable<sqlops.ObjectExplorerCloseSessionResponse> {
return Promise.resolve(undefined);
}
public registerOnSessionCreated(handler: (response: data.ObjectExplorerSession) => any): void {
public registerOnSessionCreated(handler: (response: sqlops.ObjectExplorerSession) => any): void {
}
public registerOnExpandCompleted(handler: (response: data.ObjectExplorerExpandInfo) => any): void {
public registerOnExpandCompleted(handler: (response: sqlops.ObjectExplorerExpandInfo) => any): void {
}
}

View File

@@ -3,14 +3,14 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as data from 'data';
import * as sqlops from 'sqlops';
import { IHandleFirewallRuleResult, IResourceProviderService } from 'sql/parts/accountManagement/common/interfaces';
import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
export class ResourceProviderStub implements IResourceProviderService {
_serviceBrand: any;
registerProvider(providerId: string, provider: data.ResourceProvider) {
registerProvider(providerId: string, provider: sqlops.ResourceProvider) {
}
@@ -18,7 +18,7 @@ export class ResourceProviderStub implements IResourceProviderService {
}
createFirewallRule(selectedAccount: data.Account, firewallruleInfo: data.FirewallRuleInfo, resourceProviderId: string): Promise<data.CreateFirewallRuleResponse> {
createFirewallRule(selectedAccount: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo, resourceProviderId: string): Promise<sqlops.CreateFirewallRuleResponse> {
return undefined;
}