Pull upstream changes into main, upgrade go to 1.24 by dfangl · Pull Request #39 · localstack/lambda-runtime-init · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
2 changes: 2 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Add default reviewers for community PRs
* @dfangl @joe4dev @gregfurman @dominikschubert
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GO_ARCH_arm64 := arm64
DESTINATION_x86_64 := bin/${BINARY_NAME}-x86_64
DESTINATION_arm64 := bin/${BINARY_NAME}-arm64

run_in_docker = docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.22 $(1)
run_in_docker = docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.24 $(1)

compile-with-docker-all:
$(call run_in_docker, make compile-lambda-linux-all)
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module go.amzn.com

go 1.23.0

toolchain go1.24.1
go 1.24

require (
github.com/aws/aws-lambda-go v1.46.0
Expand Down
2 changes: 1 addition & 1 deletion lambda/rapi/handler/agentnext.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (h *agentNextHandler) ServeHTTP(writer http.ResponseWriter, request *http.R
}
} else {
log.Warnf("Unknown agent %s tried to call /next", agentID.String())
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension"+agentID.String())
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension %s", agentID.String())
return
}

Expand Down
2 changes: 1 addition & 1 deletion lambda/rapi/handler/agentregister.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (h *agentRegisterHandler) ServeHTTP(writer http.ResponseWriter, request *ht

registerRequest, err := parseRegister(request)
if err != nil {
rendering.RenderForbiddenWithTypeMsg(writer, request, errInvalidRequestFormat, err.Error())
rendering.RenderForbiddenWithTypeMsg(writer, request, errInvalidRequestFormat, "%s", err.Error())
return
}

Expand Down
4 changes: 2 additions & 2 deletions lambda/rapi/handler/runtimelogs.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (h *runtimeLogsHandler) ServeHTTP(writer http.ResponseWriter, request *http
log.Errorf("Agent Verification Error: %s", err)
switch err := err.(type) {
case *ErrAgentIdentifierUnknown:
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension "+err.agentID.String())
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension %s", err.agentID.String())
h.telemetrySubscription.RecordCounterMetric(telemetry.SubscribeClientErr, 1)
default:
rendering.RenderInternalServerError(writer, request)
Expand All @@ -55,7 +55,7 @@ func (h *runtimeLogsHandler) ServeHTTP(writer http.ResponseWriter, request *http
switch err {
case telemetry.ErrTelemetryServiceOff:
rendering.RenderForbiddenWithTypeMsg(writer, request,
h.telemetrySubscription.GetServiceClosedErrorType(), h.telemetrySubscription.GetServiceClosedErrorMessage())
h.telemetrySubscription.GetServiceClosedErrorType(), "%s", h.telemetrySubscription.GetServiceClosedErrorMessage())
h.telemetrySubscription.RecordCounterMetric(telemetry.SubscribeClientErr, 1)
default:
rendering.RenderInternalServerError(writer, request)
Expand Down
4 changes: 2 additions & 2 deletions lambda/rapid/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func (c *rapidContext) watchEvents(events <-chan supvmodel.Event) {
if termination.Success() {
err = fmt.Errorf("exit code 0")
} else {
err = fmt.Errorf(termination.String())
err = fmt.Errorf("%s", termination.String())
}

appctx.StoreFirstFatalError(c.appCtx, fatalerror.AgentCrash)
Expand Down Expand Up @@ -851,7 +851,7 @@ func handleRestore(execCtx *rapidContext, restore *interop.Restore) (interop.Res
// check if there is any error stored in appctx to get the root cause error type
// Runtime.ExitError is an example to such a scenario
if fatalErrorFound {
err = fmt.Errorf(string(fatalErrorType))
err = fmt.Errorf("%s", string(fatalErrorType))
}

if err != nil {
Expand Down
22 changes: 13 additions & 9 deletions test/integration/local_lambda/test_end_to_end.py