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(spec2cdk): get tag gives null result in Java CDK #29870

Merged
merged 4 commits into from Apr 17, 2024
Merged

Conversation

GavinZZ
Copy link
Contributor

@GavinZZ GavinZZ commented Apr 17, 2024

Issue # (if applicable)

Closes #29869

Reason for this change

Without it, it breaks java users who rely on tagging name to generate resource id.

Description of changes

Provide a default value using the initial tagValue users provide.

Description of how you validated changes

Existing tests all pass. Essentially changing it back to the original state.

Checklist


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

@aws-cdk-automation aws-cdk-automation requested a review from a team April 17, 2024 17:22
@github-actions github-actions bot added bug This issue is a bug. p2 labels Apr 17, 2024
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Apr 17, 2024
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.

@GavinZZ GavinZZ changed the title fix(spec2cdk): Get tag gives null result in Java CDK fix(spec2cdk): get tag gives null result in Java CDK Apr 17, 2024
@GavinZZ GavinZZ added pr-linter/exempt-test The PR linter will not require test changes pr-linter/exempt-integ-test The PR linter will not require integ test changes labels Apr 17, 2024
@aws-cdk-automation aws-cdk-automation dismissed their stale review April 17, 2024 17:28

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

Comment on lines +156 to +164
initializer: (props: Expression) =>
new CDK_CORE.TagManager(
this.tagManagerVariant(variant),
expr.lit(this.resource.cloudFormationType),
expr.UNDEFINED,
$E(props)[originalName],
expr.object({ tagPropertyName: expr.lit(originalName) }),
),
cfnValueToRender: {
[originalName]: $this.tags.renderTags($this[rawTagsPropName]),
[originalName]: $this.tags.renderTags(),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverting the changes I made in this PR #28989

Copy link
Contributor

Choose a reason for hiding this comment

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

How about the HAS_25610 code? Do we not need to revert that?

[originalName]: $this.tags.renderTags(...(HAS_25610 ? [$this[rawTagsPropName]] : [])),

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 HAS_25610 is always set to false before. So for legacy tagging, this PR changes it back to the original state. For modern tagging style, we want to keep it as is.

@aws-cdk-automation aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Apr 17, 2024
@paulhcsun
Copy link
Contributor

@Mergifyio update

Copy link
Contributor

mergify bot commented Apr 17, 2024

update

✅ Branch has been successfully updated

Copy link
Contributor

mergify bot commented Apr 17, 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).

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Apr 17, 2024
@paulhcsun paulhcsun changed the title fix(spec2cdk): get tag gives null result in Java CDK fix(spec2cdk): get tag gives null result in Java CDk Apr 17, 2024
@paulhcsun paulhcsun changed the title fix(spec2cdk): get tag gives null result in Java CDk fix(spec2cdk): get tag gives null result in Java CDK Apr 17, 2024
@github-actions github-actions bot added effort/small Small work item – less than a day of effort p1 and removed p2 labels Apr 17, 2024
@paulhcsun
Copy link
Contributor

@Mergifyio update

Copy link
Contributor

mergify bot commented Apr 17, 2024

update

☑️ Nothing to do

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

Copy link
Contributor

mergify bot commented Apr 17, 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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: f46afa8
  • 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 5a918d1 into main Apr 17, 2024
12 checks passed
@mergify mergify bot deleted the fix_tagging_legacy branch April 17, 2024 23:52
Copy link
Contributor

mergify bot commented Apr 17, 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).

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/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/exempt-test The PR linter will not require test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

spec2cdk: Breaking changes in Aws-cdk-lib-java from Tagging Change
3 participants