Skip to content

Conversation

@rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Oct 29, 2025

This applies the code for L1 resource relationships, originally applied in #35713 and reverted in #35832.

The reason is that another PR is also making changes in this area, branched in between the original application and its revert, and is now experiencing severe merge conflicts.

In this PR, reintroduce the large refactorings made in the original PR, but disable their application by making the list of services we apply the relationships to empty.

export const RELATIONSHIP_SERVICES: string[] = [];

There were some changes to L2s in the original PR that are not included in this PR; they will need to be reapplied when restoring the feature.


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

This applies the code for L1 resource relationships, originally applied
in #35713 and reverted in #35832.

The reason is that another PR is also making changes in this area,
branched in between the original application and its revert, and is now
experiencing severe merge conflicts.

In this PR, reintroduce the large refactorings made in the original PR,
but disable their application via a boolean flag.
@rix0rrr rix0rrr requested review from a team October 29, 2025 10:00
@github-actions github-actions bot added the p2 label Oct 29, 2025
@aws-cdk-automation aws-cdk-automation requested a review from a team October 29, 2025 10:00
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Oct 29, 2025
@rix0rrr rix0rrr marked this pull request as ready for review October 29, 2025 10:08
@mergify
Copy link
Contributor

mergify bot commented Oct 29, 2025

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
Copy link
Contributor

mergify bot commented Oct 29, 2025

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

You may have to fix your CI before adding the pull request to the queue again.
If you update this pull request, to fix the CI, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@mergify
Copy link
Contributor

mergify bot commented Oct 29, 2025

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
Copy link
Contributor

mergify bot commented Oct 29, 2025

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 27ffd00 into main Oct 29, 2025
18 of 19 checks passed
@mergify mergify bot deleted the huijbers/reapply-l1-resource-refactoring branch October 29, 2025 14:40
@github-actions
Copy link
Contributor

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 Oct 29, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

contribution/core This is a PR that came from AWS. p2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants