Skip to content

feat(agent/agentcontainers): update containers periodically #17972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 22, 2025
Merged

feat(agent/agentcontainers): update containers periodically #17972

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0b002ec
feat(agent/agentcontainers): update containers periodically
mafredri May 21, 2025
58b65a1
try to fix potential race in test
mafredri May 21, 2025
3cd9cc1
fix bug in marking container as dirty
mafredri May 21, 2025
1aa6a48
make sure watcher is synced
mafredri May 21, 2025
0122e43
improve readability of markDevcontainerDirty
mafredri May 21, 2025
e225434
refactor ticker and refresh
mafredri May 22, 2025
04431a5
update tests, add test for error during initial data
mafredri May 22, 2025
0455dd9
document updateContainers internal timeout
mafredri May 22, 2025
75d691c
anytimes
mafredri May 22, 2025
101e011
appease the linter
mafredri May 22, 2025
361ac82
fix test and appease linter again
mafredri May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
improve readability of markDevcontainerDirty
  • Loading branch information
@mafredri
mafredri committed May 21, 2025
commit 0122e4396fdad13a885717ad130ba8776c1eec49
32 changes: 15 additions & 17 deletions agent/agentcontainers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,30 +662,28 @@ func (api *API) markDevcontainerDirty(configPath string, modifiedAt time.Time) {
api.configFileModifiedTimes[configPath] = modifiedAt

for i := range api.knownDevcontainers {
if api.knownDevcontainers[i].ConfigPath != configPath {
dc := &api.knownDevcontainers[i]
if dc.ConfigPath != configPath {
continue
}

logger := api.logger.With(
slog.F("file", configPath),
slog.F("name", dc.Name),
slog.F("workspace_folder", dc.WorkspaceFolder),
slog.F("modified_at", modifiedAt),
)

// TODO(mafredri): Simplistic mark for now, we should check if the
// container is running and if the config file was modified after
// the container was created.
if !api.knownDevcontainers[i].Dirty {
api.logger.Info(api.ctx, "marking devcontainer as dirty",
slog.F("file", configPath),
slog.F("name", api.knownDevcontainers[i].Name),
slog.F("workspace_folder", api.knownDevcontainers[i].WorkspaceFolder),
slog.F("modified_at", modifiedAt),
)
api.knownDevcontainers[i].Dirty = true
if !dc.Dirty {
logger.Info(api.ctx, "marking devcontainer as dirty")
dc.Dirty = true
}
if api.knownDevcontainers[i].Container != nil && !api.knownDevcontainers[i].Container.DevcontainerDirty {
api.logger.Info(api.ctx, "marking devcontainer container as dirty",
slog.F("file", configPath),
slog.F("name", api.knownDevcontainers[i].Name),
slog.F("workspace_folder", api.knownDevcontainers[i].WorkspaceFolder),
slog.F("modified_at", modifiedAt),
)
api.knownDevcontainers[i].Container.DevcontainerDirty = true
if dc.Container != nil && !dc.Container.DevcontainerDirty {
logger.Info(api.ctx, "marking devcontainer container as dirty")
dc.Container.DevcontainerDirty = true
}
}
}
Expand Down
Loading