From 95ce199d56e4745a453afc3403e6355df27a6bef Mon Sep 17 00:00:00 2001 From: Raymond Truong Date: Wed, 1 Feb 2023 11:33:07 -0800 Subject: [PATCH] [SQL Migration][Hotfix] Remove parameter from IR validation (#21800) * Remove encryptConnection from validateIR * Use correct version * vbump to 1.2.6 for insiders release --- extensions/sql-migration/package.json | 2 +- extensions/sql-migration/src/api/azure.ts | 2 +- extensions/sql-migration/src/models/stateMachine.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/sql-migration/package.json b/extensions/sql-migration/package.json index 70b7234138..689b946fb5 100644 --- a/extensions/sql-migration/package.json +++ b/extensions/sql-migration/package.json @@ -2,7 +2,7 @@ "name": "sql-migration", "displayName": "%displayName%", "description": "%description%", - "version": "1.2.4", + "version": "1.2.6", "publisher": "Microsoft", "preview": false, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", diff --git a/extensions/sql-migration/src/api/azure.ts b/extensions/sql-migration/src/api/azure.ts index a42e5a8394..c59774fd59 100644 --- a/extensions/sql-migration/src/api/azure.ts +++ b/extensions/sql-migration/src/api/azure.ts @@ -736,8 +736,8 @@ export async function validateIrDatabaseMigrationSettings( dataSource: sourceServerName, userName: migration._sqlServerUsername, password: migration._sqlServerPassword, + // to-do: use correct value of encryptConnection and trustServerCertificate trustServerCertificate: trustServerCertificate, - encryptConnection: true, authentication: migration._authenticationType, } }; diff --git a/extensions/sql-migration/src/models/stateMachine.ts b/extensions/sql-migration/src/models/stateMachine.ts index 709a75516b..2b886e6456 100644 --- a/extensions/sql-migration/src/models/stateMachine.ts +++ b/extensions/sql-migration/src/models/stateMachine.ts @@ -1141,6 +1141,7 @@ export class MigrationStateModel implements Model, vscode.Disposable { authentication: this._authenticationType, userName: this._sqlServerUsername, password: this._sqlServerPassword, + // to-do: use correct value of encryptConnection and trustServerCertificate trustServerCertificate: currentConnection?.options.trustServerCertificate ?? false }, scope: this._targetServerInstance.id,