Close the started channel before the start event is emitted, so that a late
starter stopped in reaction to it always finds the container started, and
close both ends of the pipe the hook logs test hands to the session.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Pin that restart waits for a restart:true dependency to hold its condition
again before restarting its dependent, and that its timeout reaches the
daemon in whole seconds.
Part of #14081.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Extend the interactive-up daemon fake and pin the behaviors mutation checks
of the interactive-up switchover found unlocked: the monitor's Services
scope, a Start-phase error while terminated, the cleanup when attaching
fails, signal handling starting only after the Create phase, late starters
stopped after the teardown sweep, hook logs reaching the session, the wait
timeout translation, --exit-code-from and the Running events. Add the
wiring of detached up (with its --wait verification), scale, the rebuild of
watch and the dependencies of run onto the plan.
Part of #14081.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Pin that every ContainerStart holds startMx, that the start, pre_start,
post_start and hook-runner nodes do nothing once the context is canceled,
that a failure relays untouched down a replica's chain, that the node
bookkeeping records cancellations as failures, that the phase returns the
originating error, that an invalid plan is refused, that a concurrency cap
cannot deadlock the node goroutines, that Starting is reported when the
container starts (not during pre_start), that the hook runner targets the
lowest-numbered replica, and that stop timeouts reach the daemon in whole
seconds.
Part of #14081.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Pin which dependencies are worth a wait (shouldWaitForDependency), how each
container state reads for service_healthy and
service_completed_successfully (required and optional, dry-run), the
Waiting/Healthy rows of a wait outside a plan, and that the end of a wait's
context wins over a ready tick. Add the plan shapes for a wait following its
dependency's start, a project of scale: 0 services, and the Start phase
covering every service of the project (the current behavior of scale, whose
change would be a decision of its own).
Part of #14081.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Pin what compose start does around its plan: the --wait verification (ready
or not, timeout message, one-shot services satisfied by their completion),
the project rebuilt from the project's non-one-off containers when no
compose file is given, only the selected services started, and the replicas
started in numeric order.
Part of #14081.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The monitor ends with the application it follows: pin that its initial
listing and its event subscription are scoped to the project's own
containers (no one-offs, no hook runners without a config hash), and that a
provider's relay, which never terminates, is not waited for, whether it is
there at the start or created later.
Part of #14081.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
logs, attach, the container event monitor they follow and the log
printer move to internal/logstream. The package declares what it needs
from the engine as a small Backend interface; composeService implements
it and keeps one-line forwarders, so `up` and the other callers are
unchanged. Behavior is unchanged: the tests that exercise the moved code
keep their assertions.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
TestStartAlreadyRunning, TestStopAlreadyStopped, TestStartStopMultipleServices
and TestStartStopMultipleFiles now state their intent and observe container
state (running/exited, not recreated) instead of matching progress lines.
The shared fixtures/start-stop had no other user and is removed.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
State what the test locks (a missing env_file only breaks the commands that
need the service referencing it) as a sequence of steps, and observe the
containers (running, scaled, not created) rather than only exit codes.
Completion is covered in both plugin and standalone modes through CompleteCmd.
The fixtures/env_file directory had no other user and is removed.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Express the intent (events refuses a service outside the project) with the
Scenario DSL; the project now lives in testdata/TestEventsUnknownService.
The shared fixtures/simple-composefile is still used by another test.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Shell completion is reached through a different entry point in plugin mode
(docker __complete compose) and in standalone mode (docker-compose
__complete). Expose it as an action so that scenarios can cover completion
in both modes, as the legacy tests did by hand.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
A command that is a no-op (e.g. start on an already running service) must
stay silent on stdout. The legacy tests asserted it by hand; expose it as a
generic observable of the scenario vocabulary.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
forbidigo rejects context.Background() in tests; t.Context() is the
intended replacement and carries the test's cancellation.
Signed-off-by: Zhuoming Wang <zhuomingwang0901@outlook.com>
The Engine client sends io.EOF over EventsResult.Err once the stream has
been read completely, which is what happens when `events --until` reaches
its deadline. Service.Events returned that error verbatim, so the command
printed "EOF" and exited 1 even though every event had been delivered.
Return nil for io.EOF and keep propagating real stream errors.
Signed-off-by: Zhuoming Wang <zhuomingwang0901@outlook.com>
The mode of the injected config file was declared once for the whole
project, so every service that received the credentials held a pointer to
the same value, and changing it for one would have changed it for all of
them. Nothing does that today, but the sharing is easy to trip on.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Align the credentials use_api_socket gives a service with what
`docker run --use-api-socket` does in the Docker CLI:
- the config file is created with mode 0600 instead of the 0444 default
of a config file, so that only the container's root reads it;
- a service which sets DOCKER_CONFIG itself gets the socket but no
credentials, as the comment of the function always said;
- nothing is injected, and DOCKER_CONFIG is not set, when the host has no
registry credentials, and they are not looked up when no service is to
get them.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
dupl reports blocks of syntax that are the same up to a renaming of identifiers and literals, which is the kind of copy this series removed; it does not see semantic equivalents such as reordered operands, which stay a matter for review. The threshold is 80 tokens; tests and the e2e DSL are excluded, and the few remaining pairs (declarative cobra commands, mirrored event and lookup functions) carry a targeted nolint with the reason.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
DescriptorForComposeFile and DescriptorForEnvFile only differed by their media type and annotation key.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Eight config subcommands created a Compose service and loaded the project with the same four lines. Move them to a helper of configOptions.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
create and up each carried the same normalization function mapping the mistaken --y spelling to --yes.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The service depends_on was written to a container label in create.go and read back in compose.go, each side knowing the other's format only by convention. Put the encoder and decoder side by side, with a round-trip test; the label content is unchanged.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The four throttle device lists of the blkio configuration were converted by four identical loops.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
create and createAndStart prepared, announced and executed their plan identically, differing only by scope.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The volume, network and relay link network removals of down each spelled out the same acquire/release of the shared limiter. Wrap them with a helper built on internal/concurrency.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The four menu shortcuts that open a Docker Desktop view repeated the same background span, open and error reporting. Only the link and the error wording differ.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
ReplaceExtendsFile and ReplaceEnvFile started with the same parsing and lookup of the service node. Move it to a helper.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Ping and FeatureFlags issued the same GET and decoded the same way. Share the request, status check and decoding in get[T].
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
pause and unpause listed and filtered their containers identically, and down, kill, stop and restart each re-spelled how to fall back to the project rebuilt from the engine. Each now has a single helper.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Several places copied the keys of a map into a slice and sorted it by hand, some through their own generic helper. Use slices.Sorted(maps.Keys(m)), keeping the sorted order of the output.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
pull and push decoded the daemon's JSON message stream with the same loop and computed the completion percentage the same way. Move both to helpers.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The quiet display, pkg/compose and three test files each defined an api.EventProcessor doing nothing. Provide it once as internal/progress.Noop.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
internal/containerops and pkg/compose both had a copy of forEachContainerConcurrent. Provide it once, generic, in internal/concurrency.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
images and volumes each looped over the project containers to keep those of the selected services, as internal/inspect already did for ps and top. Use one helper for all four.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
internal/inspect and internal/containerops declared the same engine methods and one-off enum, and pkg/compose adapted them twice. Declare them in internal/engine, embed them in both Backend interfaces and keep a single adapter.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
internal/projectloader and pkg/compose each rebuilt a service definition from the containers of a project with the same bootstrap and replica counting. Keep it in internal/projectloader and call it from both.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The label=key=value filter was rebuilt in pkg/compose, internal/inspect, internal/relay, cmd/compose and pkg/bridge. Build it once in internal/naming and use it everywhere.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
pkg/compose kept private copies of the canonical, default and project-less container name helpers that internal/naming already provides. Use the shared ones, and host the project-prefix stripping that compose.go and monitor.go each implemented.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
pkg/compose carried its own copy of the event constructors that internal/progress already provides. Use the shared ones and move the generic waiting, healthy, exited and skipped events there too.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The "errgroup bounded to maxConcurrency, where <= 0 means unlimited" helper was copied in several places (pkg/compose, internal/containerops, internal/inspect, internal/sync), together with the semaphore-based slot helpers used to share one budget across concurrent calls. Gather them in a leaf package so the extractions in progress can import it instead of duplicating it again. Behavior is unchanged.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
ServiceHash, NetworkHash and VolumeHash only serve Compose's own change
detection (the config-hash labels stamped on containers, networks and
volumes); they have no business being part of the exported API of
pkg/compose. Move them, with their tests, to internal/confighash.
The hashes are byte-for-byte unchanged (the golden values test moves with
the code, and `compose config --hash` prints the same output before and
after). The only dependency on the package they came from, a sorted-keys
helper, is replaced by slices.Sorted(maps.Keys(...)).
This removes exported symbols from the /v5 module: compose.ServiceHash,
compose.NetworkHash and compose.VolumeHash.
Part of #14396
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
The release updates errcheck (1.20 to 1.30) and gocognit (1.2.1 to 1.3.0).
errcheck now reports the receives from an error channel whose value is dropped
on purpose, in three places: waiting for the attach copy to end after the
context is done, draining the container wait channel of a failed hook, and
waiting for Up to return in a test. Say why on each, rather than handling an
error nobody can act on. gocognit's new count is handled by the previous
commit.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
runUp is above the cognitive complexity limit of the linter once gocognit
is updated, because of the nested branches that select the services whose
logs are followed. Move that selection to upOptions.attachedServices, without
changing what it does, and cover its rules (--attach, --no-attach,
--attach-dependencies, attach: false in the Compose file), which no test
exercised.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>