Skip to content

Commit ca3dba1

Browse files
committed
update to 1.24
1 parent 781cd9a commit ca3dba1

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DESTINATION_old:= bin/${BINARY_NAME}
1010
DESTINATION_x86_64 := bin/${BINARY_NAME}-x86_64
1111
DESTINATION_arm64 := bin/${BINARY_NAME}-arm64
1212

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

1515
compile-with-docker-all:
1616
$(call run_in_docker, make compile-lambda-linux-all)

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.amzn.com
22

3-
go 1.22
3+
go 1.24
44

55
require (
66
github.com/aws/aws-lambda-go v1.46.0

lambda/rapi/handler/agentnext.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ func (h *agentNextHandler) ServeHTTP(writer http.ResponseWriter, request *http.R
3535
if externalAgent, found := h.registrationService.FindExternalAgentByID(agentID); found {
3636
if err := externalAgent.Ready(); err != nil {
3737
log.Warnf("Ready() failed for %s: %s, state is %s", externalAgent.String(), err, externalAgent.GetState().Name())
38-
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, StateTransitionFailedForExtensionMessageFormat,
38+
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, "State transition from %s to %s failed for extension %s. Error: %s",
3939
externalAgent.GetState().Name(), core.AgentReadyStateName, agentID.String(), err)
4040
return
4141
}
4242
} else if internalAgent, found := h.registrationService.FindInternalAgentByID(agentID); found {
4343
if err := internalAgent.Ready(); err != nil {
4444
log.Warnf("Ready() failed for %s: %s, state is %s", internalAgent.String(), err, internalAgent.GetState().Name())
45-
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, StateTransitionFailedForExtensionMessageFormat,
45+
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, "State transition from %s to %s failed for extension %s. Error: %s",
4646
internalAgent.GetState().Name(), core.AgentReadyStateName, agentID.String(), err)
4747
return
4848
}
4949
} else {
5050
log.Warnf("Unknown agent %s tried to call /next", agentID.String())
51-
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension"+agentID.String())
51+
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension %s", agentID.String())
5252
return
5353
}
5454

lambda/rapi/handler/agentregister.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (h *agentRegisterHandler) ServeHTTP(writer http.ResponseWriter, request *ht
7777

7878
registerRequest, err := parseRegister(request)
7979
if err != nil {
80-
rendering.RenderForbiddenWithTypeMsg(writer, request, errInvalidRequestFormat, err.Error())
80+
rendering.RenderForbiddenWithTypeMsg(writer, request, errInvalidRequestFormat, "%s", err.Error())
8181
return
8282
}
8383

@@ -151,7 +151,7 @@ func (h *agentRegisterHandler) registerExternalAgent(
151151

152152
if err := agent.Register(registerRequest.Events); err != nil {
153153
log.Warnf("Failed to register %s: %s", agent.String(), err)
154-
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, StateTransitionFailedForExtensionMessageFormat,
154+
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, "State transition from %s to %s failed for extension %s. Error: %s",
155155
agent.GetState().Name(), core.AgentRegisteredStateName, agent.Name, err)
156156
return
157157
}
@@ -198,7 +198,7 @@ func (h *agentRegisterHandler) registerInternalAgent(
198198

199199
if err := agent.Register(registerRequest.Events); err != nil {
200200
log.Warnf("Failed to register %s: %s", agent.String(), err)
201-
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, StateTransitionFailedForExtensionMessageFormat,
201+
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, "State transition from %s to %s failed for extension %s. Error: %s",
202202
agent.GetState().Name(), core.AgentRegisteredStateName, agent.Name, err)
203203
return
204204
}

lambda/rapi/handler/runtimelogs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (h *runtimeLogsHandler) ServeHTTP(writer http.ResponseWriter, request *http
3030
log.Errorf("Agent Verification Error: %s", err)
3131
switch err := err.(type) {
3232
case *ErrAgentIdentifierUnknown:
33-
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension "+err.agentID.String())
33+
rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentIdentifierUnknown, "Unknown extension %s", err.agentID.String())
3434
h.telemetrySubscription.RecordCounterMetric(telemetry.SubscribeClientErr, 1)
3535
default:
3636
rendering.RenderInternalServerError(writer, request)
@@ -55,7 +55,7 @@ func (h *runtimeLogsHandler) ServeHTTP(writer http.ResponseWriter, request *http
5555
switch err {
5656
case telemetry.ErrTelemetryServiceOff:
5757
rendering.RenderForbiddenWithTypeMsg(writer, request,
58-
h.telemetrySubscription.GetServiceClosedErrorType(), h.telemetrySubscription.GetServiceClosedErrorMessage())
58+
h.telemetrySubscription.GetServiceClosedErrorType(), "%s", h.telemetrySubscription.GetServiceClosedErrorMessage())
5959
h.telemetrySubscription.RecordCounterMetric(telemetry.SubscribeClientErr, 1)
6060
default:
6161
rendering.RenderInternalServerError(writer, request)

lambda/rapid/handlers.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -233,18 +233,18 @@ func (c *rapidContext) watchEvents(events <-chan supvmodel.Event) {
233233

234234
// If event from the runtime.
235235
if *termination.Name == runtimeProcessName {
236-
if termination.Success() {
237-
err = fmt.Errorf("Runtime exited without providing a reason")
238-
} else {
239-
err = fmt.Errorf("Runtime exited with error: %s", termination.String())
240-
}
236+
if termination.Success() {
237+
err = fmt.Errorf("%s", "Runtime exited without providing a reason")
238+
} else {
239+
err = fmt.Errorf("%s: %s", "Runtime exited with error", termination.String())
240+
}
241241
appctx.StoreFirstFatalError(c.appCtx, fatalerror.RuntimeExit)
242242
} else {
243-
if termination.Success() {
244-
err = fmt.Errorf("exit code 0")
245-
} else {
246-
err = fmt.Errorf(termination.String())
247-
}
243+
if termination.Success() {
244+
err = fmt.Errorf("%s", "exit code 0")
245+
} else {
246+
err = fmt.Errorf("%s", termination.String())
247+
}
248248

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

857857
if err != nil {

0 commit comments

Comments
 (0)