Prepare for v4.0.4 + add blurb explaining why a certain route exists

Author: amazon-meaisiah

cloudformation/template.yaml

@@ -184,7 +184,7 @@ Resources:
         schemes:
         - https
         paths:
-          # Version marker - please don't delete
+          # Version marker - please don't delete (this is how we track version usage)
           /version/{v4_0_3}:
             options:
               consumes:

scripts/internal/execute-tasks.js

@@ -21,8 +21,14 @@ module.exports = async tasks => {
         },
         err => {
           console.error(red(`Task errored: ${name}`))
-          console.error(red(err.message))
-          process.exitCode = 1
+          // Pass `fail` to cause it to fail without also causing an additional error message to
+          // display. (Good for if an error message was already displayed previously.)
+          if (typeof err === 'number') {
+            process.exitCode = err
+          } else {
+            console.error(red(err.message))
+            process.exitCode = 1
+          }
         }
       )
       try {

scripts/internal/util.js

@@ -41,13 +41,14 @@ async function run (name, args, { action, target, ...opts }) {
 
   if (result.error != null) {
     console.error(red(`${action} for ${target || 'root'} errored\n${inspect(result.error, { colors: true })}`))
-    return false
+    // eslint-disable-next-line no-throw-literal
+    throw 1
   } else {
     console.error(
       green(`${action} for `) + (target ? blue(target) : green('root')) + green(' completed') +
       computeExtra(result)
     )
-    return result.status === 0
+    if (result.status) throw result.status
   }
 }
 

scripts/npm.js

@@ -7,6 +7,11 @@ const { run, packageList } = require('./internal/util')
 
 ;(async () => {
   for (const { target, resolved } of packageList) {
-    await run('npm', process.argv.slice(2), { action: 'Execution', target, cwd: resolved })
+    try {
+      await run('npm', process.argv.slice(2), { action: 'Execution', target, cwd: resolved })
+    } catch (e) {
+      if (typeof e === 'number') process.exitCode = e
+      else throw e
+    }
   }
 })()

scripts/run.js

@@ -123,6 +123,12 @@ require('./internal/execute-tasks.js')({
     await Promise.all([
       fs.writeFile(p('package.json'), JSON.stringify(rootPkg, null, 2) + '\n', 'utf-8'),
       updatePackage(p('package-lock.json'), 'package-lock.json'),
+      fs.readFile(p('cloudformation/template.yaml'), { encoding: 'utf-8' })
+        .then(content => content.replace(
+          /\/version\/{v\d+_\d+_\d+}:/g,
+          `/version/{v${newVersion.replace(/\./g, '_')}}:`
+        ))
+        .then(replaced => fs.writeFile(p('cloudformation/template.yaml'), replaced, { encoding: 'utf-8' })),
       ...packageList
         .filter(p => p.target !== '')
         .map(async ({ target, resolved }) => Promise.all([
@@ -134,12 +140,21 @@ require('./internal/execute-tasks.js')({
     console.log(green('Committing updated packages'))
 
     await exec('git', [
-      'commit', '--message', `v${newVersion}`,
-      'lambdas/static-asset-uploader/build',
+      'add',
+      p('cloudformation/template.yaml'),
+      p('lambdas/static-asset-uploader/build'),
+      ...(
+        await Promise.all(
+          packageList
+            .map(p => path.join(p.target, 'node_modules'))
+            .map(f => fs.access(f, fs.constants.R_OK).catch(() => null))
+        )
+      ).filter(f => f != null),
       ...packageList.map(p => path.join(p.target, 'package.json')),
       ...packageList.map(p => path.join(p.target, 'package-lock.json'))
     ])
 
+    await exec('git', ['commit', '--message', `v${newVersion}`])
     await exec('git', ['tag', `v${newVersion}`])
 
     console.log(green('Release tag created: ') + blue(`v${newVersion}`))