Merge pull request #29 from jianxiaoguo/main

fix(workflow-cli): do not modify the arg of after '--'

Author: duanhongyi

drycc.go

@@ -193,6 +193,12 @@ Use 'git push drycc main' to deploy to an application.
 func removeConfigFlag(argv []string) []string {
 	var kept []string
 	for i, arg := range argv {
+		// -- /bin/sh -c --config  condition
+		if arg == "--" {
+			kept = append(kept, argv[i:]...)
+			break
+		}
+
 		if arg == "-c" || strings.HasPrefix(arg, "--config=") {
 			continue
 			// If the previous option is -c, remove the argument as well
@@ -208,6 +214,10 @@ func removeConfigFlag(argv []string) []string {
 
 func getConfigFlag(argv []string) string {
 	for i, arg := range argv {
+		// -- /bin/sh -c/ --config=  condition
+		if arg == "--" {
+			return ""
+		}
 		if strings.HasPrefix(arg, "--config=") {
 			return strings.TrimPrefix(arg, "--config=")
 		} else if i != 0 && argv[i-1] == "-c" {

drycc_test.go

@@ -131,6 +131,24 @@ func TestGetConfigFlag(t *testing.T) {
 	}
 	actual = getConfigFlag(argv)
 	assert.Equal(t, actual, expected, "config-flag")
+
+	expected = ""
+	argv = []string{
+		"--",
+		"ipsum",
+		"--config=config",
+	}
+	actual = getConfigFlag(argv)
+	assert.Equal(t, actual, expected, "config-flag")
+
+	argv = []string{
+		"--",
+		"ipsum",
+		"-c",
+		"config",
+	}
+	actual = getConfigFlag(argv)
+	assert.Equal(t, actual, expected, "config-flag")
 }
 
 func TestRemoveConfigFlag(t *testing.T) {
@@ -156,4 +174,32 @@ func TestRemoveConfigFlag(t *testing.T) {
 	}
 	actual = removeConfigFlag(argv)
 	assert.Equal(t, actual, expected, "args")
+
+	expected = []string{
+		"--",
+		"sh",
+		"-c",
+		"the-config-flag",
+	}
+	argv = []string{
+		"--",
+		"sh",
+		"-c",
+		"the-config-flag",
+	}
+	actual = removeConfigFlag(argv)
+	assert.Equal(t, actual, expected, "args")
+
+	expected = []string{
+		"--",
+		"sh",
+		"--config=the-config-flag",
+	}
+	argv = []string{
+		"--",
+		"sh",
+		"--config=the-config-flag",
+	}
+	actual = removeConfigFlag(argv)
+	assert.Equal(t, actual, expected, "args")
 }