Merge pull request joblocal#5 from joblocal/cli-arguments

Cli arguments

Author: BastianHofmann

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

README.md

@@ -33,6 +33,14 @@ After installing the package you can use it as follows.
 $ aws-move-queue-messages
 ```
 
+With all optional CLI arguments:
+
+```sh
+$ aws-move-queue-messages <from-queue-url> <to-queue-url> -r [AWS-REGION] -y
+```
+
+Any CLI argument or option you do not specify will fallback to a CLI prompt. The `-y` CLI option will answer the confirmation prompt automatically with "yes".
+
 ### Parameter
 Use the **Source Url** parameter to specify the source queue from which the messages are to be read.
 Use the **Target Url** parameter to specify the target queue in which the messages are written.

package.json

@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "aws-sdk": "^2.328.0",
-    "clear": "^0.1.0",
     "clui": "^0.3.6",
+    "commander": "^2.20.0",
     "inquirer": "^6.2.0",
     "minimist": "^1.2.0"
   },

src/index.js

@@ -1,50 +1,78 @@
 #!/usr/bin/env node
 
 const aws = require('aws-sdk');
-const clear = require('clear');
+const program = require('commander');
 const { prompt } = require('inquirer');
 const { validateUrl } = require('./helper');
 const { handle } = require('./main');
 const { createClient } = require('./sqs');
 
-clear();
-
-prompt([
-  {
-    type: 'input',
-    name: 'awsRegion',
-    message: 'Enter your AWS region:',
-    default: 'eu-west-1',
-  },
-  {
-    type: 'input',
-    name: 'sourceQueueUrl',
-    message: 'Enter your source queue url:',
-    validate: validateUrl,
-  },
-  {
-    type: 'input',
-    name: 'targetQueueUrl',
-    message: 'Enter your target queue url:',
-    validate: validateUrl,
-  },
-]).then(async ({ awsRegion, sourceQueueUrl, targetQueueUrl }) => {
-  aws.config.update({ region: awsRegion });
-
-  const sqs = createClient(new aws.SQS());
-  let count;
-
-  try {
-    count = await handle({
-      sourceQueueUrl,
-      targetQueueUrl,
-      sqs,
-      prompt,
-    });
-  } catch (e) {
-    console.error(`! ${e.message}`);
-    process.exit(1);
+const regionQuestion = {
+  type: 'input',
+  name: 'awsRegion',
+  message: 'Enter your AWS region:',
+  default: 'eu-west-1',
+};
+
+const fromQuestion = {
+  type: 'input',
+  name: 'sourceQueueUrl',
+  message: 'Enter your source queue url:',
+  validate: validateUrl,
+};
+
+const toQuestion = {
+  type: 'input',
+  name: 'targetQueueUrl',
+  message: 'Enter your target queue url:',
+  validate: validateUrl,
+};
+
+const handleAction = (from, to, options) => {
+  const questions = [];
+
+  if (!options.region) {
+    questions.push(regionQuestion);
+  }
+
+  if (!from) {
+    questions.push(fromQuestion);
   }
 
-  console.log(`${count} messages moved from ${sourceQueueUrl} to ${targetQueueUrl}!`);
-});
+  if (!to) {
+    questions.push(toQuestion);
+  }
+
+  prompt(questions).then(async ({
+    awsRegion = options.region,
+    sourceQueueUrl = from,
+    targetQueueUrl = to,
+  }) => {
+    aws.config.update({ region: awsRegion });
+
+    const sqs = createClient(new aws.SQS());
+    let count;
+
+    try {
+      count = await handle({
+        sourceQueueUrl,
+        targetQueueUrl,
+        sqs,
+        prompt,
+        skipPrompt: options.yes,
+      });
+    } catch (e) {
+      console.error(`! ${e.message}`);
+      process.exit(1);
+    }
+
+    console.log(`${count} messages moved from ${sourceQueueUrl} to ${targetQueueUrl}!`);
+  });
+};
+
+program
+  .arguments('[from] [to]')
+  .option('-r, --region [value]', 'The AWS region')
+  .option('-y, --yes', 'Non interactive message moving')
+  .action(handleAction)
+  .parse(process.argv);

src/main.js

@@ -5,6 +5,7 @@ const handle = async ({
   targetQueueUrl,
   sqs,
   prompt,
+  skipPrompt,
 }) => {
   const count = await sqs.getCount(sourceQueueUrl);
   await sqs.getCount(targetQueueUrl);
@@ -13,17 +14,19 @@ const handle = async ({
     throw new Error(`The queue ${sourceQueueUrl} is empty!`);
   }
 
-  const { move } = await prompt([
-    {
-      type: 'confirm',
-      name: 'move',
-      message: `Do you want to move ${count} messages?`,
-      default: false,
-    },
-  ]);
-
-  if (!move) {
-    process.exit(0);
+  if (!skipPrompt) {
+    const { move } = await prompt([
+      {
+        type: 'confirm',
+        name: 'move',
+        message: `Do you want to move ${count} messages?`,
+        default: false,
+      },
+    ]);
+
+    if (!move) {
+      process.exit(0);
+    }
   }
 
   const spinner = new Spinner(`Moving ${count} messages...`);

src/main.spec.js

@@ -23,6 +23,25 @@ describe('handle', () => {
     expect(sqs.getCount).toHaveBeenCalled();
   });
 
+  test('to move messages without prompt', async () => {
+    const sqs = {
+      getCount: jest.fn(() => 3),
+      moveMessage: jest.fn(),
+    };
+
+    const prompt = jest.fn();
+
+    await handle({
+      sourceQueueUrl: 'https://sqs.region.amazonaws.com/123456789/srcQueue',
+      targetQueueUrl: 'https://sqs.region.amazonaws.com/123456789/targetQueue',
+      sqs,
+      prompt,
+      skipPrompt: true,
+    });
+
+    expect(sqs.getCount).toHaveBeenCalled();
+  });
+
   describe('reject promise', () => {
     test('on failed count', () => {
       const sqs = {