internal/gophers: remove unused Gerrit group UUID
Prior to CL 247240, the addPerson line for Tools Team included:
"1080@62eb7196-b449-3ce5-99f1-c037f21e1705"
This was a "<account ID>@<instance ID>" format that isn't used much,
but is documented as one of the formats that gophers.GetPerson accepts.
It was interpreted as an email because of the '@' in the middle.
That CL meant to replace the email with the UUID of a Gerrit group,
but there's no explicit support for such entries, and it currently
gets misinterpreted as the Tools Team's name.
We're not yet sure how to best handle teams on the Gerrit side,
but remove the UUID for now since it's neither supported nor used,
to reduce confusion.
Add test cases to help future team entry changes have the intended
effect.
For golang/go#50723.
For golang/go#27631.
Change-Id: Ice408033cd48fab746a395dc7a49f1dafe14fc55
Reviewed-on: https://go-review.googlesource.com/c/build/+/386794
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
diff --git a/internal/gophers/gophers.go b/internal/gophers/gophers.go
index 63ed5c7..877b65f 100644
--- a/internal/gophers/gophers.go
+++ b/internal/gophers/gophers.go
@@ -118,7 +118,7 @@
addPerson("Gerrit Bot", "letsusegerrit@gmail.com", "12446@62eb7196-b449-3ce5-99f1-c037f21e1705", "*bot")
addPerson("Fuzzing Team", "@golang/fuzzing")
addPerson("Pkgsite Team", "@golang/pkgsite")
- addPerson("Tools Team", "@golang/tools-team", "e37ba6c9c17684849faf885129b25ef8944419e9")
+ addPerson("Tools Team", "@golang/tools-team")
addPerson("212472270", "ggp493@gmail.com", "@ggriffiths")
addPerson("9.nashi", "9.nashi@gmail.com", "@80nashi")
diff --git a/internal/gophers/gophers_test.go b/internal/gophers/gophers_test.go
index bf18cfe..bf4310e 100644
--- a/internal/gophers/gophers_test.go
+++ b/internal/gophers/gophers_test.go
@@ -10,6 +10,25 @@
"golang.org/x/build/internal/gophers"
)
+func TestPersonName(t *testing.T) {
+ for _, tt := range []struct {
+ id string
+ want string
+ }{
+ {id: "@golang/tools-team", want: "Tools Team"},
+ } {
+ p := gophers.GetPerson(tt.id)
+ if p == nil {
+ t.Errorf("no person with id %q", tt.id)
+ continue
+ }
+ got := p.Name
+ if got != tt.want {
+ t.Errorf("person with id %q now has name %q but used to have %q; is that change intentional?", tt.id, got, tt.want)
+ }
+ }
+}
+
// Test that a few people whose Gerrit emails have been broken
// in the past still have the expected Gerrit email. This test
// is mostly needed until golang.org/issue/34259 is resolved.
@@ -37,6 +56,12 @@
{id: "Sebastien Binet", want: "seb.binet@gmail.com"},
{id: "Tobias Klauser", want: "tobias.klauser@gmail.com"},
{id: "Vitor De Mario", want: "vitordemario@gmail.com"},
+
+ // We're still figuring out how to handle teams.
+ // At this time their Gerrit email is unset.
+ {id: "Fuzzing Team", want: ""},
+ {id: "Pkgsite Team", want: ""},
+ {id: "Tools Team", want: ""},
} {
p := gophers.GetPerson(tt.id)
if p == nil {
