GeezerVison is showing github.com — Integrate upstream changes from develop by carole-lavillonniere · Pull Request #135 · localstack/lambda-runtime-init
Conversation
Integrates upstream into localstack, following README-LOCALSTACK.md → Integrate Upstream Changes.
Why now
a0f264a is the important one I wanted to integrate here since it fixes a race condition that failed the weekly release twice.
TODO
- ⚠️ merge with
--ff per step 7, not squash. This is the fix: a true merge commit records the upstream parent, so the next integration computes the right base and needs none of this.
- manually dispatch
weekly-release.yml to create a new draft release. localstack-pro will pick it up and open a new PR to bump the RIE and run the tests against it.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
* 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 <[email protected]>
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 <[email protected]>
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
* Update from upstream - 2026-07-13
---------
Co-authored-by: lambda-tooling+rie <[email protected]>
Co-authored-by: tobixlea <[email protected]>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Roger Zhang <[email protected]>
Brings the fork up to aws/aws-lambda-runtime-interface-emulator@3ccddd7
(Update from upstream - 2026-09-17), covering four upstream syncs:
3ccddd7 Update from upstream - 2026-09-17 (aws#189)
c622c06 Update from upstream - 2026-08-25 (aws#187)
ddf2bc4 Update from upstream - 2026-07-31 (aws#182)
a0f264a chore: sync from internal (rie-private-to-public) (aws#181)
The fork had been on develop@391c3f1 since April, and a0f264a is why this
matters now: it makes raptor.Server.Shutdown drain in-flight responses via
httpServer.Shutdown instead of calling httpServer.Close(), which severed
connections whose handler was still writing. That race is what failed the
weekly release twice -- as `Post ...: EOF` in TestRie_InvokeFatalError, and as
a 10m package timeout in TestRie_InvokeWaitingForInitError, where the invoke
goroutine's require.NoError skipped its un-deferred wg.Done() and deadlocked
the package. Both tests are green on this merge: 0 failures in 40 runs of the
package under -race, against 10/10 hangs before it.
Conflicts, all in files we customize:
go.mod Kept our go 1.27.1 directive over upstream's 1.26.6.
Makefile Kept our GO_VERSION derived from go.mod, and the
nojsonv2 GOEXPERIMENT export.
check-binaries.yml Took upstream's switch from robinraju/release-downloader
release.yml to `gh release download`, and from softprops/action-gh-release
to `gh release create`; kept our Renovate action bumps
(checkout/setup-python v7). release.yml's trailing
context had already moved to upstream's shape, so
keeping ours there would not have parsed.
integ-tests.yml Version bumps only; kept ours.
Note for the next integration: the previous one (#92) landed as a single
squashed commit, so its upstream parent was lost and git computed the merge
base as the Go 1.24 bump from 2025 -- 48 conflicts, 36 of them spurious
add/add on files that were already identical. This was resolved against the
true base (391c3f1) using a local `git replace --graft`, giving the 5 real
conflicts above. Merging this one with --ff, per README-LOCALSTACK step 7,
records the upstream parent and stops the next integration needing that.
|
@dfangl I am not able to merge with git checkout localstack && git merge --ff integrate-upstream-changes because we never actually added an exception like discussed here #109 (comment)
Since you are a repo admin, can you add the aws team as a bypass actor to the ruleset here and then do the merge? (I won't be able to since I am not in that team)
|
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
|
We do not have anyone in the bypass list right now, I updated the ruleset to allow merge commit merges now
|
carole-lavillonniere reacted with heart emoji
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Assignees
No one assigned
Milestone
No milestone
Development
Successfully merging this pull request may close these issues.
Uh oh!
There was an error while loading. Please reload this page.
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.
|
