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(core): serviceTimeout for CustomResource does not work with token #33541

Merged
merged 5 commits into from
Feb 22, 2025

Conversation

go-to-k
Copy link
Contributor

@go-to-k go-to-k commented Feb 21, 2025

Issue # (if applicable)

Closes #33513.

Reason for this change

The serviceTimeout for CustomResource does not work with token.

The way the token is handled is wrong, and the isUnresolved method that the Duration type has should be used.

Description of changes

Use the props.serviceTimeout.isUnresolved().

Also add a doc that the token must be specified in Duration.seconds() since it is converted by toSeconds internally. (Because it is a token and unknown MINUTES value cannot be converted to SECONDS. This is due to the token mechanism.)

see:

https://github.com/go-to-k/aws-cdk/blob/75e52619cd09f363882ff62561a53cd5cd79ab30/packages/aws-cdk-lib/core/lib/custom-resource.ts#L169

https://github.com/go-to-k/aws-cdk/blob/75e52619cd09f363882ff62561a53cd5cd79ab30/packages/aws-cdk-lib/core/lib/duration.ts#L332

Describe any new or updated permissions being added

Description of how you validated changes

Unit tests.

Checklist


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

@go-to-k go-to-k requested a review from a team as a code owner February 21, 2025 07:47
@aws-cdk-automation aws-cdk-automation requested a review from a team February 21, 2025 07:47
@github-actions github-actions bot added distinguished-contributor [Pilot] contributed 50+ PRs to the CDK bug This issue is a bug. p2 labels Feb 21, 2025
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.

(This review is outdated)

Copy link

codecov bot commented Feb 21, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.20%. Comparing base (0596824) to head (2fbc366).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #33541      +/-   ##
==========================================
+ Coverage   82.17%   82.20%   +0.02%     
==========================================
  Files         119      119              
  Lines        6862     6862              
  Branches     1158     1158              
==========================================
+ Hits         5639     5641       +2     
+ Misses       1120     1118       -2     
  Partials      103      103              
Flag Coverage Δ
suite.unit 82.20% <100.00%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
packages/aws-cdk ∅ <ø> (∅)
packages/aws-cdk-lib/core 82.20% <100.00%> (+0.02%) ⬆️

@go-to-k
Copy link
Contributor Author

go-to-k commented Feb 21, 2025

Exemption Request:

This could be covered by unit tests only.

@aws-cdk-automation aws-cdk-automation added the pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback. label Feb 21, 2025
@go-to-k
Copy link
Contributor Author

go-to-k commented Feb 21, 2025

@Mergifyio update

Copy link
Contributor

mergify bot commented Feb 21, 2025

update

☑️ Nothing to do

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

@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Feb 21, 2025
@aws-cdk-automation aws-cdk-automation added pr/needs-maintainer-review This PR needs a review from a Core Team Member and removed pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. labels Feb 21, 2025
GavinZZ
GavinZZ previously approved these changes Feb 21, 2025
@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Feb 21, 2025
@GavinZZ GavinZZ added pr-linter/exempt-integ-test The PR linter will not require integ test changes and removed pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback. labels Feb 21, 2025
@aws-cdk-automation aws-cdk-automation dismissed their stale review February 21, 2025 21:09

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

Copy link
Contributor

mergify bot commented Feb 21, 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).

Copy link
Contributor

mergify bot commented Feb 21, 2025

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

The pull request can't be updated

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@go-to-k
Copy link
Contributor Author

go-to-k commented Feb 22, 2025

@Mergifyio update

Copy link
Contributor

mergify bot commented Feb 22, 2025

update

❌ Mergify doesn't have permission to update

For security reasons, Mergify can't update this pull request. Try updating locally.
GitHub response: refusing to allow a GitHub App to create or update workflow .github/workflows/analytics-metadata-updater.yml without workflows permission

@go-to-k
Copy link
Contributor Author

go-to-k commented Feb 22, 2025

@Mergifyio update

Copy link
Contributor

mergify bot commented Feb 22, 2025

update

❌ Mergify doesn't have permission to update

For security reasons, Mergify can't update this pull request. Try updating locally.
GitHub response: refusing to allow a GitHub App to create or update workflow .github/workflows/analytics-metadata-updater.yml without workflows permission

@mergify mergify bot dismissed GavinZZ’s stale review February 22, 2025 04:02

Pull request has been modified.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 2fbc366
  • 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 Feb 22, 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 bc91c70 into aws:main Feb 22, 2025
22 checks passed
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 Feb 22, 2025
@go-to-k go-to-k deleted the cr-timeout-token branch February 22, 2025 05:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug This issue is a bug. distinguished-contributor [Pilot] contributed 50+ PRs to the CDK p2 pr-linter/exempt-integ-test The PR linter will not require integ test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CustomResource: The serviceTimeout prop does not work with token
4 participants