From 87b8dd61c37eb7515282aee53f57bb0f6b2eb262 Mon Sep 17 00:00:00 2001 From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com> Date: Tue, 24 Dec 2024 11:15:16 +1300 Subject: [PATCH] fix: replace strings.ToLower with strings.EqualFold [BE-11524] (#263) --- api/cli/confirm.go | 4 +--- api/hostmanagement/openamt/deviceActions.go | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/api/cli/confirm.go b/api/cli/confirm.go index bba2c12fe..0681f5c1d 100644 --- a/api/cli/confirm.go +++ b/api/cli/confirm.go @@ -19,7 +19,5 @@ func Confirm(message string) (bool, error) { } answer = strings.ReplaceAll(answer, "\n", "") - answer = strings.ToLower(answer) - - return answer == "y" || answer == "yes", nil + return strings.EqualFold(answer, "y") || strings.EqualFold(answer, "yes"), nil } diff --git a/api/hostmanagement/openamt/deviceActions.go b/api/hostmanagement/openamt/deviceActions.go index 76b5344b7..ac98339fa 100644 --- a/api/hostmanagement/openamt/deviceActions.go +++ b/api/hostmanagement/openamt/deviceActions.go @@ -44,13 +44,13 @@ func (service *Service) executeDeviceAction(configuration portainer.OpenAMTConfi } func parseAction(actionRaw string) (portainer.PowerState, error) { - switch strings.ToLower(actionRaw) { - case "power on": + if strings.EqualFold(actionRaw, "power on") { return powerOnState, nil - case "power off": + } else if strings.EqualFold(actionRaw, "power off") { return powerOffState, nil - case "restart": + } else if strings.EqualFold(actionRaw, "restart") { return restartState, nil } + return 0, fmt.Errorf("unsupported device action %s", actionRaw) }