FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Integrate upstream changes from develop by carole-lavillonniere · Pull Request #92 · localstack/lambda-runtime-init · GitHub

/ lambda-runtime-init Public
forked from aws/aws-lambda-runtime-interface-emulator

Integrate upstream changes from develop - #92

Merged
skyrpex merged 11 commits into
localstackfrom
drg-507-integrate-new-lambda-rie-upstream-changes-from-2026-02-12
Apr 24, 2026
ConversationCommits (11)ChecksFiles changed
Merged

Integrate upstream changes from develop#92
skyrpex merged 11 commits into
localstackfrom
drg-507-integrate-new-lambda-rie-upstream-changes-from-2026-02-12

Conversation

carole-lavillonniere commented Apr 8, 2026 •
edited
Loading

Copy link
Copy Markdown
  • Merges upstream AWS changes from develop into localstack branch following this guide
  • Resolves all merge conflicts preserving LocalStack customizations while integrating upstream additions

mbfreder and others added 11 commits August 8, 2025 14:45
chore(deps): Update go-chi to v5.2.2 (aws#149)
85e5302 
* chore(deps): Update go-chi to v5.2.2
Update workflow to run integ-tests in main (aws#151)
e5440b6
Update README.md to make it clear RIE binary is meant to be used in l…
c17162c 
…inux env (aws#152)
feat(Multi-tenancy): Add support for multi-tenancy
ad5b46f 
* Add support for multi-tenancy
---------
Co-authored-by: Chengjun Li <>
feat: add support for Lambda Managed Instance (LMI) functions (aws#158)
f9bf927
ci: scope down GitHub Token permissions (aws#154)
4fa2157 
* ci: scope down permissions for release.yml

* ci: scope down permissions for integ-tests.yml

* ci: scope down permissions for check-binaries.yml
bump: go version to 1.25.7 (aws#163)
92c04c0
chore: incremental emulator update (aws#165)
c0d1a14
feat: rie private to public automation initial merge (aws#172)
94ba1e9 
* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-19

* Update from upstream - 2026-03-19

* Potential fix for code scanning alert no. 7: Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* Update from upstream - 2026-03-27

* Update from upstream - 2026-03-30

---------

Co-authored-by: lambda-tooling+rie <lambda-tooling+rie@amazon.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
chore: rie private to public upload (aws#176)
391c3f1 
* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-18

* Update from upstream - 2026-03-19

* Update from upstream - 2026-03-19

* Potential fix for code scanning alert no. 7: Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* Update from upstream - 2026-03-27

* Update from upstream - 2026-03-30

* Update from upstream - 2026-04-01

---------

Co-authored-by: lambda-tooling+rie <lambda-tooling+rie@amazon.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Merge branch 'develop' into drg-507-integrate-new-lambda-rie-upstream…
94c51d3 
…-changes-from-2026-02-12
carole-lavillonniere changed the title Integrate upstream changes from develop (2026-02-12) Integrate upstream changes from develop Apr 8, 2026
carole-lavillonniere marked this pull request as ready for review April 9, 2026 11:27
joe4dev approved these changes Apr 9, 2026
View reviewed changes

joe4dev left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

These upstream changes were already reviewed, so we assume they are fine as long as they pass the full LocalStack test suite (including localstack-pro).

Resolves all merge conflicts preserving LocalStack customizations while integrating upstream additions

What merge conflicts were these?
Wouldn't we expect no more merge conflicts given the two one-line fixes merged in aws#176 ?

Comment thread internal/lambda-managed-instances/aws-lambda-rie/internal/invoke/consts.go
package invoke

const (
RequestIdHeader = "X-Amzn-RequestId"

joe4dev Apr 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

FYI: Interesting to see RequestId supported natively via headers now, which differs from our current approach sending it via the LS invoke payload.

Comment thread internal/lambda-managed-instances/aws-lambda-rie/internal/invoke/consts.go
const (
RequestIdHeader = "X-Amzn-RequestId"

ClientContextHeader = "X-Amz-Client-Context"

joe4dev Apr 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

FYI: Nice to see upstream support added for the client context header

Related to @drauedo PR #75

joe4dev commented Apr 17, 2026

Copy link
Copy Markdown
Member

Closing this PR, given the changes are already merged manually and released as v0.1.44-pre, following our guidance https://github.com/localstack/lambda-runtime-init/blob/localstack/README-LOCALSTACK.md#integrate-upstream-changes

joe4dev closed this Apr 17, 2026

carole-lavillonniere commented Apr 20, 2026

Copy link
Copy Markdown
Author

Closing this PR, given the changes are already merged manually and released as v0.1.44-pre, following our guidance https://github.com/localstack/lambda-runtime-init/blob/localstack/README-LOCALSTACK.md#integrate-upstream-changes

I created the release 1.44 just to test in localstack-core/pro but the changes are not merged yet, reopening the PR.

carole-lavillonniere commented Apr 20, 2026

Copy link
Copy Markdown
Author

These upstream changes were already reviewed, so we assume they are fine as long as they pass the full LocalStack test suite (including localstack-pro).

Resolves all merge conflicts preserving LocalStack customizations while integrating upstream additions

What merge conflicts were these? Wouldn't we expect no more merge conflicts given the two one-line fixes merged in aws#176 ?

I pushed this branch so we can visualize all the conflicts that were resolved: a2cf589

My understanding is that these conflicts happened because PR #62 did cherry-picks instead of a merge. We ended up with the same commits but different commit hashes and both sides created the same files independently.
This PR should fix things by doing a real merge, upstream integration should be conflict-free in the future.

joe4dev commented Apr 20, 2026

Copy link
Copy Markdown
Member

Thank you very much for the clarification and full merge conflict transparency 👏👏
That's many more conflicts than expected, kudos for fixing the rebase 🙇

This PR should fix things by doing a real merge, upstream integration should be conflict-free in the future.

I'm looking forward to that 🚀
It should only be the Go version and Go dependencies, which might be out of sync. Assuming we can move "internal" somehow, having an import-based approach would make updates so much easier 🤞

dfangl approved these changes Apr 22, 2026
View reviewed changes

dfangl left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Looks good from my side! Thanks for resolving the conflicts!

skyrpex commented Apr 22, 2026

Copy link
Copy Markdown

Some tests in LocalStack were failing with this version, not sure why. I started a clean merge here #98, it seems to work but there are some file differences. I'll review them.

skyrpex mentioned this pull request Apr 22, 2026
Closed
skyrpex merged commit 7448358 into localstack Apr 24, 2026
7 of 8 checks passed
skyrpex deleted the drg-507-integrate-new-lambda-rie-upstream-changes-from-2026-02-12 branch April 24, 2026 07:25
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

joe4dev joe4dev approved these changes
dfangl dfangl approved these changes
dominikschubert Awaiting requested review from dominikschubert dominikschubert is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Back | FazBrowse Home | New Git URL