decorate script fix (github#18201)

rachmari · web-flow · commit c535420c772e · 2021-03-15T18:40:00.000-07:00
diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js
@@ -39,6 +39,6 @@ module.exports = [
   "repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d",
   "someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd",
   "tjenkinson/gh-action-auto-merge-dependency-updates@4d7756c04d9d999c5968697a621b81c47f533d61",
-  "EndBug/add-and-commit@9358097a71ad9fb9e2f9624c6098c89193d83575",
+  "EndBug/add-and-commit@b3c7c1e078a023d75fb0bd326e02962575ce0519",
   "dorny/paths-filter@eb75a1edc117d3756a18ef89958ee59f9500ba58",
 ];
diff --git a/.github/workflows/openapi-decorate.yml b/.github/workflows/openapi-decorate.yml
@@ -25,13 +25,10 @@ jobs:
         run: script/rest/update-files.js --decorate-only
 
       - name: Check in the decorated files
-        uses: EndBug/add-and-commit@9358097a71ad9fb9e2f9624c6098c89193d83575
+        uses: EndBug/add-and-commit@b3c7c1e078a023d75fb0bd326e02962575ce0519
         with:
           # The arguments for the `git add` command
           add: 'lib/rest/static/decorated'
 
           # The message for the commit
           message: 'Add decorated OpenAPI schema files'
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this line unchanged
diff --git a/script/rest/update-files.js b/script/rest/update-files.js
@@ -91,17 +91,23 @@ async function decorate () {
   }, {})
 
   for (const [schemaName, schema] of Object.entries(dereferencedSchemas)) {
-    // munge OpenAPI definitions object in an array of operations objects
-    const operations = await getOperations(schema)
-
-    // process each operation, asynchronously rendering markdown and stuff
-    await Promise.all(operations.map(operation => operation.process()))
-
-    const filename = path.join(decoratedPath, `${schemaName}.json`)
-      .replace('.deref', '')
-    // write processed operations to disk
-    fs.writeFileSync(filename, JSON.stringify(operations, null, 2))
-
-    console.log('Wrote', path.relative(process.cwd(), filename))
+    try {
+      // munge OpenAPI definitions object in an array of operations objects
+      const operations = await getOperations(schema)
+
+      // process each operation, asynchronously rendering markdown and stuff
+      await Promise.all(operations.map(operation => operation.process()))
+
+      const filename = path.join(decoratedPath, `${schemaName}.json`)
+        .replace('.deref', '')
+      // write processed operations to disk
+      fs.writeFileSync(filename, JSON.stringify(operations, null, 2))
+
+      console.log('Wrote', path.relative(process.cwd(), filename))
+    } catch (error) {
+      console.error(error)
+      console.log('🐛 Whoops! It looks like the decorator script wasn\'t able to parse the dereferenced schema. A recent change may not yet be supported by the decorator. Please reach out in the #docs-engineering slack channel for help.')
+      process.exit(1)
+    }
   }
 }
