Add scripts to automate versioning

Author: amazon-meaisiah

BUILDING.md

@@ -200,6 +200,10 @@ Gets the output from the CFN stack, writes a local version of the config.js file
 
 Lint all code in the repo using ESLint and `cfn-lint`.
 
+### `node run version --inc=patch|minor|major|prepatch|preminor|premajor|prerelease --type=beta`
+
+Update all package versions with a version increment and optional prerelease identifier (as used by [semver](https://www.npmjs.com/package/semver)), and create a commit with the updated files and all files that were already staged prior to running this command.
+
 ### `node run test`
 
 Run all the unit tests.

package-lock.json

@@ -30,6 +30,7 @@
     "memorystream": "^0.3.1",
     "node-fetch": "^2.3.0",
     "request-promise": "^4.2.5",
+    "semver": "^7.3.2",
     "xml-js": "^1.6.11"
   },
   "dependencies": {}

package.json

@@ -36,15 +36,15 @@ function computeExtra ({ status, signal }) {
 }
 
 async function run (name, args, { action, target, ...opts }) {
-  console.error(green(`${action} for `) + blue(target) + green(' started'))
+  console.error(green(`${action} for `) + (target ? blue(target) : green('root')) + green(' started'))
   const result = await exec(name, args, opts)
 
   if (result.error != null) {
-    console.error(red(`${action} for ${target} errored\n${inspect(result.error, { colors: true })}`))
+    console.error(red(`${action} for ${target || 'root'} errored\n${inspect(result.error, { colors: true })}`))
     return false
   } else {
     console.error(
-      green(`${action} for `) + blue(target) + green(' completed') +
+      green(`${action} for `) + (target ? blue(target) : green('root')) + green(' completed') +
       computeExtra(result)
     )
     return result.status === 0
@@ -58,11 +58,12 @@ const packageList = [
   'dev-portal',
   'lambdas/backend',
   'lambdas/catalog-updater',
+  'lambdas/cloudfront-security',
   'lambdas/listener',
   'lambdas/static-asset-uploader',
   'lambdas/user-group-importer'
 ].map(rel => ({
-  target: `/${rel}`,
+  target: rel,
   resolved: p(rel)
 }))
 

scripts/internal/util.js

@@ -3,6 +3,7 @@
 // Note: this *MUST NOT* globally depend on any module installed in `node_modules`, as it could be
 // loaded before they're installed.
 
+const path = require('path')
 const { p, run, exec, packageList } = require('./internal/util.js')
 const { blue, green } = require('./internal/color').stdout
 const deployTemplate = require('./internal/deploy-template.js')
@@ -31,14 +32,14 @@ require('./internal/execute-tasks.js')({
     const fse = require('fs-extra')
 
     for (const { target, resolved } of packageList) {
-      console.log(green('Deleting ') + blue(target))
-      await fse.remove(resolved)
+      console.log(green('Deleting ') + (target ? blue(target) : green('root')))
+      await fse.remove(path.join(resolved, 'node_modules'))
     }
 
     console.log(green('Preparing dependencies...'))
     // We have the package and distribution bundles here in source control, and these should only
     // be updated with that dependency. (Removing them causes build issues.)
-    await run('git', ['checkout', '--', 'dev-portal/node_modules'])
+    await exec('git', ['checkout', '--', 'dev-portal/node_modules'])
 
     await this.install()
   },
@@ -89,5 +90,58 @@ require('./internal/execute-tasks.js')({
 
   async 'cfn-lint' () {
     await exec('cfn-lint')
+  },
+
+  async 'version' ({ inc: increment, type }) {
+    if (increment == null) {
+      throw new TypeError('Increment is required')
+    }
+
+    if (!/^(?:patch|minor|major|prepatch|preminor|premajor|prerelease)$/.test(increment)) {
+      throw new TypeError('Increment is invalid')
+    }
+
+    // Note: this might not necessarily be installed yet, so it can't be loaded globally.
+    const fs = require('fs-extra')
+    const inc = require('semver/functions/inc')
+
+    await this.build()
+
+    console.log(green('Updating "version" field in ') + blue('package.json'))
+    const rootPkg = JSON.parse(await fs.readFile(p('package.json'), 'utf-8'))
+    const newVersion = inc(rootPkg.version, increment, type)
+
+    async function updatePackage (resolved, target) {
+      console.log(green('Updating "version" field in ') + blue(target))
+      const pkg = JSON.parse(await fs.readFile(resolved, 'utf-8'))
+      pkg.version = newVersion
+      fs.writeFile(resolved, JSON.stringify(pkg, null, 2) + '\n', 'utf-8')
+    }
+
+    rootPkg.version = newVersion
+
+    await Promise.all([
+      fs.writeFile(p('package.json'), JSON.stringify(rootPkg, null, 2) + '\n', 'utf-8'),
+      updatePackage(p('package-lock.json'), 'package-lock.json'),
+      ...packageList
+        .filter(p => p.target !== '')
+        .map(async ({ target, resolved }) => Promise.all([
+          updatePackage(path.join(resolved, 'package.json'), path.join(target, 'package.json')),
+          updatePackage(path.join(resolved, 'package-lock.json'), path.join(target, 'package-lock.json'))
+        ]))
+    ])
+
+    console.log(green('Committing updated packages'))
+
+    await exec('git', [
+      'commit', '--message', `v${newVersion}`,
+      'lambdas/static-asset-uploader/build',
+      ...packageList.map(p => path.join(p.target, 'package.json')),
+      ...packageList.map(p => path.join(p.target, 'package-lock.json'))
+    ])
+
+    await exec('git', ['tag', `v${newVersion}`])
+
+    console.log(green('Release tag created: ') + blue(`v${newVersion}`))
   }
 })