chore(release): v2.147.2 (#30698)

See CHANGELOG
aws · Jun 27, 2024 · f4b0897 · f4b0897
2 parents d3695d4 + 680cc43
commit f4b0897
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 102 deletions.
diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.147.2-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.1-alpha.0...v2.147.2-alpha.0) (2024-06-27)
+
 ## [2.147.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.0-alpha.0...v2.147.1-alpha.0) (2024-06-21)
 
 ## [2.147.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.146.0-alpha.0...v2.147.0-alpha.0) (2024-06-20)

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,12 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.147.2](https://github.com/aws/aws-cdk/compare/v2.147.1...v2.147.2) (2024-06-27)
+
+
+### Reverts
+
+* fix(core): overrideLogicalId validation ([#29708](https://github.com/aws/aws-cdk/pull/29708)) ([b196b13](https://github.com/aws/aws-cdk/commit/b196b13b0b8a54dcacadf87fdbe744772a6e6c4d))
+
 ## [2.147.1](https://github.com/aws/aws-cdk/compare/v2.147.0...v2.147.1) (2024-06-21)
 
 
 ### Reverts
 
-* route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` ([#30440](https://github.com/aws/aws-cdk/issues/30440))" ([#30606](https://github.com/aws/aws-cdk/issues/30606)) ([69eb617](https://github.com/aws/aws-cdk/commit/69eb617b45b5c4e495901d367d85e1edeea57e69)), closes [#30600](https://github.com/aws/aws-cdk/issues/30600)
+* route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` ([#30440](https://github.com/aws/aws-cdk/issues/30440)) ([a3d9b10](https://github.com/aws/aws-cdk/commit/a3d9b10ad9036486961f74e852493aa9684cfdb4))
 
 ## [2.147.0](https://github.com/aws/aws-cdk/compare/v2.146.0...v2.147.0) (2024-06-20)
 

diff --git a/packages/aws-cdk-lib/core/lib/cfn-element.ts b/packages/aws-cdk-lib/core/lib/cfn-element.ts
@@ -81,33 +81,14 @@ export abstract class CfnElement extends Construct {
   /**
    * Overrides the auto-generated logical ID with a specific ID.
    * @param newLogicalId The new logical ID to use for this stack element.
-   *
-   * @throws an error if `logicalId` has already been locked
-   * @throws an error if `newLogicalId` is empty
-   * @throws an error if `newLogicalId` contains more than 255 characters
-   * @throws an error if `newLogicalId` contains non-alphanumeric characters
-   *
-   * @see https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/resources-section-structure.html#resources-section-structure-logicalid
    */
   public overrideLogicalId(newLogicalId: string) {
     if (this._logicalIdLocked) {
       throw new Error(`The logicalId for resource at path ${Node.of(this).path} has been locked and cannot be overridden\n` +
         'Make sure you are calling "overrideLogicalId" before Stack.exportValue');
+    } else {
+      this._logicalIdOverride = newLogicalId;
     }
-
-    if (!Token.isUnresolved(newLogicalId)) {
-      if (!newLogicalId) {
-        throw new Error('Cannot set an empty logical ID');
-      }
-      if (newLogicalId.length > 255) {
-        throw new Error(`Invalid logical ID override: '${newLogicalId}'. It must be at most 255 characters long, got ${newLogicalId.length} characters.`);
-      }
-      if (!newLogicalId.match(/^[A-Za-z0-9]+$/)) {
-        throw new Error(`Invalid logical ID override: '${newLogicalId}'. It must only contain alphanumeric characters.`);
-      }
-    }
-
-    this._logicalIdOverride = newLogicalId;
   }
 
   /**

diff --git a/packages/aws-cdk-lib/core/test/stack.test.ts b/packages/aws-cdk-lib/core/test/stack.test.ts
@@ -1370,109 +1370,37 @@ describe('stack', () => {
 
     // THEN - producers are the same
     expect(() => {
-      resourceM.overrideLogicalId('OVERRIDELOGICALID');
+      resourceM.overrideLogicalId('OVERRIDE_LOGICAL_ID');
     }).toThrow(/The logicalId for resource at path Producer\/ResourceXXX has been locked and cannot be overridden/);
   });
 
-  test('throw error if overrideLogicalId contains non-alphanumeric characters', () => {
-    // GIVEN: manual
-    const appM = new App();
-    const producerM = new Stack(appM, 'Producer');
-    const resourceM = new CfnResource(producerM, 'ResourceXXX', { type: 'AWS::Resource' });
-
-    // THEN - producers are the same
-    expect(() => {
-      resourceM.overrideLogicalId('INVALID_LOGICAL_ID');
-    }).toThrow(/must only contain alphanumeric characters/);
-  });
-
-  test('throw error if overrideLogicalId is over 255 characters', () => {
-    // GIVEN: manual
-    const appM = new App();
-    const producerM = new Stack(appM, 'Producer');
-    const resourceM = new CfnResource(producerM, 'ResourceXXX', { type: 'AWS::Resource' });
-
-    // THEN - producers are the same
-    expect(() => {
-      resourceM.overrideLogicalId(
-        // 256 character long string of "aaaa..."
-        Array(256).fill('a').join(''),
-      );
-    }).toThrow(/must be at most 255 characters long, got 256 characters/);
-  });
-
-  test('throw error if overrideLogicalId is an empty string', () => {
-    // GIVEN: manual
-    const appM = new App();
-    const producerM = new Stack(appM, 'Producer');
-    const resourceM = new CfnResource(producerM, 'ResourceXXX', { type: 'AWS::Resource' });
-
-    // THEN - producers are the same
-    expect(() => {
-      resourceM.overrideLogicalId('');
-    }).toThrow('Cannot set an empty logical ID');
-  });
-
   test('do not throw error if overrideLogicalId is used and logicalId is not locked', () => {
     // GIVEN: manual
     const appM = new App();
     const producerM = new Stack(appM, 'Producer');
     const resourceM = new CfnResource(producerM, 'ResourceXXX', { type: 'AWS::Resource' });
 
     // THEN - producers are the same
-    resourceM.overrideLogicalId('OVERRIDELOGICALID');
-    producerM.exportValue(resourceM.getAtt('Att'));
-
-    const template = appM.synth().getStackByName(producerM.stackName).template;
-    expect(template).toMatchObject({
-      Outputs: {
-        ExportsOutputFnGetAttOVERRIDELOGICALIDAtt76AC816F: {
-          Export: {
-            Name: 'Producer:ExportsOutputFnGetAttOVERRIDELOGICALIDAtt76AC816F',
-          },
-          Value: {
-            'Fn::GetAtt': [
-              'OVERRIDELOGICALID',
-              'Att',
-            ],
-          },
-        },
-      },
-      Resources: {
-        OVERRIDELOGICALID: {
-          Type: 'AWS::Resource',
-        },
-      },
-    });
-  });
-
-  test('do not throw if overrideLogicalId is unresolved', () => {
-    // GIVEN: manual
-    const appM = new App();
-    const producerM = new Stack(appM, 'Producer');
-    const resourceM = new CfnResource(producerM, 'ResourceXXX', { type: 'AWS::Resource' });
-
-    // THEN - producers are the same
-    resourceM.overrideLogicalId(Lazy.string({ produce: () => 'INVALID_LOGICAL_ID' }));
+    resourceM.overrideLogicalId('OVERRIDE_LOGICAL_ID');
     producerM.exportValue(resourceM.getAtt('Att'));
 
     const template = appM.synth().getStackByName(producerM.stackName).template;
     expect(template).toMatchObject({
       Outputs: {
-        ExportsOutputFnGetAttINVALIDLOGICALIDAtt6CB9E5B9: {
+        ExportsOutputFnGetAttOVERRIDELOGICALIDAtt2DD28019: {
           Export: {
-            Name: 'Producer:ExportsOutputFnGetAttINVALIDLOGICALIDAtt6CB9E5B9',
+            Name: 'Producer:ExportsOutputFnGetAttOVERRIDELOGICALIDAtt2DD28019',
           },
           Value: {
             'Fn::GetAtt': [
-              'INVALID_LOGICAL_ID',
+              'OVERRIDE_LOGICAL_ID',
               'Att',
             ],
           },
         },
       },
       Resources: {
-        INVALID_LOGICAL_ID: {
+        OVERRIDE_LOGICAL_ID: {
           Type: 'AWS::Resource',
         },
       },

diff --git a/version.v2.json b/version.v2.json
@@ -1,4 +1,4 @@
 {
-  "version": "2.147.1",
-  "alphaVersion": "2.147.1-alpha.0"
+  "version": "2.147.2",
+  "alphaVersion": "2.147.2-alpha.0"
 }