Skip to content

Commit 9a7e04d

Browse files
committed
Remove T-all special case
1 parent 1b9e817 commit 9a7e04d

File tree

2 files changed

+19
-34
lines changed

2 files changed

+19
-34
lines changed

src/validate.rs

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ fn validate_zulip_id_allowlist(data: &Data, errors: &mut Vec<String>) {
746746
let mut members = data
747747
.config()
748748
.members_without_zulip_id()
749-
.into_iter()
749+
.iter()
750750
.collect::<Vec<_>>();
751751
members.sort();
752752
for member in members {
@@ -780,15 +780,17 @@ fn validate_zulip_group_ids(data: &Data, errors: &mut Vec<String>) {
780780
// Okay, have zulip IDs.
781781
}
782782
ZulipMember::MemberWithoutId { github } => {
783-
// Bad, only github handle, no zulip ID, even though included in zulip user
784-
// group
785-
bail!(
786-
"person `{}` in '{}' is a member of a Zulip user group '{}' but has no \
787-
Zulip id",
788-
github,
789-
team.name(),
790-
group.name()
791-
);
783+
if !data.config().members_without_zulip_id().contains(github) {
784+
// Bad, only github handle, no zulip ID, even though included in zulip user
785+
// group
786+
bail!(
787+
"person `{}` in '{}' is a member of a Zulip user group '{}' but has no \
788+
Zulip id",
789+
github,
790+
team.name(),
791+
group.name()
792+
);
793+
}
792794
}
793795
}
794796
Ok(())
@@ -813,11 +815,13 @@ fn validate_zulip_stream_ids(data: &Data, errors: &mut Vec<String>) {
813815
match member {
814816
ZulipMember::MemberWithId { .. } | ZulipMember::JustId(_) => {}
815817
ZulipMember::MemberWithoutId { github } => {
816-
bail!(
817-
"person `{github}` is a member of a Zulip stream `{}` defined in team `{}`, but has no Zulip id",
818-
stream.name(),
819-
team.name()
820-
);
818+
if !data.config().members_without_zulip_id().contains(github) {
819+
bail!(
820+
"person `{github}` is a member of a Zulip stream `{}` defined in team `{}`, but has no Zulip id",
821+
stream.name(),
822+
team.name()
823+
);
824+
}
821825
}
822826
}
823827
Ok(())

teams/all.toml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,7 @@ extra-emails = [
3131

3232
[[zulip-groups]]
3333
name = "T-all"
34-
# Exclude the following people from the Zulip group for grandfathering purposes,
35-
# where previously we didn't require all project team members to have Zulip IDs
36-
# (since there wasn't a `T-all` Zulip group previously).
37-
excluded-people = [
38-
"U007D",
39-
"andrewpollack",
40-
"bnchi",
41-
"celaus",
42-
"opeolluwa",
43-
]
4434

4535
# Private channel with all team members, so that we can have an easy way of reaching them.
4636
[[zulip-streams]]
4737
name = "all/private"
48-
# Exclude the following people from the Zulip stream for grandfathering purposes,
49-
# where previously we didn't require all project team members to have Zulip IDs.
50-
excluded-people = [
51-
"U007D",
52-
"andrewpollack",
53-
"bnchi",
54-
"celaus",
55-
"opeolluwa",
56-
]

0 commit comments

Comments
 (0)