improvement: better error & cancellation handling, region choice changed

region choice is changed from defaultRegions to allRegions
hoonoh · Oct 21, 2019 · 079e8e5 · 079e8e5
1 parent b7c9d16
commit 079e8e5
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 25 deletions.
diff --git a/src/cli-ui.ts b/src/cli-ui.ts
@@ -25,6 +25,11 @@ type Answer2 = {
 
 export type Answers = Answer1 & Answer2;
 
+const onCancel = (): void => {
+  console.log('aborted');
+  process.exit();
+};
+
 export const ui = async (): Promise<Answers | undefined> => {
   try {
     const question1 = [
@@ -62,7 +67,7 @@ export const ui = async (): Promise<Answers | undefined> => {
       },
     ];
 
-    const answer1: Answer1 = await prompt(question1);
+    const answer1: Answer1 = await prompt(question1, { onCancel });
 
     const familyTypePreSelectedSet = new Set<InstanceFamilyType>();
     const sizePreSelectedSet = new Set<InstanceSize>();
@@ -162,7 +167,7 @@ export const ui = async (): Promise<Answers | undefined> => {
       },
     ];
 
-    const answer2: Answer2 = await prompt(question2);
+    const answer2: Answer2 = await prompt(question2, { onCancel });
 
     return { ...answer1, ...answer2 };
   } catch (error) {

diff --git a/src/cli.ts b/src/cli.ts
@@ -18,7 +18,7 @@ import {
   ProductDescription,
   productDescriptionWildcards,
 } from './product-description';
-import { defaultRegions, Region } from './regions';
+import { allRegions, Region } from './regions';
 
 export const main = (argvInput?: string[]): Promise<void> =>
   new Promise((res, rej): void => {
@@ -32,7 +32,7 @@ export const main = (argvInput?: string[]): Promise<void> =>
             alias: 'r',
             describe: 'AWS regions.',
             type: 'array',
-            choices: defaultRegions,
+            choices: allRegions,
             string: true,
           },
           instanceType: {
@@ -298,7 +298,7 @@ export const main = (argvInput?: string[]): Promise<void> =>
           });
           y.parse(params);
         } else {
-          console.log('aborted');
+          console.log('Unexpected UI answers. aborted.');
         }
       });
     } else {

diff --git a/src/lib.ts b/src/lib.ts
@@ -38,9 +38,23 @@ const sortSpotPrice = (p1: EC2.SpotPrice, p2: EC2.SpotPrice): number => {
   return rtn;
 };
 
-const getEc2SpotPrice = async (options: {
+class Ec2SpotPriceError extends Error {
+  constructor(message: string, region: Region, code: string) {
+    super(message);
+    this.name = 'Ec2SpotPriceError';
+    this.region = region;
+    this.code = code;
+    Object.setPrototypeOf(this, Ec2SpotPriceError.prototype);
+  }
+
   region: string;
-  instanceTypes?: string[];
+
+  code: string;
+}
+
+const getEc2SpotPrice = async (options: {
+  region: Region;
+  instanceTypes?: InstanceType[];
   productDescriptions?: ProductDescription[];
   accessKeyId?: string;
   secretAccessKey?: string;
@@ -82,10 +96,14 @@ const getEc2SpotPrice = async (options: {
       rtn = list.filter(history => history.InstanceType).sort(sortSpotPrice);
     }
   } catch (error) {
-    console.error(
-      'unexpected getEc2SpotPrice error.',
-      JSON.stringify({ region, instanceTypes, productDescriptions, error }, null, 2),
-    );
+    if (error && error.code && (error.code === 'AuthFailure' || error.code === 'OptInRequired')) {
+      throw new Ec2SpotPriceError(error.message, region, error.code);
+    } else {
+      console.error(
+        'unexpected getEc2SpotPrice error.',
+        JSON.stringify({ region, instanceTypes, productDescriptions, error }, null, 2),
+      );
+    }
   }
 
   return rtn;
@@ -140,25 +158,44 @@ export const getGlobalSpotPrices = async (options?: {
     }
   }
 
-  const spinner = ora({
-    text: 'Waiting for data to be retrieved...',
-    discardStdin: false,
-  }).start();
+  let spinner: ora.Ora | undefined;
+  let spinnerText: string | undefined;
+  if (!silent && process.env.NODE_ENV !== 'test') {
+    spinner = ora({
+      text: 'Waiting for data to be retrieved...',
+      discardStdin: false,
+    }).start();
+  }
 
   await Promise.all(
     regions.map(async region => {
-      const regionsPrices = await getEc2SpotPrice({
-        region,
-        instanceTypes,
-        productDescriptions,
-        accessKeyId,
-        secretAccessKey,
-      });
-      rtn = [...rtn, ...regionsPrices];
-      if (!silent) spinner.text = `Retrieved data from ${region}...`;
+      try {
+        const regionsPrices = await getEc2SpotPrice({
+          region,
+          instanceTypes,
+          productDescriptions,
+          accessKeyId,
+          secretAccessKey,
+        });
+        rtn = [...rtn, ...regionsPrices];
+        if (spinner) {
+          spinnerText = `Retrieved data from ${region}...`;
+          spinner.text = spinnerText;
+        }
+      } catch (error) {
+        if (error instanceof Ec2SpotPriceError && spinner) {
+          spinner.fail(`Failed to retrieve data from ${error.region}. (${error.code})`);
+          spinner = ora({
+            text: spinnerText || spinner.text,
+            discardStdin: false,
+          }).start();
+        } else {
+          console.error(error);
+        }
+      }
     }),
   );
-  if (!silent) spinner.succeed('All data retrieved!').stop();
+  if (spinner) spinner.succeed('All data retrieved!').stop();
 
   rtn = rtn.reduce(
     (list, cur) => {