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(servicecatalog): only one ProductStack per Portfolio can use assets #26885

Merged
merged 5 commits into from
Aug 25, 2023

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Aug 25, 2023

To move the assets into the target bucket, a BucketDeployment was created for every ProductStack. Instead, we will now share the same BucketDeployment for all ProductStacks.

This moves the custom resource around in the construct tree (leading to replacement), but that is a safe operation. Nothing will be destroyed by this move.

Closes #25189.


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

@rix0rrr rix0rrr requested a review from a team August 25, 2023 08:48
@rix0rrr rix0rrr marked this pull request as draft August 25, 2023 08:48
@aws-cdk-automation aws-cdk-automation requested a review from a team August 25, 2023 08:48
@github-actions github-actions bot added p2 bug This issue is a bug. effort/medium Medium work item – several days of effort labels Aug 25, 2023
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 25, 2023
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.

@aws-cdk-automation aws-cdk-automation dismissed their stale review August 25, 2023 11:55

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

@rix0rrr rix0rrr changed the title fix(servicecatalog): multiple ProductStacks in one Portfolio cannot use assets fix(servicecatalog): multiple ProductStacks in one Portfolio cannot all use assets Aug 25, 2023
@rix0rrr rix0rrr changed the title fix(servicecatalog): multiple ProductStacks in one Portfolio cannot all use assets fix(servicecatalog): only one ProductStack per Portfolio can use assets Aug 25, 2023
@rix0rrr rix0rrr marked this pull request as ready for review August 25, 2023 12:30
@aws-cdk-automation aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Aug 25, 2023
@@ -869,3 +872,10 @@ export interface UserDefinedObjectMetadata {
*/
readonly [key: string]: string;
}

function sourceConfigEqual(stack: cdk.Stack, a: SourceConfig, b: SourceConfig) {
Copy link
Contributor

Choose a reason for hiding this comment

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

safer to check the equality of stringified SourceConfig minus bucket? If we add a new propr to SourceConfig in the future then this function will silently be inaccurate. Although SourceConfig hasn't changed in 4 years... not a big deal

JSON.stringify({...a, bucket: undefined}) === JSON.stringify({...b, bucket: undefined})

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, this isn't really supposed to be a blocker. I will leave it up as an open question and if you agree you can open a new PR later.

@kaizencc kaizencc added the pr/do-not-merge This PR should not be merged at this time. label Aug 25, 2023
@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Aug 25, 2023
@kaizencc kaizencc removed the pr/do-not-merge This PR should not be merged at this time. label Aug 25, 2023
@mergify
Copy link
Contributor

mergify bot commented Aug 25, 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: be1499d
  • 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 9cb395c into main Aug 25, 2023
8 checks passed
@mergify mergify bot deleted the huijbers/servicecatalog-assets branch August 25, 2023 20:22
@mergify
Copy link
Contributor

mergify bot commented Aug 25, 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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue is a bug. contribution/core This is a PR that came from AWS. effort/medium Medium work item – several days of effort p2
Projects
None yet
3 participants