diff --git a/extensions/mssql/src/contracts.ts b/extensions/mssql/src/contracts.ts index e8f0952640..eb8c952b80 100644 --- a/extensions/mssql/src/contracts.ts +++ b/extensions/mssql/src/contracts.ts @@ -1101,6 +1101,7 @@ export namespace ProfilerSessionCreatedNotification { export interface SqlMigrationAssessmentParams { ownerUri: string; databases: string[]; + xEventsFilesFolderPath: string; } export namespace GetSqlMigrationAssessmentItemsRequest { diff --git a/extensions/mssql/src/mssql.d.ts b/extensions/mssql/src/mssql.d.ts index 47bc71a660..e76a57dfb3 100644 --- a/extensions/mssql/src/mssql.d.ts +++ b/extensions/mssql/src/mssql.d.ts @@ -701,7 +701,7 @@ declare module 'mssql' { } export interface ISqlMigrationService { - getAssessments(ownerUri: string, databases: string[]): Promise; + getAssessments(ownerUri: string, databases: string[], xEventsFilesFolderPath: string): Promise; getSkuRecommendations(dataFolder: string, perfQueryIntervalInSec: number, targetPlatforms: string[], targetSqlInstance: string, targetPercentile: number, scalingFactor: number, startTime: string, endTime: string, includePreviewSkus: boolean, databaseAllowList: string[]): Promise; startPerfDataCollection(ownerUri: string, dataFolder: string, perfQueryIntervalInSec: number, staticQueryIntervalInSec: number, numberOfIterations: number): Promise; stopPerfDataCollection(): Promise; @@ -799,10 +799,6 @@ declare module 'mssql' { assessmentReportPath: string; } - export interface ISqlMigrationService { - getAssessments(ownerUri: string, databases: string[]): Promise; - } - export interface CreateSasResponse { sharedAccessSignature: string; } diff --git a/extensions/mssql/src/sqlMigration/sqlMigrationService.ts b/extensions/mssql/src/sqlMigration/sqlMigrationService.ts index 445dbc5946..52424db2b9 100644 --- a/extensions/mssql/src/sqlMigration/sqlMigrationService.ts +++ b/extensions/mssql/src/sqlMigration/sqlMigrationService.ts @@ -29,8 +29,8 @@ export class SqlMigrationService implements mssql.ISqlMigrationService { context.registerService(constants.SqlMigrationService, this); } - async getAssessments(ownerUri: string, databases: string[]): Promise { - let params: contracts.SqlMigrationAssessmentParams = { ownerUri: ownerUri, databases: databases }; + async getAssessments(ownerUri: string, databases: string[], xEventsFilesFolderPath: string): Promise { + let params: contracts.SqlMigrationAssessmentParams = { ownerUri: ownerUri, databases: databases, xEventsFilesFolderPath: xEventsFilesFolderPath }; try { return this.client.sendRequest(contracts.GetSqlMigrationAssessmentItemsRequest.type, params); } diff --git a/extensions/sql-migration/src/models/stateMachine.ts b/extensions/sql-migration/src/models/stateMachine.ts index 9447ecb418..2589ab472a 100644 --- a/extensions/sql-migration/src/models/stateMachine.ts +++ b/extensions/sql-migration/src/models/stateMachine.ts @@ -392,7 +392,8 @@ export class MigrationStateModel implements Model, vscode.Disposable { public async getDatabaseAssessments(targetType: MigrationTargetType[]): Promise { const ownerUri = await azdata.connection.getUriForConnection(this.sourceConnectionId); try { - const response = (await this.migrationService.getAssessments(ownerUri, this._databasesForAssessment))!; + const xEventsFilesFolderPath = ''; // to-do: collect by prompting the user in the UI - for now, blank = disabled + const response = (await this.migrationService.getAssessments(ownerUri, this._databasesForAssessment, xEventsFilesFolderPath))!; this._assessmentApiResponse = response; this._assessedDatabaseList = this._databasesForAssessment.slice();