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

Fix driverlog uri in output (#5212)

Browse Source 
* Fixed #4813

* Changed to lowercase for comparision
This commit is contained in:
Yurong He
2019-04-26 20:25:55 -07:00
committed by GitHub
parent 49c36cc040
commit f1e21ebe9d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sql/workbench/parts/notebook/models/cell.ts
View File

@@ -12,7 +12,7 @@ import { localize } from 'vs/nls';
import * as notebookUtils from '../notebookUtils'; import * as notebookUtils from '../notebookUtils';
import { CellTypes, CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/models/contracts'; import { CellTypes, CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/models/contracts';
import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel'; import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces'; import { ICellModel, notebookConstants } from 'sql/workbench/parts/notebook/models/modelInterfaces';
import { ICellModelOptions, IModelFactory, FutureInternal, CellExecutionState } from './modelInterfaces'; import { ICellModelOptions, IModelFactory, FutureInternal, CellExecutionState } from './modelInterfaces';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
@@ -383,6 +383,9 @@ export class CellModel implements ICellModel {
} }
private rewriteOutputUrls(output: nb.ICellOutput): nb.ICellOutput { private rewriteOutputUrls(output: nb.ICellOutput): nb.ICellOutput {
const driverLog = '/gateway/default/yarn/container';
const yarnUi = '/gateway/default/yarn/proxy';
const defaultPort = ':30433';
// Only rewrite if this is coming back during execution, not when loading from disk. // Only rewrite if this is coming back during execution, not when loading from disk.
// A good approximation is that the model has a future (needed for execution) // A good approximation is that the model has a future (needed for execution)
if (this.future) { if (this.future) {
@@ -393,9 +396,10 @@ export class CellModel implements ICellModel {
if (model.activeConnection) { if (model.activeConnection) {
let endpoint = this.getKnoxEndpoint(model.activeConnection); let endpoint = this.getKnoxEndpoint(model.activeConnection);
let host = endpoint && endpoint.ipAddress ? endpoint.ipAddress : model.activeConnection.serverName; let host = endpoint && endpoint.ipAddress ? endpoint.ipAddress : model.activeConnection.serverName;
let port = endpoint && endpoint.port ? ':' + endpoint.port.toString() : defaultPort;
let html = result.data['text/html']; let html = result.data['text/html'];
html = this.rewriteUrlUsingRegex(/(https?:\/\/mssql-master.*\/proxy)(.*)/g, html, host); html = this.rewriteUrlUsingRegex(/(https?:\/\/master.*\/proxy)(.*)/g, html, host, port, yarnUi);
html = this.rewriteUrlUsingRegex(/(https?:\/\/master.*master-svc.*\/proxy)(.*)/g, html, host); html = this.rewriteUrlUsingRegex(/(https?:\/\/storage.*\/containerlogs)(.*)/g, html, host, port, driverLog);
(<nb.IDisplayResult>output).data['text/html'] = html; (<nb.IDisplayResult>output).data['text/html'] = html;
} }
} }
@@ -405,11 +409,11 @@ export class CellModel implements ICellModel {
return output; return output;
} }
private rewriteUrlUsingRegex(regex: RegExp, html: string, host: string): string { private rewriteUrlUsingRegex(regex: RegExp, html: string, host: string, port: string, target: string): string {
return html.replace(regex, function (a, b, c) { return html.replace(regex, function (a, b, c) {
let ret = ''; let ret = '';
if (b !== '') { if (b !== '') {
ret = 'https://' + host + ':30443/gateway/default/yarn/proxy'; ret = 'https://' + host + port + target;
} }
if (c !== '') { if (c !== '') {
ret = ret + c; ret = ret + c;
@@ -489,7 +493,7 @@ export class CellModel implements ICellModel {
// TODO: this will be refactored out into the notebooks extension as a contribution point // TODO: this will be refactored out into the notebooks extension as a contribution point
private getKnoxEndpoint(activeConnection: IConnectionProfile): notebookUtils.IEndpoint { private getKnoxEndpoint(activeConnection: IConnectionProfile): notebookUtils.IEndpoint {
let endpoint; let endpoint;
if (this._connectionManagementService && activeConnection && activeConnection.providerName === 'mssql') { if (this._connectionManagementService && activeConnection && activeConnection.providerName.toLowerCase() === notebookConstants.SQL_CONNECTION_PROVIDER.toLowerCase()) {
let serverInfo: ServerInfo = this._connectionManagementService.getServerInfo(activeConnection.id); let serverInfo: ServerInfo = this._connectionManagementService.getServerInfo(activeConnection.id);
if (serverInfo && serverInfo.options && serverInfo.options['clusterEndpoints']) { if (serverInfo && serverInfo.options && serverInfo.options['clusterEndpoints']) {
let endpoints: notebookUtils.IEndpoint[] = serverInfo.options['clusterEndpoints']; let endpoints: notebookUtils.IEndpoint[] = serverInfo.options['clusterEndpoints'];