fix handling of flags that can have negative integer values

Signed-off-by: Swapnanil-Gupta <swpnlg@amazon.com>

Author: Swapnanil-Gupta

cmd/finch/nerdctl_remote.go

@@ -12,6 +12,7 @@ import (
 	"maps"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -507,8 +508,10 @@ func (nc *nerdctlCommand) handleFlagArg(arg string, nextArg string) (bool, strin
 		// long flag concatenated to value by '=': --<long_flag>="<value>"
 		skip = false
 		flagKey, flagVal, _ = strings.Cut(arg, "=")
-	case strings.HasPrefix(arg, "--") && !strings.HasPrefix(nextArg, "-"):
-		// long flag followed by a value: --<long_flag> "<value>"
+	case strings.HasPrefix(arg, "--") && (isNumeric(nextArg) || !strings.HasPrefix(nextArg, "-")):
+		// long flag followed by a value (including a negative number): --<long_flag> "<value>".
+		// the isNumeric check is needed because the value can be a negative number.
+		// for example, in our health check tests where we pass --health-retries -5 or --health-timeout -5s
 		skip = true
 		flagKey = arg
 		flagVal = nextArg
@@ -522,8 +525,8 @@ func (nc *nerdctlCommand) handleFlagArg(arg string, nextArg string) (bool, strin
 		skip = false
 		flagKey = arg[:2]
 		flagVal = arg[2:]
-	case strings.HasPrefix(arg, "-") && len(arg) == 2 && !strings.HasPrefix(nextArg, "-"):
-		// short flag followed by a value: -? "<value>" or -? <value>
+	case strings.HasPrefix(arg, "-") && len(arg) == 2 && (isNumeric(nextArg) || !strings.HasPrefix(nextArg, "-")):
+		// short flag followed by a value (including a negative number): -? "<value>" or -? <value>
 		skip = true
 		flagKey = arg
 		flagVal = nextArg
@@ -613,3 +616,21 @@ func handleEnvFile(fs afero.Fs, systemDeps NerdctlCommandSystemDeps, arg, arg2 s
 	}
 	return skip, envs, nil
 }
+
+func isNumeric(arg string) bool {
+	if arg == "" {
+		return false
+	}
+	// handle the case where the arg can be a negative number followed by a char
+	// for example: --health-timeout -5s
+	if arg[0] == '-' && len(arg) > 1 {
+		for i := 1; i < len(arg); i++ {
+			if arg[i] < '0' || arg[i] > '9' {
+				return i > 1
+			}
+		}
+		return true
+	}
+	_, err := strconv.ParseInt(arg, 10, 64)
+	return err == nil
+}