Merge branch 'master' into benisrae/eks-fix-version-update

aws · Apr 23, 2020 · d6a0d69 · d6a0d69
2 parents 1be46b6 + 022eb66
commit d6a0d69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 48 deletions.
diff --git a/packages/aws-cdk/lib/settings.ts b/packages/aws-cdk/lib/settings.ts
@@ -68,8 +68,6 @@ export class Configuration {
     this._projectConfig = await loadAndLog(PROJECT_CONFIG);
     this._projectContext = await loadAndLog(PROJECT_CONTEXT);
 
-    await this.migrateLegacyContext();
-
     this.context = new Context(
       this.commandLineContext,
       this.projectConfig.subSettings([CONTEXT_KEY]).makeReadOnly(),
@@ -99,34 +97,6 @@ export class Configuration {
 
     return this;
   }
-
-  /**
-   * Migrate context from the 'context' field in the projectConfig object to the dedicated object
-   *
-   * Only migrate context whose key contains a ':', to migrate only context generated
-   * by context providers.
-   */
-  private async migrateLegacyContext() {
-    const legacyContext = this.projectConfig.get([CONTEXT_KEY]);
-    if (legacyContext === undefined) { return; }
-
-    const toMigrate = Object.keys(legacyContext).filter(k => k.indexOf(':') > -1);
-    if (toMigrate.length === 0) { return; }
-
-    for (const key of toMigrate) {
-      this.projectContext.set([key], legacyContext[key]);
-      this.projectConfig.unset([CONTEXT_KEY, key]);
-    }
-
-    // If the source object is empty now, completely remove it
-    if (Object.keys(this.projectConfig.get([CONTEXT_KEY])).length === 0) {
-      this.projectConfig.unset([CONTEXT_KEY]);
-    }
-
-    // Save back
-    await this.projectConfig.save(PROJECT_CONFIG);
-    await this.projectContext.save(PROJECT_CONTEXT);
-  }
 }
 
 async function loadAndLog(fileName: string): Promise<Settings> {

diff --git a/packages/aws-cdk/test/context.test.ts b/packages/aws-cdk/test/context.test.ts
@@ -39,21 +39,6 @@ test('load context from both files if available', async () => {
   expect(config.context.get('boo')).toBe('far');
 });
 
-test('context with colons gets migrated to new file', async () => {
-  // GIVEN
-  await fs.writeJSON('cdk.context.json', { foo: 'bar' });
-  await fs.writeJSON('cdk.json', { context: { 'boo': 'far', 'boo:boo': 'far:far' } });
-  const config = await new Configuration().load();
-
-  // WHEN
-  config.context.set('baz', 'quux');
-  await config.saveContext();
-
-  // THEN
-  expect(await fs.readJSON('cdk.context.json')).toEqual({ 'foo': 'bar', 'boo:boo': 'far:far', 'baz': 'quux' });
-  expect(await fs.readJSON('cdk.json')).toEqual({ context: { boo: 'far'} });
-});
-
 test('deleted context disappears from new file', async () => {
   // GIVEN
   await fs.writeJSON('cdk.context.json', { foo: 'bar' });
@@ -84,7 +69,7 @@ test('clear deletes from new file', async () => {
   expect(await fs.readJSON('cdk.json')).toEqual({ context: { boo: 'far' } });
 });
 
-test('surive missing new file', async () => {
+test('context is preserved in the location from which it is read', async () => {
   // GIVEN
   await fs.writeJSON('cdk.json', { context: { 'boo:boo' : 'far' } });
   const config = await new Configuration().load();
@@ -94,8 +79,8 @@ test('surive missing new file', async () => {
   await config.saveContext();
 
   // THEN
-  expect(await fs.readJSON('cdk.context.json')).toEqual({ 'boo:boo' : 'far' });
-  expect(await fs.readJSON('cdk.json')).toEqual({});
+  expect(await fs.readJSON('cdk.context.json')).toEqual({});
+  expect(await fs.readJSON('cdk.json')).toEqual({ context: { 'boo:boo' : 'far' } });
 });
 
 test('surive no context in old file', async () => {