fix(ci): invalid protoc and a datarace in command.

Author: Zenithar

Makefile

@@ -52,7 +52,7 @@ E2E_TEST_CLUSTER_NAME ?= lima-$(LIMA_INSTANCE)
 E2E_TEST_KUBECTL_CONTEXT ?= lima
 
 KUBECTL ?= limactl shell $(LIMA_INSTANCE) sudo kubectl
-PROTOC_VERSION = 29.6
+PROTOC_VERSION = 33.4
 PROTOC_OS ?= osx
 PROTOC_ZIP = protoc-${PROTOC_VERSION}-${PROTOC_OS}-x86_64.zip
 # you might also want to change ~/lima.yaml k3s version

command/command.go

@@ -87,6 +87,7 @@ type backgroundCmd struct {
 	ticker         *time.Ticker    // Used to send regular SIGCONT signal to process
 	err            chan error      // Used to monitor the exit of the command
 	keepAliveQuit  chan int        // Used to kill the keepAlive goroutine
+	keepAliveDone  chan struct{}   // Closed when the keepAlive goroutine exits
 	pid            int             // PID of the process
 }
 
@@ -121,6 +122,7 @@ func NewBackgroundCmd(cmd Cmd, log *zap.SugaredLogger, processManager process.Ma
 		nil,
 		nil,
 		nil,
+		nil,
 		process.NotFoundProcessPID,
 	}
 }
@@ -193,10 +195,13 @@ func (w *backgroundCmd) KeepAlive() {
 	w.ticker = time.NewTicker(cmdKeepAliveTickDuration)
 
 	w.keepAliveQuit = make(chan int, 1) // we need a buffered channel so the sender doesn't block
+	w.keepAliveDone = make(chan struct{})
 
 	w.log.Debug("monitoring sending SIGCONT signal to process every 1s")
 
 	go func() {
+		defer close(w.keepAliveDone)
+
 		for {
 			exit, err := w.sendSIGCONTSignal()
 			if err != nil {

command/command_test.go

@@ -244,13 +244,19 @@ var _ = Describe("BackgroundCmd", func() {
 					sut.KeepAlive()
 					sut.KeepAlive() // we call it twice voluntarily to test the invariant that only a single goroutine is created
 
-					// Wait enough interval to have at least expected calls (times + 20%)
-					<-time.After(cmdKeepAliveTickDuration*time.Duration(times) + cmdBootstrapAllowedDuration/5)
-
 					underSut, ok := sut.(*backgroundCmd)
 					Expect(ok).To(BeTrue())
 					Expect(underSut).ToNot(BeNil())
 
+					// Ensure the keepAlive goroutine has fully exited before mock cleanup runs,
+					// preventing panics when mocks are called after the test finishes.
+					DeferCleanup(func() {
+						<-underSut.keepAliveDone
+					})
+
+					// Wait enough interval to have at least expected calls (times + 20%)
+					<-time.After(cmdKeepAliveTickDuration*time.Duration(times) + cmdBootstrapAllowedDuration/5)
+
 					// Stop timer ASAP to have realistic amount of calls
 					underSut.keepAliveQuit <- 0
 				},
@@ -268,12 +274,17 @@ var _ = Describe("BackgroundCmd", func() {
 					sut.KeepAlive()
 					sut.KeepAlive() // we call it twice voluntarily to test the invariant that only a single goroutine is created
 
-					// Wait enough interval to have at least expected calls (times + 20%)
-					<-time.After(cmdKeepAliveTickDuration*time.Duration(times) + cmdBootstrapAllowedDuration/5)
-
 					underSut, ok := sut.(*backgroundCmd)
 					Expect(ok).To(BeTrue())
 					Expect(underSut).ToNot(BeNil())
+
+					// Ensure the keepAlive goroutine has fully exited before mock cleanup runs.
+					DeferCleanup(func() {
+						<-underSut.keepAliveDone
+					})
+
+					// Wait enough interval to have at least expected calls (times + 20%)
+					<-time.After(cmdKeepAliveTickDuration*time.Duration(times) + cmdBootstrapAllowedDuration/5)
 				},
 				Entry("Find fails once", nil, errors.New("find fails"), nil, 1),
 				Entry("Signal fails once", &os.Process{}, nil, errors.New("signal fails"), 1),