fix: component args (#1512)

Signed-off-by: Salim Afiune Maya <[email protected]>
Co-authored-by: Salim Afiune Maya <[email protected]>

Author: jon-stewart

cli/cmd/component_args.go

@@ -83,8 +83,8 @@ func (p *componentArgParser) parseLongArg(flags *pflag.FlagSet, s string, args [
 		// We're actually a bit stuck here as we don't know if this flag
 		// takes an argument or not, so we don't know whether or not to consume
 		// the next arg.  What we'll do is peek ahead, and if the next arg does
-		// not start with - then we'll take it.
-		if len(args) > 0 && len(args[0]) > 0 && args[0][0] == '-' {
+		// not start with '--' then we'll take it.
+		if len(args) > 0 && len(args[0]) > 0 && (args[0][0] == '-' && args[0][1] == '-') {
 			// This component flag does not take an arg
 			return args
 		}
@@ -126,14 +126,31 @@ func (p *componentArgParser) parseShortArg(flags *pflag.FlagSet, s string, args
 		if flag == nil {
 			// Not our flag, pass to the component.  Like the long form above we
 			// don't know whether to consume an extra arg, so we'll do the same
-			// thing: if the next arg does not start with - then pass it along
-			p.componentArgs = append(p.componentArgs, fmt.Sprintf("-%s", shorthand))
-			if len(shorthands) == 1 && (len(args) > 0 && len(args[0]) > 0 && args[0][0] == '-') {
+			// thing: if the next arg does not start with `--`` then pass it along
+
+			// handles case
+			//   -n
+			if len(shorthands) == 1 {
+				p.componentArgs = append(p.componentArgs, fmt.Sprintf("-%s", shorthand))
+				return args
+			}
+
+			// handles cases
+			//   -n=1234
+			//   -n1234
+			if len(shorthands) > 2 {
+				p.componentArgs = append(p.componentArgs, fmt.Sprintf("-%s", shorthands))
+				return args
+			}
+
+			// handles cases
+			//   -n 24h
+			//   -n -24h
+			if len(shorthands) == 1 && len(args) > 0 && len(args[0]) > 0 && args[0][0] == '-' && args[0][1] != '-' {
+				p.componentArgs = append(p.componentArgs, fmt.Sprintf("-%s", shorthand))
 				p.componentArgs = append(p.componentArgs, args[0])
 				return args[2:]
 			}
-			shorthands = shorthands[1:]
-			continue
 		}
 
 		if len(shorthands) > 2 && shorthands[1] == '=' {

cli/cmd/component_args_test.go

@@ -75,6 +75,82 @@ func TestComponentArgs(t *testing.T) {
 				"--debug",
 			},
 		},
+		{
+			[]string{
+				"iac", "negative-values", "--time", "-24h",
+			},
+			[]string{
+				"iac", "negative-values", "--time", "-24h",
+			},
+			[]string{},
+		},
+		{
+			// We do not have access to the component flag configuration and therefore cannot
+			// support the shorthand expansion of `-xyz` -> `-x -y -z`.  We have to treat it as
+			// `x=yz` and pass through to the component.
+			[]string{
+				"iac", "shorthands", "-xyz",
+			},
+			[]string{
+				"iac", "shorthands", "-xyz",
+			},
+			[]string{},
+		},
+		{
+			[]string{
+				"iac", "long-assign", "--xyz=value",
+			},
+			[]string{
+				"iac", "long-assign", "--xyz=value",
+			},
+			[]string{},
+		},
+		{
+			[]string{
+				"iac", "short-assign", "-x=value", "-y=true", "-t -24h", "-n=1234", "-n1234",
+			},
+			[]string{
+				"iac", "short-assign", "-x=value", "-y=true", "-t -24h", "-n=1234", "-n1234",
+			},
+			[]string{},
+		},
+		{
+			[]string{
+				"sca", "scan", "--key=projectId=${CI_PROJECT_ID}",
+				"--link", "https://github.com/lacework-dev/project-abc/blob/foo/$FILENAME#L$LINENUMBER",
+				"--tool-paths=checkov=/app/checkov,opal=/app/lacework-opal-releases/latest/opal",
+				"--fail", "High=2",
+				"--foo=",
+			},
+			[]string{
+				"sca", "scan", "--key=projectId=${CI_PROJECT_ID}",
+				"--link", "https://github.com/lacework-dev/project-abc/blob/foo/$FILENAME#L$LINENUMBER",
+				"--tool-paths=checkov=/app/checkov,opal=/app/lacework-opal-releases/latest/opal",
+				"--fail", "High=2",
+				"--foo=",
+			},
+			[]string{},
+		},
+		{
+			// -x=true -y=true -z="hello"
+			[]string{
+				"iac", "bool-str-assign", "-xyz", "hello", "-x",
+			},
+			[]string{
+				"iac", "bool-str-assign", "-xyz", "hello", "-x",
+			},
+			[]string{},
+		},
+		{
+			// -x=true -y=true -z="hello"
+			[]string{
+				"iac", "bool-str-assign", "-xyz=hello",
+			},
+			[]string{
+				"iac", "bool-str-assign", "-xyz=hello",
+			},
+			[]string{},
+		},
 	} {
 		p := componentArgParser{}
 		p.parseArgs(flags, k.args)