chore(core): revert "allow disabling of LogicalID Metadata in case of large manifest" (#20421)

#20387 tests fail on our merge to v2, likely because CDK v2 uses the new style stack synthesis by default and generates a lot more metadata. Reverting for now to unblock the release.

Author: Chriscbr

packages/@aws-cdk/core/lib/cfn-element.ts

@@ -1,5 +1,4 @@
 import * as cxschema from '@aws-cdk/cloud-assembly-schema';
-import * as cxapi from '@aws-cdk/cx-api';
 import { Construct, Node } from 'constructs';
 
 // v2 - keep this import as a separate section to reduce merge conflict when forward merging with the v2 branch.
@@ -65,9 +64,7 @@ export abstract class CfnElement extends CoreConstruct {
       displayHint: `${notTooLong(Node.of(this).path)}.LogicalID`,
     });
 
-    if (!this.node.tryGetContext(cxapi.DISABLE_LOGICAL_ID_METADATA)) {
-      Node.of(this).addMetadata(cxschema.ArtifactMetadataEntryType.LOGICAL_ID, this.logicalId, this.constructor);
-    }
+    Node.of(this).addMetadata(cxschema.ArtifactMetadataEntryType.LOGICAL_ID, this.logicalId, this.constructor);
   }
 
   /**

packages/@aws-cdk/core/test/synthesis.test.ts

@@ -36,6 +36,7 @@ describe('synthesis', () => {
         },
       }),
     });
+
   });
 
   test('synthesis respects disabling tree metadata', () => {
@@ -44,87 +45,7 @@ describe('synthesis', () => {
     });
     const assembly = app.synth();
     expect(list(assembly.directory)).toEqual(['cdk.out', 'manifest.json']);
-  });
-
-  test('synthesis respects disabling logicalId metadata', () => {
-    const app = new cdk.App({
-      context: { 'aws:cdk:disable-logicalId-metadata': true },
-    });
-    const stack = new cdk.Stack(app, 'one-stack');
-    new cdk.CfnResource(stack, 'MagicResource', { type: 'Resource::Type' });
-
-    // WHEN
-    const session = app.synth();
-
-    // THEN
-    expect(session.manifest).toEqual({
-      version: cxschema.Manifest.version(),
-      artifacts: {
-        'Tree': {
-          type: 'cdk:tree',
-          properties: { file: 'tree.json' },
-        },
-        'one-stack': {
-          type: 'aws:cloudformation:stack',
-          environment: 'aws://unknown-account/unknown-region',
-          properties: {
-            templateFile: 'one-stack.template.json',
-            validateOnSynth: false,
-          },
-          displayName: 'one-stack',
-          // no metadata, because the only entry was a logicalId
-        },
-      },
-    });
-  });
-
-  test('synthesis respects disabling logicalId metadata, and does not disable other metadata', () => {
-    const app = new cdk.App({
-      context: { 'aws:cdk:disable-logicalId-metadata': true },
-      stackTraces: false,
-    });
-    const stack = new cdk.Stack(app, 'one-stack', { tags: { boomTag: 'BOOM' } });
-    new cdk.CfnResource(stack, 'MagicResource', { type: 'Resource::Type' });
-
-    // WHEN
-    const session = app.synth();
 
-    // THEN
-    expect(session.manifest).toEqual({
-      version: cxschema.Manifest.version(),
-      artifacts: {
-        'Tree': {
-          type: 'cdk:tree',
-          properties: { file: 'tree.json' },
-        },
-        'one-stack': {
-          type: 'aws:cloudformation:stack',
-          environment: 'aws://unknown-account/unknown-region',
-          properties: {
-            templateFile: 'one-stack.template.json',
-            validateOnSynth: false,
-            tags: {
-              boomTag: 'BOOM',
-            },
-          },
-          displayName: 'one-stack',
-          metadata: {
-            '/one-stack': [
-              {
-                type: 'aws:cdk:stack-tags',
-                data: [
-                  {
-                    key: 'boomTag',
-                    value: 'BOOM',
-                  },
-                ],
-              },
-            ],
-          },
-          // no logicalId entry
-        },
-      },
-    });
   });
 
   test('single empty stack', () => {
@@ -137,6 +58,7 @@ describe('synthesis', () => {
 
     // THEN
     expect(list(session.directory).includes('one-stack.template.json')).toEqual(true);
+
   });
 
   test('some random construct implements "synthesize"', () => {
@@ -190,6 +112,7 @@ describe('synthesis', () => {
         },
       },
     });
+
   });
 
   test('random construct uses addCustomSynthesis', () => {
@@ -249,6 +172,7 @@ describe('synthesis', () => {
         },
       },
     });
+
   });
 
   testDeprecated('it should be possible to synthesize without an app', () => {
@@ -296,6 +220,7 @@ describe('synthesis', () => {
     expect(stack.templateFile).toEqual('hey.json');
     expect(stack.parameters).toEqual({ paramId: 'paramValue', paramId2: 'paramValue2' });
     expect(stack.environment).toEqual({ region: 'us-east-1', account: 'unknown-account', name: 'aws://unknown-account/us-east-1' });
+
   });
 });
 

packages/@aws-cdk/cx-api/lib/app.ts

@@ -39,12 +39,6 @@ export const DISABLE_ASSET_STAGING_CONTEXT = 'aws:cdk:disable-asset-staging';
  */
 export const DISABLE_METADATA_STACK_TRACE = 'aws:cdk:disable-stack-trace';
 
-/**
- * If this context key is set, the CDK will not store logical ID
- * metadata in the manifest.
- */
-export const DISABLE_LOGICAL_ID_METADATA = 'aws:cdk:disable-logicalId-metadata';
-
 /**
  * Run bundling for stacks specified in this context key
  */