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

[SQL Migration] Allow folders inside blob containers (#21952)

Browse Source 
* WIP

* WIP

* WIP - add new property to blob

* Add error messages

* Fix undefined for offline scenario

* Add support for offline scenario

* Clean up

* vbump extension

* remove >1 level deep folders

* fix [object] object issue

* Remove unnecessary asyncs

* don't allow >1 level deep for offline scenario lastBackupFile
This commit is contained in:
Raymond Truong
2023-02-23 10:40:56 -08:00
committed by GitHub
parent fd282cd20b
commit 85056fb1b7
8 changed files with 214 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ import * as constants from '../constants/strings';
import * as nls from 'vscode-nls';
import { v4 as uuidv4 } from 'uuid';
import { sendSqlMigrationActionEvent, TelemetryAction, TelemetryViews, logError } from '../telemetry';
import { hashString, deepClone } from '../api/utils';
import { hashString, deepClone, getBlobContainerNameWithFolder, Blob, getLastBackupFileNameWithoutFolder } from '../api/utils';
import { SKURecommendationPage } from '../wizard/skuRecommendationPage';
import { excludeDatabases, getEncryptConnectionValue, getSourceConnectionId, getSourceConnectionProfile, getSourceConnectionServerInfo, getSourceConnectionString, getSourceConnectionUri, getTrustServerCertificateValue, SourceDatabaseInfo, TargetDatabaseInfo } from '../api/sqlUtils';
import { LoginMigrationModel } from './loginMigrationModel';
@@ -126,14 +126,6 @@ export interface NetworkShare {
storageKey: string;
}
export interface Blob {
resourceGroup: azurecore.azureResource.AzureResourceResourceGroup;
storageAccount: StorageAccount;
blobContainer: azurecore.azureResource.BlobContainer;
storageKey: string;
lastBackupFile?: string; // _todo: does it make sense to store the last backup file here?
}
export interface Model {
readonly currentState: State;
gatheringInformationError: string | undefined;
@@ -206,6 +198,7 @@ export class MigrationStateModel implements Model, vscode.Disposable {
public _fileShares!: azurecore.azureResource.FileShare[];
public _blobContainers!: azurecore.azureResource.BlobContainer[];
public _lastFileNames!: azurecore.azureResource.Blob[];
public _blobContainerFolders!: string[];
public _sourceDatabaseNames!: string[];
public _targetDatabaseNames!: string[];
@@ -1086,7 +1079,7 @@ export class MigrationStateModel implements Model, vscode.Disposable {
azureBlob: {
storageAccountResourceId: this._databaseBackup.blobs[i].storageAccount.id,
accountKey: this._databaseBackup.blobs[i].storageKey,
blobContainerName: this._databaseBackup.blobs[i].blobContainer.name
blobContainerName: getBlobContainerNameWithFolder(this._databaseBackup.blobs[i], isOfflineMigration)
}
}
};
@@ -1094,7 +1087,7 @@ export class MigrationStateModel implements Model, vscode.Disposable {
if (isOfflineMigration) {
requestBody.properties.offlineConfiguration = {
offline: isOfflineMigration,
lastBackupName: this._databaseBackup.blobs[i]?.lastBackupFile
lastBackupName: getLastBackupFileNameWithoutFolder(this._databaseBackup.blobs[i])
};
}
break;