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.

Sign up for GitHub

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

Jump to bottom

fix(rds): monitoring role is not created by default when using readers and writers #26006

Merged
merged 6 commits into from
Jun 30, 2023
Merged

fix(rds): monitoring role is not created by default when using readers and writers #26006

merged 6 commits into from
Jun 30, 2023

Conversation

lpizzinidev
Copy link
Contributor

The _createInstances function was not providing a default monitoringRole value with enabled monitoring.
This fix creates a default role as done by the legacy code.

Closes #25941.

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

@gitpod-io
Copy link

gitpod-io bot commented Jun 16, 2023

@github-actions github-actions bot added the admired-contributor [Pilot] contributed between 13-24 PRs to the CDK label Jun 16, 2023
@aws-cdk-automation aws-cdk-automation requested a review from a team June 16, 2023 07:50
@github-actions github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p1 labels Jun 16, 2023
aws-cdk-automation
aws-cdk-automation previously requested changes Jun 16, 2023
View reviewed changes
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

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.

@lpizzinidev
Copy link
Contributor Author

Exemption Request.
Let me know if changes to integration tests are needed.

@aws-cdk-automation aws-cdk-automation added pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback. pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. labels Jun 16, 2023
@hertino76
Copy link

Finally, was this solution included in a service pack ?

corymhall
corymhall suggested changes Jun 26, 2023
View reviewed changes
Copy link
Contributor

@corymhall corymhall left a comment

Choose a reason for hiding this comment

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

Looks good! Just one comment

packages/aws-cdk-lib/aws-rds/lib/cluster.ts
const instanceEndpoints: Endpoint[] = [];
const instanceIdentifiers: string[] = [];
const readers: IAuroraClusterInstance[] = [];

let monitoringRole = props.monitoringRole;
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we move this into

aws-cdk/packages/aws-cdk-lib/aws-rds/lib/aurora-cluster-instance.ts

Line 421 in 4c9016a

class AuroraClusterInstance extends Resource implements IAuroraClusterInstance {
?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍 should be good now

@aws-cdk-automation aws-cdk-automation removed the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jun 26, 2023
corymhall
corymhall suggested changes Jun 27, 2023
View reviewed changes
packages/aws-cdk-lib/aws-rds/test/cluster.test.ts Outdated
@@ -1602,7 +1602,7 @@ describe('cluster', () => {
Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', {
MonitoringInterval: 60,
MonitoringRoleArn: {
'Fn::GetAtt': ['DatabaseMonitoringRole576991DA', 'Arn'],
'Fn::GetAtt': ['DatabasewriterMonitoringRole23A1E3B6', 'Arn'],
Copy link
Contributor

Choose a reason for hiding this comment

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

ahh sorry I missed what was going on here. You had it right initially. If we move it to AuroraClusterInstance then we will create a role per instance which is not what we want 🤦‍♂️

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍 no problem, I reverted it to the original version

corymhall
corymhall previously approved these changes Jun 29, 2023
View reviewed changes
@corymhall corymhall added pr-linter/exempt-readme The PR linter will not require README changes pr-linter/exempt-integ-test The PR linter will not require integ test changes and removed pr-linter/exempt-readme The PR linter will not require README changes labels Jun 29, 2023
@aws-cdk-automation aws-cdk-automation dismissed their stale review June 29, 2023 11:18

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

@mergify
Copy link
Contributor

mergify bot commented Jun 29, 2023

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 dismissed corymhall’s stale review June 30, 2023 10:25

Pull request has been modified.

@mergify
Copy link
Contributor

mergify bot commented Jun 30, 2023

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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@mergify mergify bot merged commit 9065b25 into aws:main Jun 30, 2023
5 checks passed
@mergify
Copy link
Contributor

mergify bot commented Jun 30, 2023

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).

@filletofish filletofish mentioned this pull request Jul 2, 2023
Merged
@github-actions github-actions bot mentioned this pull request Jul 26, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corymhall corymhall corymhall approved these changes

@aws-cdk-automation aws-cdk-automation aws-cdk-automation left review comments

Assignees
No one assigned
Labels
admired-contributor [Pilot] contributed between 13-24 PRs to the CDK bug This issue is a bug. effort/small Small work item – less than a day of effort p1 pr-linter/exempt-integ-test The PR linter will not require integ test changes pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DatabaseCluster: MonitoringRole not created by default when using readers and writers
4 participants
@lpizzinidev @hertino76 @aws-cdk-automation @corymhall