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

Adding firewall rule prompt when publishing to existing server (#19474)

Browse Source
This commit is contained in:
Leila Lali
2022-05-23 08:33:53 -07:00
committed by GitHub
parent 1959736078
commit 39f5ad9e16
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/sql-database-projects/src/dialogs/publishDatabaseQuickpick.ts
View File

@@ -9,7 +9,7 @@ import { Project } from '../models/project';
import { PublishProfile, readPublishProfile } from '../models/publishProfile/publishProfile'; import { PublishProfile, readPublishProfile } from '../models/publishProfile/publishProfile';
import { promptForPublishProfile } from './publishDatabaseDialog'; import { promptForPublishProfile } from './publishDatabaseDialog';
import { getDefaultPublishDeploymentOptions, getVscodeMssqlApi } from '../common/utils'; import { getDefaultPublishDeploymentOptions, getVscodeMssqlApi } from '../common/utils';
import { IConnectionInfo } from 'vscode-mssql'; import { IConnectionInfo, IFireWallRuleError } from 'vscode-mssql';
import { IDeploySettings } from '../models/IDeploySettings'; import { IDeploySettings } from '../models/IDeploySettings';
import { getPublishServerName } from './utils'; import { getPublishServerName } from './utils';
import { SqlTargetPlatform } from 'sqldbproj'; import { SqlTargetPlatform } from 'sqldbproj';
@@ -89,7 +89,18 @@ export async function getPublishDatabaseSettings(project: Project, promptForConn
} }
// Get the list of databases now to validate that the connection is valid and re-prompt them if it isn't // Get the list of databases now to validate that the connection is valid and re-prompt them if it isn't
try { try {
connectionUri = await vscodeMssqlApi.connect(connectionProfile); try {
connectionUri = await vscodeMssqlApi.connect(connectionProfile);
} catch (azureErr) {
// If the error is the firewall rule, prompt to add firewall rule and try again
const firewallRuleError = <IFireWallRuleError>azureErr;
if (firewallRuleError?.connectionUri) {
await vscodeMssqlApi.promptForFirewallRule(azureErr.connectionUri, connectionProfile);
connectionUri = await vscodeMssqlApi.connect(connectionProfile);
} else {
throw azureErr;
}
}
dbs = await vscodeMssqlApi.listDatabases(connectionUri); dbs = await vscodeMssqlApi.listDatabases(connectionUri);
} catch (err) { } catch (err) {
// no-op, the mssql extension handles showing the error to the user. We'll just go // no-op, the mssql extension handles showing the error to the user. We'll just go