refactor command splitting, add proper test

main/kubectl.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"regexp"
+	"strings"
 	"syscall"
 )
 
@@ -103,7 +104,9 @@ func kubectl(cmd string) string {
 	// takes an option such as `get pods -l foo=bar`, so the `-l` would be parsed first.
 
 	if cmdPattern == nil {
-		cmdPattern = regexp.MustCompile(`(\s-|--|[[^\w\s]&&[^.-]])`)
+		// dash is treated specially as it can appear inside unquoted identifiers,
+		// such as node names; we must not split those identifiers with options
+		cmdPattern = regexp.MustCompile(`\s-|[>{}$!?'"()&;|]`)
 	}
 
 	splitAt := cmdPattern.FindStringIndex(cmd)
@@ -123,7 +126,6 @@ func kubectl(cmd string) string {
 		buffer.WriteString(" --namespace=")
 		buffer.WriteString(namespace)
 	}
-	buffer.WriteString(" ")
 	buffer.WriteString(cmdB)
-	return buffer.String()
+	return strings.TrimSpace(buffer.String())
 }

main/kubectl_test.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"github.com/stretchr/testify/assert"
+	"strings"
+	"testing"
+)
+
+const SPLIT_MARK = "\x11"
+
+func assertInsertion(t *testing.T, input string) {
+	cmd := strings.Replace(input, SPLIT_MARK, "", 1)
+	expected := "kubectl " + strings.Replace(input, SPLIT_MARK, " --context=c --namespace=ns", 1)
+
+	assert.Equal(t, expected, kubectl(cmd))
+}
+
+func TestKubectlInsertion(t *testing.T) {
+	context = "c"
+	namespace = "ns"
+
+	assertInsertion(t, "get pods\x11")
+	assertInsertion(t, "get pods\x11 -l foo=bar")
+	assertInsertion(t, "\x11; echo foo")
+	assertInsertion(t, "get pods\x11 -l foo | grep bar")
+	assertInsertion(t, "\x11 -l foo get pods")
+	assertInsertion(t, "get pods\x11|grep foo")
+	assertInsertion(t, "describe node ip-172-23-76-75.eu-central-1.compute.internal\x11")
+}