remove cli quiet

Author: ryanbethel

index.js

@@ -56,8 +56,9 @@ function run (mod) {
       if (options.inventory.inv?.aws?.profile) params.profile = options.inventory.inv.aws.profile
       awsLite(params)
         .then(aws => {
-          let updateOptions = options.quiet ? { quiet: options.quiet } : {}
-          let { quiet: _quiet, ...deployOptions } = options
+          let { quiet, ...deployOptions } = options
+          let updateOptions = quiet ? { quiet } : {}
+          // Extract quiet from options since it's only for the updater, not AWS operations
           mod({ ...deployOptions, aws, region, update: updater('Deploy', updateOptions) }, clean)
         })
         .catch(callback)

src/cli/flags.js

@@ -6,17 +6,16 @@ let minimist = require('minimist')
  */
 module.exports = function getFlags () {
   let alias = {
-    debug: [ 'd' ],
-    direct: [ 'dirty' ],
-    fast: [ 'f' ],
-    name: [ 'n' ],
+    debug:      [ 'd' ],
+    direct:     [ 'dirty' ],
+    fast:       [ 'f' ],
+    name:       [ 'n' ],
     production: [ 'p' ],
-    quiet: [ 'q' ],
-    static: [ 's' ],
-    tag: [ 'tags', 't' ],
-    verbose: [ 'v' ],
+    static:     [ 's' ],
+    tag:        [ 'tags', 't' ],
+    verbose:    [ 'v' ],
   }
-  let boolean = [ 'direct', 'debug', 'dry-run', 'eject', 'fast', 'no-hydrate', 'production', 'quiet', 'static', 'verbose' ]
+  let boolean = [ 'direct', 'debug', 'dry-run', 'eject', 'fast', 'no-hydrate', 'production', 'static', 'verbose' ]
   let def = { hydrate: true }
   let args = minimist(process.argv.slice(2), { alias, boolean, default: def })
   if (args._[0] === 'deploy') args._.splice(0, 1)
@@ -28,21 +27,20 @@ module.exports = function getFlags () {
 
   // TODO tidy up these properties
   return {
-    debug: logLevel === 'debug',
-    deployStage: args.production ? 'production' : 'staging',
-    eject: args.eject,
-    fast: args.fast,
-    isDirect: args.direct,
-    isDryRun: args['dry-run'] || args.eject,
-    isStatic: args.static,
-    name: args.name,
-    production: args.production,
-    prune: args.prune,
-    quiet: args.quiet,
-    shouldHydrate: args.hydrate,
-    srcDirs: args.direct && getSrcDirs(args._),
-    tags: args.tag ? Array.isArray(args.tag) ? args.tag : [ args.tag ] : [],
-    verbose: logLevel === 'verbose' || logLevel === 'debug',
+    debug:          logLevel === 'debug',
+    deployStage:    args.production ? 'production' : 'staging',
+    eject:          args.eject,
+    fast:           args.fast,
+    isDirect:       args.direct,
+    isDryRun:       args['dry-run'] || args.eject,
+    isStatic:       args.static,
+    name:           args.name,
+    production:     args.production,
+    prune:          args.prune,
+    shouldHydrate:  args.hydrate,
+    srcDirs:        args.direct && getSrcDirs(args._),
+    tags:           args.tag ? Array.isArray(args.tag) ? args.tag : [ args.tag ] : [],
+    verbose:        logLevel === 'verbose' || logLevel === 'debug',
   }
 }
 

src/cli/index.js

@@ -5,7 +5,7 @@ let { banner, updater } = require('@architect/utils')
 let _flags = require('./flags')
 let { version } = require('../../package.json')
 let pauser = require('../utils/pause-sandbox')
-// Initialized later with quiet flag
+let update = updater('Deploy')
 
 /**
  * `arc deploy`
@@ -17,20 +17,16 @@ let pauser = require('../utils/pause-sandbox')
  * -d|--direct|direct ........... direct deploy a specific function code/config
  * -s|--static|static ........... direct deploys /public to static s3 bucket
  * -v|--verbose|verbose ......... prints all output to console
- * -q|--quiet|quiet ............ suppresses most console output
  * -t|--tags|tags ............... add tags
  * -n|--name|name ............... customize stack name
  * --prune ...................... remove files that exist in static s3 bucket but do not exist in local /public folder
  * --dry-run .................... assemble CloudFormation sam.json but do not deploy remotely (useful for testing)
  */
-async function main (opts = {}) {
+async function main (/* opts = {} */) {
   let flags = _flags()
-  let { deployStage, quiet } = flags
-  // Use provided inventory or create new one
-  let inventory = opts.inventory || await _inventory({ deployStage, env: true })
-
-  // Use provided updater or create new one
-  let update = opts.update || updater('Deploy', { quiet })
+  let { deployStage } = flags
+  // Ignore Inventory if passed, and re-Inventory with deployStage set
+  let inventory = await _inventory({ deployStage, env: true })
 
   // Populate options, read args into `prune`, `verbose`, `production`, `tags`, `name`, etc.
   let options = {
@@ -66,27 +62,15 @@ module.exports = main
 // Allow direct invoke
 if (require.main === module) {
   (async function () {
-    let update
     try {
-      let flags = _flags()
       let inventory = await _inventory({})
       banner({ inventory, version: `Deploy ${version}` })
-      // Create updater at this level so it's accessible in catch block
-      update = updater('Deploy', { quiet: flags.quiet })
-      await main({ inventory, update })
+      await main({ inventory })
     }
     catch (err) {
       // Unpause the Sandbox watcher
       pauser.unpause()
-      // Reuse the same updater instance to preserve any internal state
-      if (update) {
-        update.error(err)
-      }
-      else {
-        // Fallback if updater wasn't created yet
-        let flags = _flags()
-        updater('Deploy', { quiet: flags.quiet }).error(err)
-      }
+      update.error(err)
       process.exit(1)
     }
   })()

test/unit/flags-test.js

@@ -96,42 +96,6 @@ test('Hydration enabled / disabled', t => {
   t.equal(flags().shouldHydrate, true, 'Lack of "--no-hydrate" flag sets shouldHydrate to true')
 })
 
-test('Quiet mode', t => {
-  t.plan(4)
-
-  args('--quiet')
-  t.ok(flags().quiet, '"--quiet" flag sets quiet')
-
-  args('-q')
-  t.ok(flags().quiet, '"-q" flag sets quiet')
-
-  args('')
-  t.notOk(flags().quiet, 'Lack of "--quiet" flag sets quiet to false')
-
-  // Test that quiet and verbose are independent
-  args('--verbose --quiet')
-  let result = flags()
-  t.ok(result.quiet && result.verbose, 'Quiet and verbose flags are independent and can both be set')
-})
-
-test('Verbose mode', t => {
-  t.plan(4)
-
-  args('--verbose')
-  t.ok(flags().verbose, '"--verbose" flag sets verbose')
-
-  args('-v')
-  t.ok(flags().verbose, '"-v" flag sets verbose')
-
-  args('')
-  t.notOk(flags().verbose, 'Lack of "--verbose" flag sets verbose to false')
-
-  // Test that verbose and quiet are independent
-  args('--quiet --verbose')
-  let result = flags()
-  t.ok(result.quiet && result.verbose, 'Verbose and quiet flags are independent and can both be set')
-})
-
 test('Tags', t => {
   t.plan(7)
   let tagA = 'foo', tagB = 'bar'