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

  • 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
* Add support for multi-tenancy
---------
Co-authored-by: Chengjun Li <>
* ci: scope down permissions for release.yml

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

* ci: scope down permissions for check-binaries.yml
* 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>
* 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 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
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 ?

package invoke

const (
RequestIdHeader = "X-Amzn-RequestId"
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.

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

const (
RequestIdHeader = "X-Amzn-RequestId"

ClientContextHeader = "X-Amz-Client-Context"
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.

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

Related to @drauedo PR #75

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants