feat: Integrate with upstream #62
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,12 +14,12 @@ import ( | |
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda/core/statejson" | ||
| "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda/interop" | ||
| "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda/rapidcore" | ||
| "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda/rapidcore/standalone" | ||
| "github.com/go-chi/chi/v5" | ||
|
Member
There was a problem hiding this comment. ❓ Was this the necessary HTTP router dependency fix? Any context worth adding why we differ here?
Member
There was a problem hiding this comment. Why do we need to apply this change ourselves, given that AWS has already done that upstream? https://github.com/aws/aws-lambda-runtime-interface-emulator/pull/149/files
Author
There was a problem hiding this comment. This is our custom interop server, not the AWS defined one. So it wouldn't be affected by the upstream changes and requires we manually change it around 🙂 |
||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| type CustomInteropServer struct { | ||
|
|
@@ -52,7 +52,7 @@ func (l *LocalStackAdapter) SendStatus(status LocalStackStatus, payload []byte) | |
|
|
||
| // The InvokeRequest is sent by LocalStack to trigger an invocation | ||
| type InvokeRequest struct { | ||
| InvokeId string `json:"request-id"` | ||
|
Member
There was a problem hiding this comment. I like that we fixed this inconsistent naming. ❓ Are we safe to ship this without breaking K8 images, which are not directly tied to LocalStack versions?
Author
There was a problem hiding this comment. I'll make a corresponding change in LocalStack for this once the latest RIE changes are shipped. Then, in a single PR, we switch over RIE in addition to changing the param on |
||
| InvokedFunctionArn string `json:"invoked-function-arn"` | ||
| Payload string `json:"payload"` | ||
| TraceId string `json:"trace-id"` | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package agents | ||
|
|
||
| import ( | ||
| "log/slog" | ||
| "path" | ||
| "path/filepath" | ||
|
|
||
| "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/utils" | ||
| ) | ||
|
|
||
| const ( | ||
| ExtensionsDir = "/opt/extensions" | ||
| ) | ||
|
|
||
| func ListExternalAgentPaths(fileutils utils.FileUtil, dir string, root string) []string { | ||
| var agentPaths []string | ||
| if !isCanonical(dir) || !isCanonical(root) { | ||
| slog.Warn("Agents base paths are not absolute and in canonical form", "dir", dir, "root", root) | ||
| return agentPaths | ||
| } | ||
| fullDir := path.Join(root, dir) | ||
| files, err := fileutils.ReadDirectory(fullDir) | ||
| if err != nil { | ||
| if fileutils.IsNotExist(err) { | ||
| slog.Info("The extension's directory does not exist, assuming no extensions to be loaded", "fullDir", fullDir) | ||
| } else { | ||
|
|
||
| slog.Error("Cannot list external agents", "err", err) | ||
| } | ||
|
|
||
| return agentPaths | ||
| } | ||
|
|
||
| for _, file := range files { | ||
| if !file.IsDir() { | ||
|
|
||
| p := path.Join("/", dir, file.Name()) | ||
| agentPaths = append(agentPaths, p) | ||
| } | ||
| } | ||
| return agentPaths | ||
| } | ||
|
|
||
| func isCanonical(path string) bool { | ||
| absPath, err := filepath.Abs(path) | ||
| return err == nil && absPath == path | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch 👍
So we basically need to change the imports to our fork instead of using upstream via
go.amzn.com. I guess these imports might be a frequent area of conflict, so it's worth documenting the rationale in our LocalStack readme.