fix: match the HMP echo once by substring; rm takes the CNI dirs for older records

QEMU's readline echoes the typed command with redraw sequences, so a prefix test would have taken every successful echo for a rejection. The echo is the first line containing 'set_password ' and only that line. Records written before the CNI dirs were persisted resolve flag, then record, then default, so rm --cni-conf-dir/--cni-bin-dir can release their NICs.

Author: CMGS

cmd/vm/commands.go

@@ -72,6 +72,8 @@ func Command(h *Handler) *cobra.Command {
 		RunE:  h.RM,
 	}
 	rmCmd.Flags().Bool("force", false, "force kill (immediate SIGKILL, skip the ACPI grace window)")
+	rmCmd.Flags().String("cni-conf-dir", "", "CNI config dir for a VM created before the record remembered it")
+	rmCmd.Flags().String("cni-bin-dir", "", "CNI plugin dir for a VM created before the record remembered it")
 
 	snapshotCmd := &cobra.Command{
 		Use:   "snapshot VM",

cmd/vm/net_linux.go

@@ -27,13 +27,13 @@ import (
 // netScope keys cocoon-macos's host TAP/netns families apart from a co-hosted cocoon's, so neither GC reclaims the other's live guests.
 const netScope = "cm"
 
-// netConf is the cocoon network config: bridge/CNI provisioning shares cocoon's forwarding plane, keyed under our own device family; the CNI dirs come from the record so rm needs no flags.
+// netConf is the cocoon network config: bridge/CNI provisioning shares cocoon's forwarding plane, keyed under our own device family; the CNI dirs resolve flag, then record, then default.
 func netConf(cmd *cobra.Command, r *record) *config.Config {
 	return &config.Config{
 		RootDir:    home.Dir(cmd),
 		DNS:        "8.8.8.8,1.1.1.1",
-		CNIConfDir: cmp.Or(r.CNIConfDir, "/etc/cni/net.d"),
-		CNIBinDir:  cmp.Or(r.CNIBinDir, "/opt/cni/bin"),
+		CNIConfDir: cmp.Or(flagOr(cmd, "cni-conf-dir", ""), r.CNIConfDir, "/etc/cni/net.d"),
+		CNIBinDir:  cmp.Or(flagOr(cmd, "cni-bin-dir", ""), r.CNIBinDir, "/opt/cni/bin"),
 		NetScope:   netScope,
 	}
 }

cmd/vm/net_linux_test.go

@@ -13,6 +13,24 @@ import (
 	"github.com/cocoonstack/cocoon-macos/home"
 )
 
+func TestNetConfResolvesFlagThenRecordThenDefault(t *testing.T) {
+	cmd := &cobra.Command{}
+	cmd.Flags().String("cni-conf-dir", "", "")
+	cmd.Flags().String("cni-bin-dir", "", "")
+	if got := netConf(cmd, &record{}).CNIConfDir; got != "/etc/cni/net.d" {
+		t.Errorf("default CNIConfDir = %q", got)
+	}
+	if got := netConf(cmd, &record{CNIConfDir: "/rec/net.d", CNIBinDir: "/rec/bin"}).CNIBinDir; got != "/rec/bin" {
+		t.Errorf("record CNIBinDir = %q", got)
+	}
+	if err := cmd.Flags().Set("cni-conf-dir", "/flag/net.d"); err != nil {
+		t.Fatal(err)
+	}
+	if got := netConf(cmd, &record{CNIConfDir: "/rec/net.d"}).CNIConfDir; got != "/flag/net.d" {
+		t.Errorf("flag CNIConfDir = %q, want the flag over the record", got)
+	}
+}
+
 func TestNetConfScope(t *testing.T) {
 	conf := netConf(&cobra.Command{}, &record{})
 	if got, want := conf.NetScope, "cm"; got != want {

cmd/vm/utils.go

@@ -371,7 +371,7 @@ func hmpReplied(out string) bool {
 		if line == "" || strings.HasPrefix(line, strings.TrimSpace(hmpPrompt)) {
 			continue
 		}
-		if !echoed && strings.HasPrefix(line, "set_password ") {
+		if !echoed && strings.Contains(line, "set_password ") {
 			echoed = true
 			continue
 		}

cmd/vm/utils_test.go

@@ -169,6 +169,8 @@ func TestHMPRepliedFlagsAnyMessage(t *testing.T) {
 		{"invalid parameter", " set_password vnc ab cd\r\nError: invalid parameter value: cd\r\n(qemu) ", true},
 		{"display inactive", " set_password vnc abcd\r\nCould not set password\r\n(qemu) ", true},
 		{"unterminated quote", " set_password vnc \"abc\r\nset_password: string expected\r\nTry \"help set_password\" for more information\r\n(qemu) ", true},
+		{"readline redraw echo", "s\x1b[K\x1b[Dse\x1b[K\x1b[D\x1b[Dset_password vnc abcd\r\n(qemu) ", false},
+		{"readline redraw then rejection", "s\x1b[K\x1b[Dset_password vnc \"abc\r\nset_password: string expected\r\n(qemu) ", true},
 	} {
 		if got := hmpReplied(tc.out); got != tc.want {
 			t.Errorf("%s: hmpReplied = %v, want %v", tc.name, got, tc.want)