opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(agent/agentcontainers): fix devcontainer integration tests (#19109)

Browse Source 
It appears we accidentally merged a change that broke our devcontainer
integration tests https://github.com/coder/coder/pull/18570.
This commit is contained in:
Danielle Maywood
2025-07-31 13:24:23 +01:00
committed by GitHub
parent e4dc2d9418
commit cc4f8da6e1
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/agentcontainers/api.go
+13 -8
View File
@@ -161,8 +161,8 @@ func WithContainerCLI(ccli ContainerCLI) Option {
// WithContainerLabelIncludeFilter sets a label filter for containers.
// This option can be given multiple times to filter by multiple labels.
// The behavior is such that only containers matching one or more of the
// provided labels will be included.
// The behavior is such that only containers matching all of the provided
// labels will be included.
func WithContainerLabelIncludeFilter(label, value string) Option {
return func(api *API) {
api.containerLabelIncludeFilter[label] = value
@@ -927,17 +927,22 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
slog.F("config_file", configFile),
)
// If we haven't set any include filters, we should explicitly ignore test devcontainers.
if len(api.containerLabelIncludeFilter) == 0 && container.Labels[DevcontainerIsTestRunLabel] == "true" {
continue
}
// Filter out devcontainer tests, unless explicitly set in include filters.
if len(api.containerLabelIncludeFilter) > 0 || container.Labels[DevcontainerIsTestRunLabel] == "true" {
var ok bool
if len(api.containerLabelIncludeFilter) > 0 {
includeContainer := true
for label, value := range api.containerLabelIncludeFilter {
if v, found := container.Labels[label]; found && v == value {
ok = true
}
v, found := container.Labels[label]
includeContainer = includeContainer && (found && v == value)
}
// Verbose debug logging is fine here since typically filters
// are only used in development or testing environments.
if !ok {
if !includeContainer {
logger.Debug(ctx, "container does not match include filter, ignoring devcontainer", slog.F("container_labels", container.Labels), slog.F("include_filter", api.containerLabelIncludeFilter))
continue
}