mirror of
https://github.com/docker/compose.git
synced 2026-11-18 06:07:53 +00:00
The previous fix only covered create/start. projectOrName backs every other service-targeting command too (stop, kill, pause, unpause, logs, rm, down, ps, events), so they still surfaced the same two problems: a raw "no such service" error for a job name, and -- when COMPOSE_PROJECT_NAME is set -- a silent no-op, since projectOrName's label-driven fallback swallows the load error entirely. Fold the check into projectOrName so every caller is fixed at once, instead of duplicating the wiring per command. start.go's own job-handling code, now redundant, is removed; jobTargetErr and unselectedJobs (cmd/compose/run.go) are unchanged, just called from one more place. Adds unit coverage for projectOrName itself (including the COMPOSE_PROJECT_NAME path and the typo-correlation edge case) and e2e coverage for two more callers (stop, down) to confirm the fix lives in the shared helper rather than being re-implemented per command. Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
79 lines
2.4 KiB
Go
79 lines
2.4 KiB
Go
/*
|
|
Copyright 2020 Docker Compose CLI authors
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package compose
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/compose-spec/compose-go/v2/types"
|
|
"gotest.tools/v3/assert"
|
|
)
|
|
|
|
func TestFilterServices(t *testing.T) {
|
|
p := &types.Project{
|
|
Services: types.Services{
|
|
"foo": {
|
|
Name: "foo",
|
|
Links: []string{"bar"},
|
|
},
|
|
"bar": {
|
|
Name: "bar", WorkloadSpec: types.WorkloadSpec{DependsOn: map[string]types.ServiceDependency{
|
|
"zot": {},
|
|
}},
|
|
},
|
|
"zot": {
|
|
Name: "zot",
|
|
},
|
|
"qix": {
|
|
Name: "qix",
|
|
},
|
|
},
|
|
}
|
|
p, err := p.WithSelectedServices([]string{"bar"})
|
|
assert.NilError(t, err)
|
|
|
|
assert.Equal(t, len(p.Services), 2)
|
|
_, err = p.GetService("bar")
|
|
assert.NilError(t, err)
|
|
_, err = p.GetService("zot")
|
|
assert.NilError(t, err)
|
|
}
|
|
|
|
// projectOrName backs every service-targeting command except run/create
|
|
// (down, stop, kill, pause, unpause, logs, rm, ps, events, start, ...): a
|
|
// job target must be refused the same way regardless of which of them is
|
|
// used, and the refusal must not be masked by the COMPOSE_PROJECT_NAME
|
|
// fallback below it.
|
|
func TestProjectOrNameRefusesJob(t *testing.T) {
|
|
opts := jobTargetErrFixture(t)
|
|
|
|
t.Run("a job target is refused with a clear error", func(t *testing.T) {
|
|
_, _, err := opts.projectOrName(t.Context(), nil, "migrate")
|
|
assert.Error(t, err, `job "migrate" can only be triggered with "docker compose run"`)
|
|
})
|
|
|
|
t.Run("COMPOSE_PROJECT_NAME must not mask the refusal behind a silent fallback", func(t *testing.T) {
|
|
t.Setenv("COMPOSE_PROJECT_NAME", "test")
|
|
_, _, err := opts.projectOrName(t.Context(), nil, "migrate")
|
|
assert.Error(t, err, `job "migrate" can only be triggered with "docker compose run"`)
|
|
})
|
|
|
|
t.Run("a real typo among several targets keeps its own error, not a same-invocation job's", func(t *testing.T) {
|
|
_, _, err := opts.projectOrName(t.Context(), nil, "typo", "migrate")
|
|
assert.ErrorContains(t, err, "no such service: typo")
|
|
})
|
|
}
|