Skip to content

fix: adding an external_test when an internal one exists #145

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
toastwaffle merged 2 commits into from
Jan 30, 2026
Merged

fix: adding an external_test when an internal one exists #145

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
29c6fdd
fix: adding an external_test when an internal one exists
antoinewdg Jan 30, 2026
123c307
fix lint
antoinewdg Jan 30, 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
24 changes: 22 additions & 2 deletions generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,11 @@ func (u *updater) allocateSources(conf *config.Config, pkgDir string, sources ma
return nil, err
}

existingRuleNames := map[string]struct{}{}
for _, r := range rules {
existingRuleNames[r.Name()] = struct{}{}
}

var newRules []*edit.Rule
for _, src := range unallocated {
importedFile := sources[src]
Expand All @@ -465,7 +470,9 @@ func (u *updater) allocateSources(conf *config.Config, pkgDir string, sources ma
}
}
if rule == nil {
name := filepath.Base(pkgDir)
baseName := filepath.Base(pkgDir)
name := baseName
isExternal := importedFile.IsExternal(filepath.Join(u.plzConf.ImportPath(), pkgDir))
kind := "go_library"
if importedFile.IsTest() {
name += "_test"
Expand All @@ -475,11 +482,24 @@ func (u *updater) allocateSources(conf *config.Config, pkgDir string, sources ma
kind = "go_binary"
name = "main"
}
_, nameExists := existingRuleNames[name]
if nameExists {
if importedFile.IsTest() {
if isExternal {
name = fmt.Sprintf("%s_external_test", baseName)
} else {
name = fmt.Sprintf("%s_internal_test", baseName)
}
} else {
return nil, fmt.Errorf("rule with name %s already exists in %s", name, pkgDir)
}
}
rule = edit.NewRule(edit.NewRuleExpr(kind, name), kinds.DefaultKinds[kind], pkgDir)
if importedFile.IsExternal(filepath.Join(u.plzConf.ImportPath(), pkgDir)) {
if isExternal {
setExternal(rule)
}
newRules = append(newRules, rule)
existingRuleNames[name] = struct{}{}
}

rule.AddSrc(src)
Expand Down
2 changes: 1 addition & 1 deletion generate/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestAllocateSources(t *testing.T) {
require.NoError(t, err)

require.Len(t, newRules, 1)
assert.Equal(t, "foo_test", newRules[0].Name())
assert.Equal(t, "foo_external_test", newRules[0].Name())
assert.ElementsMatch(t, []string{"external_test.go"}, mustGetSources(t, u, newRules[0]))

assert.ElementsMatch(t, []string{"foo.go", "bar.go"}, mustGetSources(t, u, rules[0]))
Expand Down