fix(iam): incorrect input for AccountPrincipal is building successfully #30559

duranbe · 2024-06-15T21:19:00Z

Reason for this change

There is no validation and test that the AWS Account Id when creating AccountPrincipal Object. In my case I missed a digit when copy pasting an account id and the build still passed, the typo has been caught only during the code review process

Description of changes

Adding simple regex to check that AWS Id is 12 digits long & update error message

Description of how you validated changes

Existing tests are passing and added 2 of them

Checklist

My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

aws-cdk-automation

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

duranbe · 2024-06-15T21:46:38Z

Logs are quite odd

[4/4] Building fresh packages...
error /codebuild/output/src3225815236/src/github.com/aws/aws-cdk/node_modules/@lerna/create/node_modules/nx, /codebuild/output/src3225815236/src/github.com/aws/aws-cdk/node_modules/@nx/devkit/node_modules/nx, /codebuild/output/src3225815236/src/github.com/aws/aws-cdk/node_modules/lerna/node_modules/nx: Command failed.
Exit code: 135
Command: node ./bin/post-install
Arguments: 
Directory: /codebuild/output/src3225815236/src/github.com/aws/aws-cdk/node_modules/@lerna/create/node_modules/nx
Output:
Bus error (core dumped)
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.

Seems issue with yarn/nx

TheRealAmazonKendra · 2024-06-21T21:18:26Z

