ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-26 09:35:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Smartura/sql migrate tde improvements (#23631)

Browse Source 
* Automatically migrate certs on last page of wizard

* Updated TDE configuration dialog wording

* Added ConfigDialogSetting to track user selection

* Added numberOfDbsWithTde telemetry prop

* Migrate certs button moved back to target page

* Enable next button on cert migration success

* Reset TDE migration result if target changes

* Addressed PR feedback

* Added TDE navigation validator

* Fixed typo
This commit is contained in:
Steven Marturano
2023-07-12 15:32:28 -04:00
committed by GitHub
parent 8d1a7265ee
commit b595115c8a
8 changed files with 210 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
extensions/sql-migration/src/dialog/tdeConfiguration/tdeConfigurationDialog.ts
View File

@@ -9,7 +9,7 @@ import { MigrationStateModel } from '../../models/stateMachine';
import * as constants from '../../constants/strings';
import * as styles from '../../constants/styles';
import * as utils from '../../api/utils';
import { SKURecommendationPage } from '../../wizard/skuRecommendationPage';
import { ConfigDialogSetting } from '../../models/tdeModels'
export class TdeConfigurationDialog {
@@ -24,8 +24,7 @@ export class TdeConfigurationDialog {
private _networkPathText!: azdata.InputBoxComponent;
private _onClosed: () => void;
constructor(public skuRecommendationPage: SKURecommendationPage, public wizard: azdata.window.Wizard, public migrationStateModel: MigrationStateModel,
onClosed: () => void) {
constructor(public migrationStateModel: MigrationStateModel, onClosed: () => void) {
this._onClosed = onClosed;
}
@@ -90,7 +89,6 @@ export class TdeConfigurationDialog {
return container;
}
private createMethodsContainer(_view: azdata.ModelView): azdata.FlexContainer {
const chooseMethodText = _view.modelBuilder.text().withProps({
value: constants.TDE_WIZARD_MIGRATION_CAPTION,
@@ -123,7 +121,7 @@ export class TdeConfigurationDialog {
.withProps({
name: buttonGroup,
label: constants.TDE_WIZARD_MIGRATION_OPTION_ADS,
checked: this.migrationStateModel.tdeMigrationConfig.isTdeMigrationMethodAds(),
checked: this.migrationStateModel.tdeMigrationConfig.getAppliedConfigDialogSetting() === ConfigDialogSetting.ExportCertificates,
CSSStyles: {
...styles.BODY_CSS
},
@@ -131,7 +129,7 @@ export class TdeConfigurationDialog {
this._disposables.push(
adsMethodButton.onDidChangeCheckedState(async checked => {
if (checked) {
this.migrationStateModel.tdeMigrationConfig.setTdeMigrationMethod(true);
this.migrationStateModel.tdeMigrationConfig.setPendingTdeMigrationMethod(ConfigDialogSetting.ExportCertificates);
await this.updateUI();
}
}));
@@ -156,14 +154,14 @@ export class TdeConfigurationDialog {
.withProps({
name: buttonGroup,
label: constants.TDE_WIZARD_MIGRATION_OPTION_MANUAL,
checked: this.migrationStateModel.tdeMigrationConfig.isTdeMigrationMethodManual(),
checked: this.migrationStateModel.tdeMigrationConfig.getAppliedConfigDialogSetting() === ConfigDialogSetting.DoNotExport,
CSSStyles: { ...styles.BODY_CSS }
}).component();
this._disposables.push(
manualMethodButton.onDidChangeCheckedState(async checked => {
if (checked) {
this.migrationStateModel.tdeMigrationConfig.setTdeMigrationMethod(false);
this.migrationStateModel.tdeMigrationConfig.setPendingTdeMigrationMethod(ConfigDialogSetting.DoNotExport);
await this.updateUI();
}
}));
@@ -193,7 +191,8 @@ export class TdeConfigurationDialog {
private createAdsConfirmationContainer(_view: azdata.ModelView): azdata.FlexContainer {
const container = _view.modelBuilder.flexContainer().withProps({
CSSStyles: {
'flex-direction': 'column'
'flex-direction': 'column',
'display': 'none'
}
}).component();
@@ -226,11 +225,15 @@ export class TdeConfigurationDialog {
required: true,
CSSStyles: { ...styles.BODY_CSS, 'margin-top': '-1em', 'margin-left': '45px' }
}).component();
this._disposables.push(
this._networkPathText.onTextChanged(async networkPath => {
this.migrationStateModel.tdeMigrationConfig.setPendingNetworkPath(networkPath);
}));
this._adsConfirmationCheckBox = _view.modelBuilder.checkBox()
.withProps({
label: constants.TDE_WIZARD_MIGRATION_OPTION_ADS_CONFIRM,
checked: this.migrationStateModel.tdeMigrationConfig.isTdeMigrationMethodAdsConfirmed(),
checked: this.migrationStateModel.tdeMigrationConfig.getAppliedExportCertUserConsent(),
CSSStyles: {
...styles.BODY_CSS,
'margin': '10px 0 14px 15px'
@@ -238,9 +241,7 @@ export class TdeConfigurationDialog {
}).component();
this._disposables.push(
this._adsConfirmationCheckBox.onChanged(async checked => {
this.migrationStateModel.tdeMigrationConfig.setAdsConfirmation(
checked,
this._networkPathText.value ?? '');
this.migrationStateModel.tdeMigrationConfig.setPendingExportCertUserConsent(checked);
await this.updateUI();
}));
@@ -256,7 +257,8 @@ export class TdeConfigurationDialog {
private createManualWarningContainer(_view: azdata.ModelView): azdata.FlexContainer {
const container = _view.modelBuilder.flexContainer().withProps({
CSSStyles: {
'flex-direction': 'column'
'flex-direction': 'column',
'display': 'none'
}
}).component();
@@ -283,18 +285,15 @@ export class TdeConfigurationDialog {
}
private async updateUI(): Promise<void> {
const useAds = this.migrationStateModel.tdeMigrationConfig.isTdeMigrationMethodAds();
let exportCertsUsingAds = this.migrationStateModel.tdeMigrationConfig.getPendingConfigDialogSetting() === ConfigDialogSetting.ExportCertificates;
this._networkPathText.value = this.migrationStateModel.tdeMigrationConfig.getPendingNetworkPath();
this._networkPathText.required = exportCertsUsingAds;
this._adsConfirmationCheckBox.checked = this.migrationStateModel.tdeMigrationConfig.getPendingExportCertUserConsent();
this._networkPathText.value = this.migrationStateModel.tdeMigrationConfig._networkPath;
this._adsConfirmationCheckBox.checked = this.migrationStateModel.tdeMigrationConfig.isTdeMigrationMethodAdsConfirmed();
await utils.updateControlDisplay(this._adsMethodConfirmationContainer, useAds);
await utils.updateControlDisplay(this._adsMethodConfirmationContainer, exportCertsUsingAds);
await utils.updateControlDisplay(this._manualMethodWarningContainer, this.migrationStateModel.tdeMigrationConfig.getPendingConfigDialogSetting() === ConfigDialogSetting.DoNotExport);
const useManual = this.migrationStateModel.tdeMigrationConfig.isTdeMigrationMethodManual();
await utils.updateControlDisplay(this._manualMethodWarningContainer, useManual);
this.dialog!.okButton.enabled = this.migrationStateModel.tdeMigrationConfig.isTdeMigrationMethodSet();
this._networkPathText.required = useAds;
this.dialog!.okButton.enabled = this.migrationStateModel.tdeMigrationConfig.isAnyChangeReadyToBeApplied()
}
public async openDialog(dialogName?: string,) {
@@ -309,15 +308,12 @@ export class TdeConfigurationDialog {
'narrow');
this.dialog.okButton.label = constants.APPLY;
this.dialog.okButton.enabled = false;
this._disposables.push(
this.dialog.okButton.onClick(
(eventArgs) => {
() => {
this._isOpen = false;
this.migrationStateModel.tdeMigrationConfig.setConfigurationCompleted();
if (this.migrationStateModel.tdeMigrationConfig.shouldAdsMigrateCertificates()) {
this.migrationStateModel.tdeMigrationConfig._networkPath = this._networkPathText.value ?? '';
}
this.migrationStateModel.tdeMigrationConfig.applyConfigDialogSetting();
this._onClosed();
})
);
@@ -325,6 +321,7 @@ export class TdeConfigurationDialog {
this._disposables.push(
this.dialog.cancelButton.onClick(
() => {
this.migrationStateModel.tdeMigrationConfig.cancelConfigDialogSetting();
this._isOpen = false;
this._onClosed();
}));

18
extensions/sql-migration/src/dialog/tdeConfiguration/tdeMigrationDialog.ts
View File

@@ -6,7 +6,6 @@
import * as azdata from 'azdata';
import * as vscode from 'vscode';
import * as constants from '../../constants/strings';
import * as utils from '../../api/utils';
import { logError, TelemetryAction, TelemetryViews, sendSqlMigrationActionEvent, getTelemetryProps } from '../../telemetry';
import { EOL } from 'os';
import { MigrationStateModel, OperationResult } from '../../models/stateMachine';
@@ -55,10 +54,13 @@ export class TdeMigrationDialog {
};
private _valdiationErrors: string[] = [];
private _completedDatabasesCount: number = 0;
private _certMigrationEventEmitter;
constructor(
model: MigrationStateModel) {
model: MigrationStateModel,
certMigrationEventEmitter: vscode.EventEmitter<TdeMigrationResult>) {
this._model = model;
this._certMigrationEventEmitter = certMigrationEventEmitter;
}
public async openDialog(): Promise<void> {
@@ -214,8 +216,6 @@ export class TdeMigrationDialog {
});
}
private async _loadMigrationResults(): Promise<void> {
const tdeMigrationResult = this._model.tdeMigrationConfig.lastTdeMigrationResult();
this._progressReportText.value = '';
@@ -258,6 +258,7 @@ export class TdeMigrationDialog {
}
private async _retryTdeMigration(): Promise<void> {
this._model.tdeMigrationConfig.resetTdeMigrationResult();
const tdeMigrationResult = this._model.tdeMigrationConfig.lastTdeMigrationResult();
tdeMigrationResult.dbList = this._model.tdeMigrationConfig.getTdeEnabledDatabases().map<TdeMigrationDbState>(
db => ({
@@ -318,25 +319,28 @@ export class TdeMigrationDialog {
};
this._model.tdeMigrationConfig.setTdeMigrationResult(this._tdeMigrationResult); // Set value on success.
this._certMigrationEventEmitter.fire(this._tdeMigrationResult);
sendSqlMigrationActionEvent(
TelemetryViews.TdeMigrationDialog,
TelemetryAction.TdeMigrationSuccess,
{
...getTelemetryProps(this._model)
...getTelemetryProps(this._model),
'numberOfDbsWithTde': this._model.tdeMigrationConfig.getTdeEnabledDatabasesCount().toString()
},
{}
);
}
else {
this._dialog!.okButton.enabled = false;
this._certMigrationEventEmitter.fire({ state: TdeMigrationState.Failed, dbList: [] });
sendSqlMigrationActionEvent(
TelemetryViews.TdeMigrationDialog,
TelemetryAction.TdeMigrationFailures,
{
...getTelemetryProps(this._model),
'runningAsAdmin': (await utils.isAdmin()).toString()
'numberOfDbsWithTde': this._model.tdeMigrationConfig.getTdeEnabledDatabasesCount().toString()
},
{}
);
@@ -431,8 +435,6 @@ export class TdeMigrationDialog {
.component();
}
private async _updateTableFromOperationResult(operationResult: OperationResult<TdeMigrationDbResult[]>): Promise<void> {
let anyRowUpdated = false;