Skip to content

Integrate upstream changes from develop#92

Open
carole-lavillonniere wants to merge 11 commits intolocalstackfrom
drg-507-integrate-new-lambda-rie-upstream-changes-from-2026-02-12
Open

Integrate upstream changes from develop#92
carole-lavillonniere wants to merge 11 commits intolocalstackfrom
drg-507-integrate-new-lambda-rie-upstream-changes-from-2026-02-12

Conversation

@carole-lavillonniere
Copy link
Copy Markdown

@carole-lavillonniere carole-lavillonniere commented Apr 8, 2026 •
edited
Loading

  • 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
@mbfreder
chore(deps): Update go-chi to v5.2.2 (aws#149)
85e5302 
* chore(deps): Update go-chi to v5.2.2
@mbfreder
Update workflow to run integ-tests in main (aws#151)
e5440b6
@roger-zhangg
Update README.md to make it clear RIE binary is meant to be used in l…
c17162c 
…inux env (aws#152)
@licjun
feat(Multi-tenancy): Add support for multi-tenancy
ad5b46f 
* Add support for multi-tenancy
---------
Co-authored-by: Chengjun Li <>
@vicheey
feat: add support for Lambda Managed Instance (LMI) functions (aws#158)
f9bf927
@AdnaneKhan
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
@maxday
bump: go version to 1.25.7 (aws#163)
92c04c0
@vicheey
chore: incremental emulator update (aws#165)
c0d1a14
@tobixlea @github-advanced-security
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>
@tobixlea @github-advanced-security
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>
@carole-lavillonniere
Merge branch 'develop' into drg-507-integrate-new-lambda-rie-upstream…
94c51d3 
…-changes-from-2026-02-12
@carole-lavillonniere carole-lavillonniere changed the title Integrate upstream changes from develop (2026-02-12) Integrate upstream changes from develop Apr 8, 2026
@carole-lavillonniere carole-lavillonniere marked this pull request as ready for review April 9, 2026 11:27
joe4dev
joe4dev approved these changes Apr 9, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@joe4dev joe4dev left a comment

Choose a reason for hiding this comment

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

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"
Copy link
Copy Markdown
Member

@joe4dev joe4dev Apr 9, 2026

Choose a reason for hiding this comment

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

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"
Copy link
Copy Markdown
Member

@joe4dev joe4dev Apr 9, 2026

Choose a reason for hiding this comment

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

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

Related to @drauedo PR #75

@joe4dev
Copy link
Copy Markdown
Member

joe4dev commented Apr 17, 2026

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 joe4dev closed this Apr 17, 2026
@carole-lavillonniere
Copy link
Copy Markdown
Author

carole-lavillonniere commented Apr 20, 2026

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
Copy link
Copy Markdown
Author

carole-lavillonniere commented Apr 20, 2026

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
Copy link
Copy Markdown
Member

joe4dev commented Apr 20, 2026

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 🤞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joe4dev joe4dev joe4dev approved these changes

@dfangl dfangl Awaiting requested review from dfangl dfangl is a code owner

@dominikschubert 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.

9 participants

@carole-lavillonniere @joe4dev @mbfreder @roger-zhangg @licjun @vicheey @AdnaneKhan @maxday @tobixlea