Skip to content

chore: sync from internal (rie-private-to-public) - #187

Merged
roger-zhangg merged 1 commit into
developfrom
rie-private-to-public
Aug 25, 2026
Merged

roger-zhangg merged 1 commit into
developfrom
rie-private-to-public

Conversation

@aws-sam-tooling-bot

Copy link
Copy Markdown
Contributor

Automated sync from internal LambdaRIEGithubSource.

The sync branch is reset to develop on every run, so this PR is always a single-commit diff against the current develop with no accumulated divergence. Force-pushed by the pipeline — do not commit to this branch by hand.

@aws-sam-tooling-bot
aws-sam-tooling-bot Bot force-pushed the rie-private-to-public branch from 8bacf5f to 2c4918e Compare August 25, 2026 17:14
@roger-zhangg
roger-zhangg merged commit c622c06 into develop Aug 25, 2026
9 of 10 checks passed
carole-lavillonniere added a commit to localstack/lambda-runtime-init that referenced this pull request Sep 22, 2026
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.
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.

2 participants