Jun 6, 2025 · Jun 2, 2025 · Jun 6, 2025
diff --git a/agent/agentcontainers/acmock/acmock.go b/agent/agentcontainers/acmock/acmock.go
diff --git a/agent/agentcontainers/acmock/doc.go b/agent/agentcontainers/acmock/doc.go
 // Package acmock contains a mock implementation of agentcontainers.Lister for use in tests.
 package acmock

 //go:generate mockgen -destination ./acmock.go -package acmock ..Lister,DevcontainerCLI
 //go:generate mockgen -destination ./acmock.go -package acmock ..ContainerCLI,DevcontainerCLI
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
 logger            slog.Logger
 watcher           watcher.Watcher
 execer            agentexec.Execer
 cl  Lister
 ccliContainerCLI
 dccli             DevcontainerCLI
 clock             quartz.Clock
 scriptLogger      func(logSourceID uuid.UUID) ScriptLogger
 }
 }

 //WithLister sets the agentcontainers.Lister implementation to use.
 // The default implementation uses the Docker CLI to list containers.
 funcWithLister(cl Lister) Option {
 //WithContainerCLI sets the agentcontainers.ContainerCLI implementation
 //to use.The default implementation uses the Docker CLI.
 funcWithContainerCLI(ccli ContainerCLI) Option {
 return func(api *API) {
 api.cl =cl
 api.ccli =ccli
 }
 }

 for _, opt := range options {
 opt(api)
 }
 if api.cl == nil {
 api.cl =NewDocker(api.execer)
 if api.ccli == nil {
 api.ccli =NewDockerCLI(api.execer)
 }
 if api.dccli == nil {
 api.dccli = NewDevcontainerCLI(logger.Named("devcontainer-cli"), api.execer)
 listCtx, listCancel := context.WithTimeout(ctx, listContainersTimeout)
 defer listCancel()

 updated, err := api.cl.List(listCtx)
 updated, err := api.ccli.List(listCtx)
 if err != nil {
 // If the context was canceled, we hold off on clearing the
 // containers cache. This is to avoid clearing the cache if
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		// Package acmock contains a mock implementation of agentcontainers.Lister for use in tests.
		package acmock

		//go:generate mockgen -destination ./acmock.go -package acmock ..Lister,DevcontainerCLI
		//go:generate mockgen -destination ./acmock.go -package acmock ..ContainerCLI,DevcontainerCLI
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,7 +43,7 @@ type API struct {
		logger slog.Logger
		watcher watcher.Watcher
		execer agentexec.Execer
		cl Lister
		ccliContainerCLI
		dccli DevcontainerCLI
		clock quartz.Clock
		scriptLogger func(logSourceID uuid.UUID) ScriptLogger
Expand DownExpand Up		@@ -80,11 +80,11 @@ func WithExecer(execer agentexec.Execer) Option {
		}
		}

		//WithLister sets the agentcontainers.Lister implementation to use.
		// The default implementation uses the Docker CLI to list containers.
		funcWithLister(cl Lister) Option {
		//WithContainerCLI sets the agentcontainers.ContainerCLI implementation
		//to use.The default implementation uses the Docker CLI.
		funcWithContainerCLI(ccli ContainerCLI) Option {
		return func(api *API) {
		api.cl =cl
		api.ccli =ccli
		}
		}

Expand DownExpand Up		@@ -186,8 +186,8 @@ func NewAPI(logger slog.Logger, options ...Option) *API {
		for _, opt := range options {
		opt(api)
		}
		if api.cl == nil {
		api.cl =NewDocker(api.execer)
		if api.ccli == nil {
		api.ccli =NewDockerCLI(api.execer)
		}
		if api.dccli == nil {
		api.dccli = NewDevcontainerCLI(logger.Named("devcontainer-cli"), api.execer)
Expand DownExpand Up		@@ -363,7 +363,7 @@ func (api *API) updateContainers(ctx context.Context) error {
		listCtx, listCancel := context.WithTimeout(ctx, listContainersTimeout)
		defer listCancel()

		updated, err := api.cl.List(listCtx)
		updated, err := api.ccli.List(listCtx)
		if err != nil {
		// If the context was canceled, we hold off on clearing the
		// containers cache. This is to avoid clearing the cache if
Expand Down