-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(core): logical IDs are not allowed to start with digits (#26821)
The resource logical ID validation regex (`VALID_LOGICALID_REGEX`) is updated to be consistent with the [CloudFormation documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/resources-section-structure.html) which says that logical IDs are alphanumeric. Closes #26075. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
- Loading branch information
Showing
11 changed files
with
465 additions
and
1 deletion.
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
...k-testing/framework-integ/test/core/test/integ.logical-id.js.snapshot/Default.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "33.0.0", | ||
| "files": { | ||
| "b9a87c2e40857e399e6c073cc5328b4e4bf6bec9e11979520b464f48086188a3": { | ||
| "source": { | ||
| "path": "Default.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "b9a87c2e40857e399e6c073cc5328b4e4bf6bec9e11979520b464f48086188a3.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
54 changes: 54 additions & 0 deletions
54
...testing/framework-integ/test/core/test/integ.logical-id.js.snapshot/Default.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| { | ||
| "Resources": { | ||
| "01234test13C610BE": { | ||
| "Type": "AWS::SQS::Queue", | ||
| "Properties": { | ||
| "VisibilityTimeout": 300 | ||
| }, | ||
| "UpdateReplacePolicy": "Delete", | ||
| "DeletionPolicy": "Delete" | ||
| }, | ||
| "test01234CC388E2E": { | ||
| "Type": "AWS::SQS::Queue", | ||
| "Properties": { | ||
| "VisibilityTimeout": 300 | ||
| }, | ||
| "UpdateReplacePolicy": "Delete", | ||
| "DeletionPolicy": "Delete" | ||
| } | ||
| }, | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
...est/integ.logical-id.js.snapshot/LogicalIdTestDefaultTestDeployAssert178196BF.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "33.0.0", | ||
| "files": { | ||
| "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { | ||
| "source": { | ||
| "path": "LogicalIdTestDefaultTestDeployAssert178196BF.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
36 changes: 36 additions & 0 deletions
36
...t/integ.logical-id.js.snapshot/LogicalIdTestDefaultTestDeployAssert178196BF.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
...ages/@aws-cdk-testing/framework-integ/test/core/test/integ.logical-id.js.snapshot/cdk.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"version":"33.0.0"} |
12 changes: 12 additions & 0 deletions
12
...s/@aws-cdk-testing/framework-integ/test/core/test/integ.logical-id.js.snapshot/integ.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "version": "33.0.0", | ||
| "testCases": { | ||
| "LogicalIdTest/DefaultTest": { | ||
| "stacks": [ | ||
| "Default" | ||
| ], | ||
| "assertionStack": "LogicalIdTest/DefaultTest/DeployAssert", | ||
| "assertionStackName": "LogicalIdTestDefaultTestDeployAssert178196BF" | ||
| } | ||
| } | ||
| } |
117 changes: 117 additions & 0 deletions
117
...aws-cdk-testing/framework-integ/test/core/test/integ.logical-id.js.snapshot/manifest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| { | ||
| "version": "33.0.0", | ||
| "artifacts": { | ||
| "Default.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "Default.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "Default": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "Default.template.json", | ||
| "validateOnSynth": false, | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", | ||
| "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", | ||
| "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b9a87c2e40857e399e6c073cc5328b4e4bf6bec9e11979520b464f48086188a3.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "Default.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "Default.assets" | ||
| ], | ||
| "metadata": { | ||
| "/Default/01234test/Resource": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "01234test13C610BE" | ||
| } | ||
| ], | ||
| "/Default/test01234/Resource": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "test01234CC388E2E" | ||
| } | ||
| ], | ||
| "/Default/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/Default/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "Default" | ||
| }, | ||
| "LogicalIdTestDefaultTestDeployAssert178196BF.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "LogicalIdTestDefaultTestDeployAssert178196BF.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "LogicalIdTestDefaultTestDeployAssert178196BF": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "LogicalIdTestDefaultTestDeployAssert178196BF.template.json", | ||
| "validateOnSynth": false, | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", | ||
| "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", | ||
| "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "LogicalIdTestDefaultTestDeployAssert178196BF.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "LogicalIdTestDefaultTestDeployAssert178196BF.assets" | ||
| ], | ||
| "metadata": { | ||
| "/LogicalIdTest/DefaultTest/DeployAssert/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/LogicalIdTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "LogicalIdTest/DefaultTest/DeployAssert" | ||
| }, | ||
| "Tree": { | ||
| "type": "cdk:tree", | ||
| "properties": { | ||
| "file": "tree.json" | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.