ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Renaming controller to migration service and other bug fixes/ validations. (#14751)

Browse Source 
* - Added coming soon message for learn more.
- Potential fix for learn more message

* Renaming of controller to sqlMigrationService

* Surfacing some errors
-Azure account is stale error
-Migration Service creation error.

* Adding refresh azure token validation.

* Fixing some errors pointed during PR
-Fixing property names
-Fixing count

* Fixing migration status
- Adding special error handling for resource not found error
- Deleting unfound migrations from local cache
- Using prefetched migration status for view all

Misc fixes:
- Using SQL server version name instead of number
- Fixing Icons on sku recommendation page
- Fixing table column width in cutover dialog
- Adding spinner button to refresh.

* Fixing all strings in migration service page and dialog

* fixed a string error in create service dialog
This commit is contained in:
Aasim Khan
2021-03-17 14:55:24 -07:00
committed by GitHub
parent 5917f869ef
commit c7cca7e9f0
16 changed files with 558 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
extensions/sql-migration/src/models/stateMachine.ts
View File

@@ -8,7 +8,7 @@ import { azureResource } from 'azureResource';
import * as azurecore from 'azurecore';
import * as vscode from 'vscode';
import * as mssql from '../../../mssql';
import { getAvailableManagedInstanceProducts, getAvailableStorageAccounts, getBlobContainers, getFileShares, getMigrationControllers, getSubscriptions, SqlMigrationController, SqlManagedInstance, startDatabaseMigration, StartDatabaseMigrationRequest, StorageAccount, getAvailableSqlVMs, SqlVMServer } from '../api/azure';
import { getAvailableManagedInstanceProducts, getAvailableStorageAccounts, getBlobContainers, getFileShares, getSqlMigrationServices, getSubscriptions, SqlMigrationService, SqlManagedInstance, startDatabaseMigration, StartDatabaseMigrationRequest, StorageAccount, getAvailableSqlVMs, SqlVMServer } from '../api/azure';
import { SKURecommendations } from './externalContract';
import * as constants from '../constants/strings';
import { MigrationLocalStorage } from './migrationLocalStorage';
@@ -96,8 +96,8 @@ export class MigrationStateModel implements Model, vscode.Disposable {
public _refreshNetworkShareLocation!: azureResource.BlobContainer[];
public _targetDatabaseNames!: string[];
public _migrationController!: SqlMigrationController;
public _migrationControllers!: SqlMigrationController[];
public _sqlMigrationService!: SqlMigrationService;
public _sqlMigrationServices!: SqlMigrationService[];
public _nodeNames!: string[];
private _stateChangeEventEmitter = new vscode.EventEmitter<StateChangeEvent>();
@@ -426,39 +426,39 @@ export class MigrationStateModel implements Model, vscode.Disposable {
}
public async getMigrationControllerValues(subscription: azureResource.AzureResourceSubscription, managedInstance: SqlManagedInstance): Promise<azdata.CategoryValue[]> {
let migrationControllerValues: azdata.CategoryValue[] = [];
public async getSqlMigrationServiceValues(subscription: azureResource.AzureResourceSubscription, managedInstance: SqlManagedInstance): Promise<azdata.CategoryValue[]> {
let sqlMigrationServiceValues: azdata.CategoryValue[] = [];
try {
this._migrationControllers = await getMigrationControllers(this._azureAccount, subscription, managedInstance.resourceGroup!, managedInstance.location);
this._migrationControllers.forEach((migrationController) => {
migrationControllerValues.push({
name: migrationController.id,
displayName: `${migrationController.name}`
this._sqlMigrationServices = await getSqlMigrationServices(this._azureAccount, subscription, managedInstance.location);
this._sqlMigrationServices.forEach((sqlMigrationService) => {
sqlMigrationServiceValues.push({
name: sqlMigrationService.id,
displayName: `${sqlMigrationService.name}`
});
});
if (migrationControllerValues.length === 0) {
migrationControllerValues = [
if (sqlMigrationServiceValues.length === 0) {
sqlMigrationServiceValues = [
{
displayName: constants.MIGRATION_CONTROLLER_NOT_FOUND_ERROR,
displayName: constants.SQL_MIGRATION_SERVICE_NOT_FOUND_ERROR,
name: ''
}
];
}
} catch (e) {
console.log(e);
migrationControllerValues = [
sqlMigrationServiceValues = [
{
displayName: constants.MIGRATION_CONTROLLER_NOT_FOUND_ERROR,
displayName: constants.SQL_MIGRATION_SERVICE_NOT_FOUND_ERROR,
name: ''
}
];
}
return migrationControllerValues;
return sqlMigrationServiceValues;
}
public getMigrationController(index: number): SqlMigrationController {
return this._migrationControllers[index];
public getMigrationService(index: number): SqlMigrationService {
return this._sqlMigrationServices[index];
}
public async startMigration() {
@@ -473,41 +473,41 @@ export class MigrationStateModel implements Model, vscode.Disposable {
const connectionPassword = await azdata.connection.getCredentials(this.sourceConnectionId);
const requestBody: StartDatabaseMigrationRequest = {
location: this._migrationController?.properties.location!,
location: this._sqlMigrationService?.properties.location!,
properties: {
SourceDatabaseName: '',
MigrationController: this._migrationController?.id!,
BackupConfiguration: {
TargetLocation: {
StorageAccountResourceId: this._databaseBackup.storageAccount.id,
AccountKey: this._databaseBackup.storageKey,
sourceDatabaseName: '',
migrationService: this._sqlMigrationService?.id!,
backupConfiguration: {
targetLocation: {
storageAccountResourceId: this._databaseBackup.storageAccount.id,
accountKey: this._databaseBackup.storageKey,
},
SourceLocation: {
FileShare: {
Path: '',
Username: this._databaseBackup.windowsUser,
Password: this._databaseBackup.password,
sourceLocation: {
fileShare: {
path: '',
username: this._databaseBackup.windowsUser,
password: this._databaseBackup.password,
}
},
},
SourceSqlConnection: {
DataSource: currentConnection?.serverName!,
Username: currentConnection?.userName!,
Password: connectionPassword.password
sourceSqlConnection: {
dataSource: currentConnection?.serverName!,
username: currentConnection?.userName!,
password: connectionPassword.password
},
Scope: this._targetServerInstance.id
scope: this._targetServerInstance.id
}
};
this._migrationDbs.forEach(async (db, index) => {
requestBody.properties.SourceDatabaseName = db;
requestBody.properties.sourceDatabaseName = db;
try {
requestBody.properties.BackupConfiguration.SourceLocation.FileShare.Path = this._databaseBackup.networkShareLocations[index];
requestBody.properties.backupConfiguration.sourceLocation.fileShare!.path = this._databaseBackup.networkShareLocations[index];
const response = await startDatabaseMigration(
this._azureAccount,
this._targetSubscription,
this._migrationController?.properties.location!,
this._sqlMigrationService?.properties.location!,
this._targetServerInstance,
this._targetDatabaseNames[index],
requestBody
@@ -519,9 +519,9 @@ export class MigrationStateModel implements Model, vscode.Disposable {
this._targetServerInstance,
this._azureAccount,
this._targetSubscription,
this._migrationController
this._sqlMigrationService
);
vscode.window.showInformationMessage(localize("sql.migration.starting.migration.message", 'Starting migration for database {0} to {1}', db, this._targetServerInstance.name));
vscode.window.showInformationMessage(localize("sql.migration.starting.migration.message", 'Starting migration for database {0} to {1} - {2}', db, this._targetServerInstance.name, this._targetDatabaseNames[index]));
}
} catch (e) {
console.log(e);