refactor(timeout): make retryOnFail always a function #6762

tomcat323 · 2025-03-11T16:35:19Z

Problem

Follow up from this change

Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
Your code changes must meet the guidelines in CONTRIBUTING.md.
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

github-actions · 2025-03-11T16:35:39Z

This pull request implements a feat or fix, so it must include a changelog entry (unless the fix is for an unreleased feature). Review the changelog guidelines.
- Note: beta or "experiment" features that have active users should announce fixes in the changelog.
- If this is not a feature or fix, use an appropriate type from the title guidelines. For example, telemetry-only changes should use the telemetry type.

packages/amazonq/test/e2e/inline/inline.test.ts

packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts

packages/core/src/shared/utilities/timeoutUtils.ts

justinmk3 · 2025-03-11T20:19:09Z

packages/core/src/shared/utilities/timeoutUtils.ts

@@ -296,7 +283,7 @@ export async function waitUntil<T>(fn: () => Promise<T>, options: WaitUntilOptio
                result = await fn()
            }

-            if (shouldRetry(lastError) || (opt.truthy && result) || (!opt.truthy && result !== undefined)) {
+            if (opt.retryOnFail(lastError) || (opt.truthy && result) || (!opt.truthy && result !== undefined)) {


does opt.retryOnFail have a default value? same for the other cases below.

Suggested change

if (opt.retryOnFail(lastError) || (opt.truthy && result) || (!opt.truthy && result !== undefined)) {

if (opt.retryOnFail?.(lastError) || (opt.truthy && result) || (!opt.truthy && result !== undefined)) {

Yes, on line 265 retryOnFail: () => false, defaulted to false same as before

packages/core/src/test/shared/utilities/timeoutUtils.test.ts

justinmk3 · 2025-03-18T22:37:55Z

CI is failing. Can you rebase, so we can merge this

retryOnFail as always a function

bfb03f0

tomcat323 changed the title ~~feat(timeout): make retryOnFail as always a function~~ refactor(timeout): make retryOnFail as always a function Mar 11, 2025

tomcat323 changed the title ~~refactor(timeout): make retryOnFail as always a function~~ refactor(timeout): make retryOnFail always a function Mar 11, 2025

tomcat323 marked this pull request as ready for review March 11, 2025 19:29

tomcat323 requested a review from a team as a code owner March 11, 2025 19:29