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

Addressed comments left in a merged PR (#17307)

Browse Source
This commit is contained in:
Leila Lali
2021-10-11 09:07:12 -07:00
committed by GitHub
parent 479bd10d02
commit d479c96658
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/sql-database-projects/src/common/constants.ts
View File

@@ -170,8 +170,8 @@ export const dockerContainerNotRunningErrorMessage = localize('dockerContainerNo
export const dockerContainerFailedToRunErrorMessage = localize('dockerContainerFailedToRunErrorMessage', "Failed to run the docker container"); export const dockerContainerFailedToRunErrorMessage = localize('dockerContainerFailedToRunErrorMessage', "Failed to run the docker container");
export const connectingToSqlServerOnDockerMessage = localize('connectingToSqlServerOnDockerMessage', "Connecting to SQL Server on Docker"); export const connectingToSqlServerOnDockerMessage = localize('connectingToSqlServerOnDockerMessage', "Connecting to SQL Server on Docker");
export const deployProjectFailedMessage = localize('deployProjectFailedMessage', "Failed to open a connection to the deployed database'"); export const deployProjectFailedMessage = localize('deployProjectFailedMessage', "Failed to open a connection to the deployed database'");
export const containerAlreadyExistForProject = localize('containerAlreadyExistForProject', "Other servers on container already exist for the project. Do you want to delete them?'"); export const containerAlreadyExistForProject = localize('containerAlreadyExistForProject', "Other servers on container already exist for the project. Do you want to delete them?");
export const checkoutOutputMessage = localize('checkoutOutputMessage', "Check output pane for more details."); export const checkoutOutputMessage = localize('checkoutOutputMessage', "Check output pane for more details");
export function taskFailedError(taskName: string, err: string): string { return localize('taskFailedError.error', "Failed to complete task '{0}'. Error: {1}", taskName, err); } export function taskFailedError(taskName: string, err: string): string { return localize('taskFailedError.error', "Failed to complete task '{0}'. Error: {1}", taskName, err); }
export function publishToContainerFailed(errorMessage: string) { return localize('publishToContainerFailed', "Failed to publish to container. {0}", errorMessage); } export function publishToContainerFailed(errorMessage: string) { return localize('publishToContainerFailed', "Failed to publish to container. {0}", errorMessage); }
export function deployAppSettingUpdateFailed(appSetting: string) { return localize('deployAppSettingUpdateFailed', "Failed to update app setting '{0}'", appSetting); } export function deployAppSettingUpdateFailed(appSetting: string) { return localize('deployAppSettingUpdateFailed', "Failed to update app setting '{0}'", appSetting); }

4
extensions/sql-database-projects/src/common/utils.ts
View File

@@ -561,14 +561,14 @@ export function isValidSQLPassword(password: string, userName: string = 'sa'): b
export async function showErrorMessageWithOutputChannel(errorMessageFunc: (error: string) => string, error: any, outputChannel: vscode.OutputChannel): Promise<void> { export async function showErrorMessageWithOutputChannel(errorMessageFunc: (error: string) => string, error: any, outputChannel: vscode.OutputChannel): Promise<void> {
const result = await vscode.window.showErrorMessage(errorMessageFunc(getErrorMessage(error)), constants.checkoutOutputMessage); const result = await vscode.window.showErrorMessage(errorMessageFunc(getErrorMessage(error)), constants.checkoutOutputMessage);
if (result !== undefined) { if (result === constants.checkoutOutputMessage) {
outputChannel.show(); outputChannel.show();
} }
} }
export async function showInfoMessageWithOutputChannel(message: string, outputChannel: vscode.OutputChannel): Promise<void> { export async function showInfoMessageWithOutputChannel(message: string, outputChannel: vscode.OutputChannel): Promise<void> {
const result = await vscode.window.showInformationMessage(message, constants.checkoutOutputMessage); const result = await vscode.window.showInformationMessage(message, constants.checkoutOutputMessage);
if (result !== undefined) { if (result === constants.checkoutOutputMessage) {
outputChannel.show(); outputChannel.show();
} }
} }

10
extensions/sql-database-projects/src/models/deploy/deployService.ts
View File

@@ -238,7 +238,7 @@ export class DeployService {
providerName: 'MSSQL', providerName: 'MSSQL',
saveProfile: false, saveProfile: false,
id: '', id: '',
connectionName: `${profile.profileName}`, connectionName: profile.profileName,
options: [], options: [],
authenticationType: 'SqlLogin' authenticationType: 'SqlLogin'
}; };
@@ -401,13 +401,9 @@ RUN ["/bin/bash", "/opt/commands/start.sh"]
await fse.writeFile(filePath, content); await fse.writeFile(filePath, content);
} }
private async getCurrentIds(commandToRun: string): Promise<string[]> {
const currentIds = await utils.executeCommand(commandToRun, this._outputChannel);
return currentIds ? currentIds.split(/\r?\n/) : [];
}
public async getCurrentDockerContainer(imageLabel: string): Promise<string[]> { public async getCurrentDockerContainer(imageLabel: string): Promise<string[]> {
return await this.getCurrentIds(`docker ps -q -a --filter label=${imageLabel}`); const currentIds = await utils.executeCommand(`docker ps -q -a --filter label=${imageLabel}`, this._outputChannel);
return currentIds ? currentIds.split(/\r?\n/) : [];
} }
public async cleanDockerObjects(ids: string[], commandsToClean: string[]): Promise<void> { public async cleanDockerObjects(ids: string[], commandsToClean: string[]): Promise<void> {