fix(toolkit): correcty load cdk.json file without context (#1900)

aws · Feb 27, 2019 · 7731565 · 7731565
1 parent f6adb7c
commit 7731565
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/packages/aws-cdk/lib/settings.ts b/packages/aws-cdk/lib/settings.ts
@@ -86,8 +86,8 @@ export class Context {
   }
 
   public everything(): {[key: string]: any} {
-    const b = this.bottom.get(this.bottomPrefixPath);
-    const t = this.top.get([]);
+    const b = this.bottom.get(this.bottomPrefixPath) || {};
+    const t = this.top.get([]) || {};
     return Object.assign(b, t);
   }
 

diff --git a/packages/aws-cdk/test/test.context.ts b/packages/aws-cdk/test/test.context.ts
@@ -110,4 +110,36 @@ export = {
 
     test.done();
   },
+
+  async 'surive missing new file'(test: Test) {
+    // GIVEN
+    await fs.writeJSON('cdk.json', { context: { boo: 'far' } });
+    const config = await new Configuration().load();
+
+    // WHEN
+    test.deepEqual(config.context.everything(), { boo: 'far' });
+    await config.saveContext();
+
+    // THEN
+    test.deepEqual(await fs.readJSON('cdk.context.json'), {});
+    test.deepEqual(await fs.readJSON('cdk.json'), { context: { boo: 'far' } });
+
+    test.done();
+  },
+
+  async 'surive no context in old file'(test: Test) {
+    // GIVEN
+    await fs.writeJSON('cdk.json', { });
+    await fs.writeJSON('cdk.context.json', { boo: 'far' });
+    const config = await new Configuration().load();
+
+    // WHEN
+    test.deepEqual(config.context.everything(), { boo: 'far' });
+    await config.saveContext();
+
+    // THEN
+    test.deepEqual(await fs.readJSON('cdk.context.json'), { boo: 'far' });
+
+    test.done();
+  },
 };