generated from amazon-archives/__template_Apache-2.0
-
Notifications
You must be signed in to change notification settings - Fork 83
fix: compile errors from merge conflicts #2331
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
Merged
ctlai95
merged 1 commit into
aws:feature/v2-to-v3-migration
from
ctlai95:fix-compile-error
Sep 24, 2025
Merged
fix: compile errors from merge conflicts #2331
ctlai95
merged 1 commit into
aws:feature/v2-to-v3-migration
from
ctlai95:fix-compile-error
Sep 24, 2025
+2
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feature/v2-to-v3-migration #2331 +/- ##
==============================================================
- Coverage 60.22% 59.78% -0.44%
==============================================================
Files 256 258 +2
Lines 57081 58263 +1182
Branches 3507 3555 +48
==============================================================
+ Hits 34376 34834 +458
- Misses 22639 23363 +724
Partials 66 66
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Will-ShaoHua
approved these changes
Sep 24, 2025
laileni-aws
approved these changes
Sep 24, 2025
chungjac
added a commit
that referenced
this pull request
Oct 7, 2025
* feat: migrate codewhisperer token service to aws-sdk-v3 (#2235) * feat: migrate codewhisperer token service to aws-sdk-v3 * fix captureHeaders middleware * feat: migrate codewhisperer iam service to aws-sdk-v3 (#2284) * refactor: remove aws-sdk v2 imports (#2290) * fix: compile errors from merge conflicts (#2331) * chore: bump runtimes to 0.3.0 (#2340) * chore: bump runtimes to 0.3.0 * fix antlr4ng version conflict * fix missing url polyfill * chore: remove old ignore entries (#2350) --------- Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: Tai Lai <[email protected]>
chungjac
added a commit
that referenced
this pull request
Oct 7, 2025
* feat: migrate codewhisperer token service to aws-sdk-v3 (#2235) * feat: migrate codewhisperer token service to aws-sdk-v3 * fix captureHeaders middleware * feat: migrate codewhisperer iam service to aws-sdk-v3 (#2284) * refactor: remove aws-sdk v2 imports (#2290) * fix: compile errors from merge conflicts (#2331) * chore: bump runtimes to 0.3.0 (#2340) * chore: bump runtimes to 0.3.0 * fix antlr4ng version conflict * fix missing url polyfill * chore: remove old ignore entries (#2350) --------- Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: Tai Lai <[email protected]>
chungjac
added a commit
that referenced
this pull request
Oct 10, 2025
* feat: migrate codewhisperer token service to aws-sdk-v3 (#2235) * feat: migrate codewhisperer token service to aws-sdk-v3 * fix captureHeaders middleware * feat: migrate codewhisperer iam service to aws-sdk-v3 (#2284) * refactor: remove aws-sdk v2 imports (#2290) * fix: compile errors from merge conflicts (#2331) * chore: bump runtimes to 0.3.0 (#2340) * chore: bump runtimes to 0.3.0 * fix antlr4ng version conflict * fix missing url polyfill * chore: remove old ignore entries (#2350) * chore: update versions * chore: fix more dependencies * fix: fallback to empty string in aws sdk v3 (#2414) * chore: update indexing bundle(#2417) This reverts commit baf20b7. --------- Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: Tai Lai <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
There are compilation errors on this branch after auto merges
Solution
Fix compilation errors
License
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.