fix changes

Author: roger-zhangg

lambda/rapi/handler/agentnext.go

@@ -35,14 +35,14 @@ func (h *agentNextHandler) ServeHTTP(writer http.ResponseWriter, request *http.R
 	if externalAgent, found := h.registrationService.FindExternalAgentByID(agentID); found {
 		if err := externalAgent.Ready(); err != nil {
 			log.Warnf("Ready() failed for %s: %s, state is %s", externalAgent.String(), err, externalAgent.GetState().Name())
-			rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, "State transition from %s to %s failed for extension %s. Error: %s",
+			rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, StateTransitionFailedForExtensionMessageFormat,
 				externalAgent.GetState().Name(), core.AgentReadyStateName, agentID.String(), err)
 			return
 		}
 	} else if internalAgent, found := h.registrationService.FindInternalAgentByID(agentID); found {
 		if err := internalAgent.Ready(); err != nil {
 			log.Warnf("Ready() failed for %s: %s, state is %s", internalAgent.String(), err, internalAgent.GetState().Name())
-			rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, "State transition from %s to %s failed for extension %s. Error: %s",
+			rendering.RenderForbiddenWithTypeMsg(writer, request, errAgentInvalidState, StateTransitionFailedForExtensionMessageFormat,
 				internalAgent.GetState().Name(), core.AgentReadyStateName, agentID.String(), err)
 			return
 		}

lambda/rapi/handler/agentregister.go

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

lambda/rapid/handlers.go

@@ -233,18 +233,18 @@ func (c *rapidContext) watchEvents(events <-chan supvmodel.Event) {
 
 			// If event from the runtime.
 			if *termination.Name == runtimeProcessName {
-			if termination.Success() {
-				err = fmt.Errorf("%s", "Runtime exited without providing a reason")
-			} else {
-				err = fmt.Errorf("%s: %s", "Runtime exited with error", termination.String())
-			}
+				if termination.Success() {
+					err = fmt.Errorf("Runtime exited without providing a reason")
+				} else {
+					err = fmt.Errorf("Runtime exited with error: %s", termination.String())
+				}
 				appctx.StoreFirstFatalError(c.appCtx, fatalerror.RuntimeExit)
 			} else {
-			if termination.Success() {
-				err = fmt.Errorf("%s", "exit code 0")
-			} else {
-				err = fmt.Errorf("%s", termination.String())
-			}
+				if termination.Success() {
+					err = fmt.Errorf("exit code 0")
+				} else {
+					err = fmt.Errorf("%s", termination.String())
+				}
 
 				appctx.StoreFirstFatalError(c.appCtx, fatalerror.AgentCrash)
 			}