Added better error handling and messaging for scripts.v3 (#1040)

Azure · Nov 18, 2020 · 8d01d66 · 8d01d66
1 parent 70fa9e3
commit 8d01d66
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 118 deletions.
diff --git a/scripts.v3/capture.js b/scripts.v3/capture.js
@@ -49,7 +49,6 @@ async function capture() {
         yargs.resourceGroupName,
         yargs.serviceName
     );
-
     await importerExporter.export();
 
     console.log(`The content captured in "./dist/snapshot" folder.`);
@@ -61,7 +60,7 @@ capture()
         process.exit(0);
     })
     .catch(error => {
-        console.error(error);
+        console.error(error.message);
         process.exit(1);
     });
 

diff --git a/scripts.v3/generate.js b/scripts.v3/generate.js
@@ -59,7 +59,7 @@ generate()
         process.exit(0);
     })
     .catch(error => {
-        console.error(error);
+        console.error(error.message);
         process.exit(1);
     });
 

diff --git a/scripts.v3/migrate.js b/scripts.v3/migrate.js
@@ -68,15 +68,20 @@ const yargs = require('yargs')
     .argv;
 
 async function migrate() {
-    const sourceImporterExporter = new ImporterExporter(yargs.sourceSubscriptionId, yargs.sourceResourceGroupName, yargs.sourceServiceName);
-    await sourceImporterExporter.export();
-
-    const destIimporterExporter = new ImporterExporter(yargs.destSubscriptionId, yargs.destResourceGroupName, yargs.destServiceName);
-    await destIimporterExporter.cleanup();
-    await destIimporterExporter.import();
-
-    /* New publishing endpoint is not deployed to production yet. */
-    // await destIimporterExporter.publish();
+    try {
+        const sourceImporterExporter = new ImporterExporter(yargs.sourceSubscriptionId, yargs.sourceResourceGroupName, yargs.sourceServiceName);
+        await sourceImporterExporter.export();
+
+        const destIimporterExporter = new ImporterExporter(yargs.destSubscriptionId, yargs.destResourceGroupName, yargs.destServiceName);
+        await destIimporterExporter.cleanup();
+        await destIimporterExporter.import();
+
+        /* New publishing endpoint is not deployed to production yet. */
+        // await destIimporterExporter.publish();
+    }
+    catch (error) {
+        throw new Error(`Unable to complete migration. ${error.message}`);
+    }
 }
 
 migrate()
@@ -85,6 +90,6 @@ migrate()
         process.exit(0);
     })
     .catch(error => {
-        console.error(error);
+        console.error(error.message);
         process.exit(1);
     });