PR feedback: disable watcher during config apply

Author: sean-breen

internal/command/command_plugin.go

@@ -178,10 +178,6 @@ func (cp *CommandPlugin) processDataPlaneResponse(ctx context.Context, msg *bus.
 func (cp *CommandPlugin) processConnectionReset(ctx context.Context, msg *bus.Message) {
 	slog.DebugContext(ctx, "Command plugin received connection reset")
 	if newConnection, ok := msg.Data.(grpc.GrpcConnectionInterface); ok {
-		if !cp.commandService.IsConnected() {
-			slog.DebugContext(ctx, "Command plugin: service is not connected")
-			return
-		}
 		err := cp.conn.Close(ctx)
 		if err != nil {
 			slog.ErrorContext(ctx, "Command plugin: unable to close connection", "error", err)

internal/command/command_service_test.go

@@ -207,7 +207,7 @@ func TestCommandService_UpdateClient(t *testing.T) {
 		make(chan *mpi.ManagementPlaneRequest),
 	)
 	commandService.UpdateClient(commandServiceClient)
-	assert.NotNil(t, commandServiceClient)
+	assert.NotNil(t, commandService.commandServiceClient)
 }
 
 func TestCommandService_UpdateDataPlaneHealth(t *testing.T) {

internal/watcher/watcher_plugin.go

@@ -61,6 +61,7 @@ type (
 			ctx context.Context,
 			credentialUpdateChannel chan<- credentials.CredentialUpdateMessage,
 		)
+		SetEnabled(enabled bool)
 	}
 )
 
@@ -167,7 +168,10 @@ func (w *Watcher) handleConfigApplyRequest(ctx context.Context, msg *bus.Message
 	instanceID := request.ConfigApplyRequest.GetOverview().GetConfigVersion().GetInstanceId()
 
 	w.instancesWithConfigApplyInProgress = append(w.instancesWithConfigApplyInProgress, instanceID)
+
+	slog.DebugContext(ctx, "Config Apply in progress: Disabling watchers...")
 	w.fileWatcherService.SetEnabled(false)
+	w.credentialWatcherService.SetEnabled(false)
 }
 
 func (w *Watcher) handleConfigApplySuccess(ctx context.Context, msg *bus.Message) {
@@ -187,7 +191,10 @@ func (w *Watcher) handleConfigApplySuccess(ctx context.Context, msg *bus.Message
 			return element == instanceID
 		},
 	)
+
+	slog.DebugContext(ctx, "Config Apply succeeded: re-enabling watchers...")
 	w.fileWatcherService.SetEnabled(true)
+	w.credentialWatcherService.SetEnabled(true)
 
 	w.instanceWatcherService.ReparseConfig(ctx, instanceID)
 }
@@ -215,7 +222,9 @@ func (w *Watcher) handleConfigApplyComplete(ctx context.Context, msg *bus.Messag
 			return element == instanceID
 		},
 	)
+
 	w.fileWatcherService.SetEnabled(true)
+	w.credentialWatcherService.SetEnabled(true)
 }
 
 func (w *Watcher) handleCredentialUpdate(ctx context.Context) {