@@ -2,8 +2,7 @@ const fs = require("fs");
22const path = require ( "path" ) ;
33const https = require ( "https" ) ;
44const { execSync } = require ( "child_process" ) ;
5- const { BlobServiceClient } = require ( "@azure/storage-blob" ) ;
6- const blobStorageContainer = "content" ;
5+ const { ContainerClient } = require ( "@azure/storage-blob" ) ;
76const mime = require ( "mime" ) ;
87const apiVersion = "2021-08-01" ; //"2020-06-01-preview";
98const managementApiEndpoint = "management.azure.com" ;
@@ -88,7 +87,7 @@ class HttpClient {
8887 reject ( { code : "Forbidden" , message : `Looks like you are not allowed to perform this operation. Please check with your administrator.` } ) ;
8988 break ;
9089 default :
91- reject ( { code : "UnhandledError" , message : `Could not complete request to ${ requestUrl } . Status: ${ resp . statusCode } ${ resp . statusMessage } ` } ) ;
90+ reject ( { code : "UnhandledError" , message : `Could not complete request to ${ requestUrl } . Status: ${ resp . statusCode } ${ resp . statusMessage } , Data: ${ data } ` } ) ;
9291 }
9392 } ) ;
9493 } ) ;
@@ -240,8 +239,7 @@ class ImporterExporter {
240239 try {
241240 const snapshotMediaFolder = `${ this . snapshotFolder } /media` ;
242241 const blobStorageUrl = await this . getStorageSasUrl ( ) ;
243- const blobServiceClient = new BlobServiceClient ( blobStorageUrl . replace ( `/${ blobStorageContainer } ` , "" ) ) ;
244- const containerClient = blobServiceClient . getContainerClient ( blobStorageContainer ) ;
242+ const containerClient = new ContainerClient ( blobStorageUrl ) ;
245243
246244 await this . downloadBlobsRecursive ( containerClient , snapshotMediaFolder ) ;
247245 }
@@ -284,8 +282,7 @@ class ImporterExporter {
284282
285283 try {
286284 const blobStorageUrl = await this . getStorageSasUrl ( ) ;
287- const blobServiceClient = new BlobServiceClient ( blobStorageUrl . replace ( `/${ blobStorageContainer } ` , "" ) ) ;
288- const containerClient = blobServiceClient . getContainerClient ( blobStorageContainer ) ;
285+ const containerClient = new ContainerClient ( blobStorageUrl ) ;
289286 const fileNames = this . listFilesInDirectory ( snapshotMediaFolder ) ;
290287
291288 for ( const fileName of fileNames ) {
@@ -322,8 +319,7 @@ class ImporterExporter {
322319 async deleteBlobs ( ) {
323320 try {
324321 const blobStorageUrl = await this . getStorageSasUrl ( ) ;
325- const blobServiceClient = new BlobServiceClient ( blobStorageUrl . replace ( `/${ blobStorageContainer } ` , "" ) ) ;
326- const containerClient = blobServiceClient . getContainerClient ( blobStorageContainer ) ;
322+ const containerClient = new ContainerClient ( blobStorageUrl ) ;
327323
328324 let blobs = containerClient . listBlobsFlat ( ) ;
329325
@@ -411,7 +407,7 @@ class ImporterExporter {
411407 * Gets a storage SAS URL.
412408 */
413409 async getStorageSasUrl ( ) {
414- const response = await this . httpClient . sendRequest ( "POST" , `/portalSettings/mediaContent/listSecrets ` ) ;
410+ const response = await this . httpClient . sendRequest ( "POST" , `/portalconfigs/default/listMediaContentSecrets ` ) ;
415411 return response . containerSasUrl ;
416412 }
417413
0 commit comments