Skip to content

fix(types): name the clashing service and make the error stable #908

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

Open
AlbertEinsteinTG wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −5
Open

fix(types): name the clashing service and make the error stable #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd04613
fix(types): name the clashing service and make the error stable
AlbertEinsteinTG Aug 9, 2026
2cf7cf4
Merge branch 'main' into fix/container-name-clash-error
AlbertEinsteinTG Sep 12, 2026
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
2 changes: 1 addition & 1 deletion loader/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ func TestValidateContainerName(t *testing.T) {
},
}
err := project.CheckContainerNameUnicity()
assert.Assert(t, strings.Contains(err.Error(), `container name "mycontainer" is already in use by`))
assert.Assert(t, strings.Contains(err.Error(), `container name "mycontainer" is already in use by service "myservice`))

@glours glours Sep 14, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assert.Assert(t, strings.Contains(err.Error(), `container name "mycontainer" is already in use by service "myservice`))
assert.Error(t, err, `services.myservice2: container name "mycontainer" is already in use by service "myservice"`)

}

func TestValidateWatch(t *testing.T) {
Expand Down
9 changes: 5 additions & 4 deletions types/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,13 +1026,14 @@ func (p *Project) WithServicesTransform(fn func(name string, s ServiceConfig) (S

// CheckContainerNameUnicity validate project doesn't have services declaring the same container_name
func (p *Project) CheckContainerNameUnicity() error {
names := utils.Set[string]{}
for name, s := range p.Services {
names := map[string]string{}

@glours glours Sep 14, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clearly distinguish these from service names. Please apply the rename at usage sites too.

Suggested change
names := map[string]string{}
containerNames := map[string]string{}

for _, name := range p.ServiceNames() {
s := p.Services[name]
if s.ContainerName != "" {
if existing, ok := names[s.ContainerName]; ok {
return fmt.Errorf(`services.%s: container name %q is already in use by service %s"`, name, s.ContainerName, existing)
return fmt.Errorf(`services.%s: container name %q is already in use by service %q`, name, s.ContainerName, existing)
}
names.Add(s.ContainerName)
names[s.ContainerName] = name
}
}
return nil
Expand Down