packages/aws-cdk-lib/aws-iam/lib/principals.ts

  /**
   *
   * @param accountId AWS account ID (i.e. '123456789012')
   */
  constructor(public readonly accountId: any) {
    super(new StackDependentToken(stack => `arn:${stack.partition}:iam::${accountId}:root`).toString());
-    if (!cdk.Token.isUnresolved(accountId) && typeof accountId !== 'string') {
-      throw new Error('accountId should be of type string');
+    if (!cdk.Token.isUnresolved(accountId) && typeof accountId !== 'string' && !this.accountIdRegExp.test(accountId)) {


While you're at it, maybe we should check to see that all characters in the string are digits.

It's covered with the regex new RegExp('^[0-9]{12}$'); as restricting only digits to 0-9 (could also be \d, but 0-9 is easier to read imo)

TheRealAmazonKendra · 2024-06-21T21:19:01Z

This build failure can't possibly have anything to do with this change... I'll retrigger it.

TheRealAmazonKendra · 2024-06-21T21:19:08Z

@Mergifyio update

mergify · 2024-06-21T21:19:17Z

update

✅ Branch has been successfully updated

TheRealAmazonKendra · 2024-06-21T21:19:54Z

For fixes, the title should describe the bug, not the solution. Could you please update it?

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

aws-cdk-automation

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

duranbe · 2024-06-24T15:32:20Z

Hey Kendra, thanks for the review and restarting the build

For fixes, the title should describe the bug, not the solution. Could you please update it?

Done ! Is it better with this ?

fix(iam): incorrect input for AccountPrincipal is building successfully

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

Pull request has been modified.

duranbe · 2024-06-29T10:52:00Z

Seems this PR is breaking lots of existing test ... I'll look into it, if it's too complex or there is actual use case where the an AWS ID is not 12 digits (which should not be the case ?) I'll close it.

...-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts

...testing/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.ts

…uotes strings

duranbe · 2024-07-01T20:16:06Z

Had to refactor/fix in bunch of test files but now they use proper mock AWS Accound id 🙌

duranbe · 2024-07-09T08:48:39Z

Bump !

aws-cdk-automation · 2024-07-09T09:04:01Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
Commit ID: 79ba4d1
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

github-actions bot added the beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK label Jun 15, 2024

aws-cdk-automation requested a review from a team June 15, 2024 21:19

github-actions bot added the p2 label Jun 15, 2024

aws-cdk-automation previously requested changes Jun 15, 2024

View reviewed changes

aws-cdk-automation added the pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback. label Jun 15, 2024

duranbe changed the title ~~fix(iam) add 12-digits validation for AccountPrincipal~~ fix(iam): add 12-digits validation for AccountPrincipal Jun 15, 2024

github-actions bot mentioned this pull request Jun 17, 2024

Weekly PR metrics report #30566

Closed

TheRealAmazonKendra previously requested changes Jun 21, 2024

View reviewed changes

TheRealAmazonKendra added pr-linter/exempt-integ-test The PR linter will not require integ test changes and removed pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback. labels Jun 21, 2024

duranbe changed the title ~~fix(iam): add 12-digits validation for AccountPrincipal~~ fix(iam): Incorrect input for AccountPrincipal is not failing build/validation Jun 24, 2024

aws-cdk-automation previously requested changes Jun 24, 2024

View reviewed changes

duranbe changed the title ~~fix(iam): Incorrect input for AccountPrincipal is not failing build/validation~~ fix(iam): incorrect input for AccountPrincipal is not failing build/validation Jun 24, 2024

duranbe changed the title ~~fix(iam): incorrect input for AccountPrincipal is not failing build/validation~~ fix(iam): incorrect input for AccountPrincipal is building successfully Jun 24, 2024

duranbe force-pushed the fix-account-principal branch from 206cce4 to 17c7271 Compare June 26, 2024 21:28

duranbe requested a deployment to test-pipeline June 30, 2024 22:08 — with GitHub Actions Waiting

duranbe commented Jun 30, 2024

View reviewed changes

...-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts Show resolved Hide resolved

duranbe commented Jun 30, 2024

View reviewed changes

...testing/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.ts Outdated Show resolved Hide resolved

github-actions bot mentioned this pull request Jul 1, 2024

Monthly PR metrics report #30715

Closed

duranbe requested a deployment to test-pipeline July 1, 2024 07:53 — with GitHub Actions Waiting

duranbe requested a deployment to test-pipeline July 1, 2024 16:49 — with GitHub Actions Waiting

duranbe requested a deployment to test-pipeline July 1, 2024 17:00 — with GitHub Actions Waiting

duranbe requested a deployment to test-pipeline July 1, 2024 17:33 — with GitHub Actions Waiting

duranbe requested a deployment to test-pipeline July 1, 2024 19:05 — with GitHub Actions Waiting

aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jul 1, 2024

duranbe added 15 commits July 1, 2024 21:40

fix(iam) add 12-digits validation for AccountPrincipal

32b81d6

fix(iam): add 12-digits validation for AccountPrincipal -fix double q…

dfa6d2b

…uotes strings

Update principals.test.ts

5377e35

Update principals.ts

bafdb58

Update principals.ts

4ca3cdd

Update principals.test.ts

f62de18

Update principals.ts

c417abc

Fix with !cdk.Token.isUnresolved(accountId)

eb4c436

Fix few test with incorrect mock AWS account id

23afbdf

Fix test with incorrect Account Id

e16f43b

Fix allowed account id in test

599d0f5

fix bootstrap test

f276c65

fix bootstrap test - 2

0de4548

fix integ test

5269a4c

fix integ test?

b22e556

duranbe force-pushed the fix-account-principal branch from b41104b to b22e556 Compare July 1, 2024 19:40

duranbe requested a deployment to test-pipeline July 1, 2024 19:40 — with GitHub Actions Waiting

duranbe requested a review from TheRealAmazonKendra July 1, 2024 20:16

Merge branch 'main' into fix-account-principal

79ba4d1

duranbe requested a deployment to test-pipeline July 9, 2024 08:49 — with GitHub Actions Waiting

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(iam): incorrect input for AccountPrincipal is building successfully #30559

fix(iam): incorrect input for AccountPrincipal is building successfully #30559

duranbe commented Jun 15, 2024

aws-cdk-automation left a comment

duranbe commented Jun 15, 2024

TheRealAmazonKendra Jun 21, 2024

duranbe Jun 24, 2024 •

edited

Loading

TheRealAmazonKendra commented Jun 21, 2024

TheRealAmazonKendra commented Jun 21, 2024

mergify bot commented Jun 21, 2024

TheRealAmazonKendra commented Jun 21, 2024

aws-cdk-automation left a comment

duranbe commented Jun 24, 2024 •

edited

Loading

duranbe commented Jun 29, 2024

duranbe commented Jul 1, 2024

duranbe commented Jul 9, 2024

aws-cdk-automation commented Jul 9, 2024

fix(iam): incorrect input for AccountPrincipal is building successfully #30559

Are you sure you want to change the base?

fix(iam): incorrect input for AccountPrincipal is building successfully #30559

Conversation

duranbe commented Jun 15, 2024

Reason for this change

Description of changes

Description of how you validated changes

Checklist

aws-cdk-automation left a comment

Choose a reason for hiding this comment

duranbe commented Jun 15, 2024

TheRealAmazonKendra Jun 21, 2024

Choose a reason for hiding this comment

duranbe Jun 24, 2024 • edited Loading

Choose a reason for hiding this comment

TheRealAmazonKendra commented Jun 21, 2024

TheRealAmazonKendra commented Jun 21, 2024

mergify bot commented Jun 21, 2024

✅ Branch has been successfully updated

TheRealAmazonKendra commented Jun 21, 2024

aws-cdk-automation left a comment

Choose a reason for hiding this comment

duranbe commented Jun 24, 2024 • edited Loading

duranbe commented Jun 29, 2024

duranbe commented Jul 1, 2024

duranbe commented Jul 9, 2024

aws-cdk-automation commented Jul 9, 2024

AWS CodeBuild CI Report

duranbe Jun 24, 2024 •

edited

Loading

duranbe commented Jun 24, 2024 •

edited

Loading