Skip to content

Integrate upstream changes v2 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from

Conversation

joe4dev
Copy link
Member

@joe4dev joe4dev commented Oct 18, 2023

Supersedes the previous PR #23 where I squashed the upstream changes instead of merged all commits as is.

Motivation

The official AWS lambda-runtime-init received some upstream updates (typically merged in big blobs from their internal repository). We should update our customized localstack version to support the latest features (e.g., response streaming) and updates (e.g., the new Golang version). Beyond smaller doc updates, the main updates were:

Background

Internal docs: https://www.notion.so/localstack/Update-RIE-with-upstream-changes-for-response-streaming-18a303b503c54f958cfbee5841ef5402?pvs=4

Changes

Integrates the upstream changes from the AWS lambda-runtime-init repo and adjusts the API accordingly (see documented commit log for details).

👉 Custom LocalStack changes git show 6c95d75

Testing

Test against the LocalStack test suite.

🧪 The localstack branch integrate-lambda-init-upstream-changes contains some improved tests for the request_id propagation issue. For example: tests.aws.services.lambda_.test_lambda.TestRequestIdHandling.test_request_id_invoke

I tested other categories including:

  • tests.aws.services.lambda_.test_lambda.TestLambdaBaseFeatures
  • tests.aws.services.lambda_.test_lambda.TestRequestIdHandling

TODO

  • Fix failing snapshot test due to uuid not being replaced in the test tests.aws.services.lambda_.test_lambda.TestLambdaFeatures.test_invocation_with_qualifier
  • Resolve TODOs (mostly coding out some logs, error handling etc)
  • Rebase after merging the permission PR Fix filesystem permission parity #22 => Merged the localstack branch back as a quickfix because rebasing again is terrible with so many conflicts 😢

Callum Bodels and others added 11 commits January 4, 2023 10:19
Removing the trailing whitespace in the README.md to improve the formatting and readability of the file.
Add Shield.io badges for Go version and GitHub release.
Useful for displaying important information in a visually appealing and easily accessible way at a glance.

Updated the license badge to standard Shield.io format.
As it appears it was incorrect pointing to the badge for 'aws-sam-local'.
Add content table to README.md, making it more convenient for users to find the information they need and enabling them to quickly jump to specific sections.
Add markup to environment variable for better browsing
The content for some bullet points are not correctly indented or spaced.
This causes text and code blocks to not be displayed properly, causing confusion for customers.

This change indents the content of the bullet points so it is now correctly displayed increasing readability.
* Add missing backslash in docker command

* Remove stray "`" from command

* Covert code snippet to code block for consistency

* Remove extraneous newline

* Fix invalid italics and use "_" for consistency

* Change (invalid) italics to header

Make it consistent with the preceding section that says:
"To build the emulator into your image"

Also, the stray whitespace before the final asterisk was incorrect.

* Add syntax highlighting to code blocks

* Add header to content table
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.1.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.1.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…am-changes

Integrate upstream changes. Notable conflicts:

* Makefile: simply upgrade Go version to 1.19 from upstream and use LocalStack changes
* go.mod: merge dependency updates from upstream and keep LocalStack changes
* go.sum: re-generate
* lambda/rapi/server.go: new interop import from upstream (?), otherwise not really conflicts just API updates and by-1-line-neighboring updates
@joe4dev joe4dev marked this pull request as ready for review October 18, 2023 13:41
Copy link
Member

@dfangl dfangl left a comment

Choose a reason for hiding this comment

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

Still looking good :)

dfangl pushed a commit that referenced this pull request Oct 18, 2023
@dfangl
Copy link
Member

dfangl commented Oct 18, 2023

Merged with 605fa1c

@dfangl dfangl closed this Oct 18, 2023
@alexrashed alexrashed deleted the integrate-upstream-changes-v2 branch October 18, 2023 13:55
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.

6 participants