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

Add external miaa endpoint property (#11940)

Browse Source
This commit is contained in:
Charles Gagnon
2020-08-24 18:07:25 -07:00
committed by GitHub
parent 54826b5fe3
commit 969932743a
6 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/arc/src/common/utils.ts
View File

@@ -209,3 +209,18 @@ export function parseInstanceName(instanceName: string | undefined): string {
}
return instanceName;
}
/**
* Parses an address into its separate ip and port values. Address must be in the form <ip>:<port>
* @param address The address to parse
*/
export function parseIpAndPort(address: string): { ip: string, port: string } {
const sections = address.split(':');
if (sections.length !== 2) {
throw new Error(`Invalid address format for ${address}. Address must be in the form <ip>:<port>`);
}
return {
ip: sections[0],
port: sections[1]
};
}

29
extensions/arc/src/test/common/utils.test.ts
View File

@@ -6,7 +6,7 @@
import * as vscode from 'vscode';
import * as should from 'should';
import 'mocha';
import { resourceTypeToDisplayName, parseEndpoint, parseInstanceName, getAzurecoreApi, getResourceTypeIcon, getConnectionModeDisplayText, getDatabaseStateDisplayText, promptForResourceDeletion, promptAndConfirmPassword, getErrorMessage } from '../../common/utils';
import { resourceTypeToDisplayName, parseEndpoint, parseInstanceName, getAzurecoreApi, getResourceTypeIcon, getConnectionModeDisplayText, getDatabaseStateDisplayText, promptForResourceDeletion, promptAndConfirmPassword, getErrorMessage, parseIpAndPort } from '../../common/utils';
import * as loc from '../../localizedConstants';
import { ResourceType, IconPathHelper, ConnectionMode as ConnectionMode } from '../../constants';
@@ -185,7 +185,7 @@ describe('promptAndConfirmPassword Method Tests', function (): void {
}
});
mockInputBox.value = password;
mockInputBox.triggerAccept().then( () => {
mockInputBox.triggerAccept().then(() => {
mockInputBox.value = password;
mockInputBox.triggerAccept();
});
@@ -212,7 +212,7 @@ describe('promptAndConfirmPassword Method Tests', function (): void {
}
});
mockInputBox.value = password;
mockInputBox.triggerAccept().then( () => {
mockInputBox.triggerAccept().then(() => {
mockInputBox.hide();
});
});
@@ -221,8 +221,8 @@ describe('promptAndConfirmPassword Method Tests', function (): void {
const testError = 'Test Error';
promptAndConfirmPassword((_: string) => { return testError; }).catch(err => done(err));
mockInputBox.value = '';
mockInputBox.triggerAccept().then( () => {
if(mockInputBox.validationMessage === testError) {
mockInputBox.triggerAccept().then(() => {
if (mockInputBox.validationMessage === testError) {
done();
} else {
done(new Error(`Validation message '${mockInputBox.validationMessage}' was expected to be '${testError}'`));
@@ -233,10 +233,10 @@ describe('promptAndConfirmPassword Method Tests', function (): void {
it('Error message displayed when passwords do not match', function (done): void {
promptAndConfirmPassword((_: string) => { return ''; }).catch(err => done(err));
mockInputBox.value = 'MyPassword';
mockInputBox.triggerAccept().then( () => {
mockInputBox.triggerAccept().then(() => {
mockInputBox.value = 'WrongPassword';
mockInputBox.triggerAccept().then( () => {
if(mockInputBox.validationMessage === loc.thePasswordsDoNotMatch) {
mockInputBox.triggerAccept().then(() => {
if (mockInputBox.validationMessage === loc.thePasswordsDoNotMatch) {
done();
} else {
done(new Error(`Validation message '${mockInputBox.validationMessage} was not the expected message`));
@@ -274,3 +274,16 @@ describe('parseInstanceName Method Tests', function () {
should(() => parseInstanceName('Some_Invalid_Name')).throwError();
});
});
describe('parseIpAndPort', function (): void {
it('Valid address', function (): void {
const ip = '127.0.0.1';
const port = '80';
should(parseIpAndPort(`${ip}:${port}`)).deepEqual({ ip: ip, port: port });
});
it('invalid address - no port', function (): void {
const ip = '127.0.0.1';
should(() => parseIpAndPort(ip)).throwError();
});
});

34
extensions/arc/src/ui/dashboards/miaa/miaaConnectionStringsPage.ts
View File

@@ -6,15 +6,17 @@
import * as azdata from 'azdata';
import * as loc from '../../../localizedConstants';
import { IconPathHelper, cssStyles } from '../../../constants';
import { KeyValueContainer, KeyValue } from '../../components/keyValueContainer';
import { KeyValueContainer, KeyValue, InputKeyValue, MultilineInputKeyValue } from '../../components/keyValueContainer';
import { DashboardPage } from '../../components/dashboardPage';
import { ControllerModel } from '../../../models/controllerModel';
import { MiaaModel } from '../../../models/miaaModel';
import { parseIpAndPort } from '../../../common/utils';
export class MiaaConnectionStringsPage extends DashboardPage {
private _keyValueContainer!: KeyValueContainer;
constructor(modelView: azdata.ModelView, private _controllerModel: ControllerModel) {
constructor(modelView: azdata.ModelView, private _controllerModel: ControllerModel, private _miaaModel: MiaaModel) {
super(modelView);
this.disposables.push(this._controllerModel.onRegistrationsUpdated(_ =>
this.eventuallyRunOnInitialized(() => this.updateConnectionStrings())));
@@ -63,32 +65,28 @@ export class MiaaConnectionStringsPage extends DashboardPage {
}
private getConnectionStrings(): KeyValue[] {
/*
const instanceRegistration = this._controllerModel.getRegistration(ResourceType.sqlManagedInstances, this._miaaModel.info.namespace, this._miaaModel.info.name);
if (!instanceRegistration) {
const config = this._miaaModel.config;
if (!config?.status.externalEndpoint) {
return [];
}
const ip = instanceRegistration.externalIp;
const port = instanceRegistration.externalPort;
const externalEndpoint = parseIpAndPort(config.status.externalEndpoint);
const username = this._miaaModel.username;
return [
new InputKeyValue(this.modelView.modelBuilder, 'ADO.NET', `Server=tcp:${ip},${port};Persist Security Info=False;User ID=${username};Password={your_password_here};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;`),
new InputKeyValue(this.modelView.modelBuilder, 'C++ (libpq)', `host=${ip} port=${port} user=${username} password={your_password_here} sslmode=require`),
new InputKeyValue(this.modelView.modelBuilder, 'JDBC', `jdbc:sqlserver://${ip}:${port};user=${username};password={your_password_here};encrypt=true;trustServerCertificate=false;loginTimeout=30;`),
new InputKeyValue(this.modelView.modelBuilder, 'Node.js', `host=${ip} port=${port} dbname=master user=${username} password={your_password_here} sslmode=require`),
new InputKeyValue(this.modelView.modelBuilder, 'ODBC', `Driver={ODBC Driver 13 for SQL Server};Server=${ip},${port};Uid=${username};Pwd={your_password_here};Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30;`),
new InputKeyValue(this.modelView.modelBuilder, 'ADO.NET', `Server=tcp:${externalEndpoint.ip},${externalEndpoint.port};Persist Security Info=False;User ID=${username};Password={your_password_here};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;`),
new InputKeyValue(this.modelView.modelBuilder, 'C++ (libpq)', `host=${externalEndpoint.ip} port=${externalEndpoint.port} user=${username} password={your_password_here} sslmode=require`),
new InputKeyValue(this.modelView.modelBuilder, 'JDBC', `jdbc:sqlserver://${externalEndpoint.ip}:${externalEndpoint.port};user=${username};password={your_password_here};encrypt=true;trustServerCertificate=false;loginTimeout=30;`),
new InputKeyValue(this.modelView.modelBuilder, 'Node.js', `host=${externalEndpoint.ip} port=${externalEndpoint.port} dbname=master user=${username} password={your_password_here} sslmode=require`),
new InputKeyValue(this.modelView.modelBuilder, 'ODBC', `Driver={ODBC Driver 13 for SQL Server};Server=${externalEndpoint.ip},${externalEndpoint.port};Uid=${username};Pwd={your_password_here};Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30;`),
new MultilineInputKeyValue(this.modelView.modelBuilder, 'PHP',
`$connectionInfo = array("UID" => "${username}", "pwd" => "{your_password_here}", "LoginTimeout" => 30, "Encrypt" => 1, "TrustServerCertificate" => 0);
$serverName = "${ip},${port}";
$serverName = "${externalEndpoint.ip},${externalEndpoint.port}";
$conn = sqlsrv_connect($serverName, $connectionInfo);`),
new InputKeyValue(this.modelView.modelBuilder, 'Python', `dbname='master' user='${username}' host='${ip}' password='{your_password_here}' port='${port}' sslmode='true'`),
new InputKeyValue(this.modelView.modelBuilder, 'Ruby', `host=${ip}; user=${username} password={your_password_here} port=${port} sslmode=require`),
new InputKeyValue(this.modelView.modelBuilder, 'Web App', `Database=master; Data Source=${ip}; User Id=${username}; Password={your_password_here}`)
new InputKeyValue(this.modelView.modelBuilder, 'Python', `dbname='master' user='${username}' host='${externalEndpoint.ip}' password='{your_password_here}' port='${externalEndpoint.port}' sslmode='true'`),
new InputKeyValue(this.modelView.modelBuilder, 'Ruby', `host=${externalEndpoint.ip}; user=${username} password={your_password_here} port=${externalEndpoint.port} sslmode=require`),
new InputKeyValue(this.modelView.modelBuilder, 'Web App', `Database=master; Data Source=${externalEndpoint.ip}; User Id=${username}; Password={your_password_here}`)
];
*/
return [];
}
private updateConnectionStrings(): void {

2
extensions/arc/src/ui/dashboards/miaa/miaaDashboard.ts
View File

@@ -26,7 +26,7 @@ export class MiaaDashboard extends Dashboard {
protected async registerTabs(modelView: azdata.ModelView): Promise<(azdata.DashboardTab | azdata.DashboardTabGroup)[]> {
const overviewPage = new MiaaDashboardOverviewPage(modelView, this._controllerModel, this._miaaModel);
const connectionStringsPage = new MiaaConnectionStringsPage(modelView, this._controllerModel);
const connectionStringsPage = new MiaaConnectionStringsPage(modelView, this._controllerModel, this._miaaModel);
return [
overviewPage.tab,
{

2
extensions/arc/src/ui/dashboards/miaa/miaaDashboardOverviewPage.ts
View File

@@ -257,7 +257,6 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
this._instanceProperties.region = reg.region || '-';
this._instanceProperties.subscriptionId = reg.subscriptionId || '-';
this._instanceProperties.vCores = reg.vCores || '';
this._instanceProperties.host = reg.externalEndpoint || '-';
this.refreshDisplayedProperties();
}
*/
@@ -265,6 +264,7 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
private handleMiaaConfigUpdated(): void {
this._instanceProperties.status = this._miaaModel.config?.status.state || '-';
this._instanceProperties.host = this._miaaModel.config?.status.externalEndpoint || '-';
this.refreshDisplayedProperties();
}