Improve error message on template parsing failures

axa-group · Oct 10, 2019 · 01f633b · 01f633b
1 parent a333f7a
commit 01f633b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Update `npm` dependencies to fix:
   - [WS-2019-0291](https://github.com/wycats/handlebars.js/issues/1558)
 
+### Added
+
+- Improve error message on template parsing failures
+
 ## [1.1.3](https://github.com/axa-group/arm-template-merge/compare/v1.1.2...v1.1.3) — 2019-09-25
 
 ### Security

diff --git a/bin/arm-template-merge b/bin/arm-template-merge
@@ -134,7 +134,13 @@ async function loadTemplate(inFile) {
   }
 
   const json = jsonBuf.toString('utf8');
-  const template = JSON.parse(json);
+
+  let template;
+  try {
+    template = JSON.parse(json);
+  } catch (err) {
+    throw new Error(`Template '${inFile}' could not be parsed: ${err.message}`);
+  }
 
   const expectedKeys = ['$schema', 'contentVersion'];
 

diff --git a/test/cli.test.js b/test/cli.test.js
@@ -54,7 +54,7 @@ describe('CLI', () => {
     rfn.mockRestore();
 
     expect(res.exitCode).toBe(1);
-    expect(res.stderr).toMatch(/^Error:/);
+    expect(res.stderr).toMatch(/^Error: Template 'templates\/website.json' could not be parsed:/);
   });
 
   it('should be able to merge template files into a new file', async () => {