Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(rds): fixed the IAM policy that grantConnect() generates for DatabaseInstanceReadReplica #31579

Merged
merged 12 commits into from
Sep 26, 2024

Conversation

moelasmar
Copy link
Contributor

Issue # (if applicable)

Closes #31061.

Reason for this change

Calling grantConnect() on an instance of DatabaseInstanceReadReplica generates an incorrect policy that uses the full ARN of the instance instead of the instanceResourceId value. It should have created policy with correct resource format arn:aws:rds-db:region:account-id:dbuser:DbiResourceId/db-user-name per Creating and using an IAM policy for IAM database access.

Description of changes

Fixed the IAM policy that grantConnect() generates for DatabaseInstanceReadReplica. The change correctly sets the value of instanceResourceId to replica instance attrDbiResourceId. The value of instanceResourceId is used to generate IAM policy.

Description of how you validated changes

  • Added new unit test.
  • Updated existing integration test.

Checklist


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

ashishdhingra and others added 8 commits August 9, 2024 00:51
…ceResourceIdV2 property in DatabaseInstanceReadReplica to use in grantConnect().
…InstanceReadReplica-GrantRead-Fix

# Conflicts:
#	packages/@aws-cdk/cx-api/FEATURE_FLAGS.md
#	packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
#	packages/aws-cdk-lib/cx-api/README.md
#	packages/aws-cdk-lib/cx-api/lib/features.ts
#	packages/aws-cdk-lib/cx-api/test/features.test.ts
…InstanceReadReplica-GrantRead-Fix

# Conflicts:
#	packages/@aws-cdk/cx-api/FEATURE_FLAGS.md
#	packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
#	packages/aws-cdk-lib/cx-api/README.md
#	packages/aws-cdk-lib/cx-api/lib/features.ts
@moelasmar moelasmar requested a review from paulhcsun September 26, 2024 19:33
@github-actions github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p2 labels Sep 26, 2024
@aws-cdk-automation aws-cdk-automation requested a review from a team September 26, 2024 19:33
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Sep 26, 2024
When this feature flag is enabled, the value of that property will be as expected set to 'DbiResourceId' attribute, and that will fix the grantConnect method.
`,
introducedIn: { v2: 'V2NEXT' },
defaults: { v2: false },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this line is needed. It's only required if you need to set the default to true, otherwise it should be false automatically.

@paulhcsun
Copy link
Contributor

@Mergifyio update

Copy link
Contributor

mergify bot commented Sep 26, 2024

update

☑️ Nothing to do

  • #commits-behind > 0 [📌 update requirement]
  • -closed [📌 update requirement]
  • -conflict [📌 update requirement]
  • queue-position = -1 [📌 update requirement]

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 170a4fb
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

Copy link
Contributor

mergify bot commented Sep 26, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 52f676c into main Sep 26, 2024
13 checks passed
@mergify mergify bot deleted the ashishdhingra/DatabaseInstanceReadReplica-GrantRead-Fix branch September 26, 2024 22:48
Copy link

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug This issue is a bug. contribution/core This is a PR that came from AWS. effort/small Small work item – less than a day of effort p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(aws-rds): grantConnect generates incorrect policy for DatabaseInstanceReadReplica
4 participants