Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 13 additions & 9 deletions src/validate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -758,16 +758,20 @@ fn validate_zulip_stream_ids(data: &Data, errors: &mut Vec<String>) {
return Ok(());
}

wrapper(team.members(data)?.iter(), errors, |member, _| {
if let Some(member) = data.person(member) {
if member.zulip_id().is_none() {
bail!(
"person `{}` in '{}' is a member of a Zulip stream but has no Zulip id",
member.github(),
team.name()
);
wrapper(streams.iter(), errors, |stream, errors| {
wrapper(stream.members().iter(), errors, |member, _| {
match member {
ZulipMember::MemberWithId { .. } | ZulipMember::JustId(_) => {}
ZulipMember::MemberWithoutId { github } => {
bail!(
"person `{github}` is a member of a Zulip stream `{}` defined in team `{}`, but has no Zulip id",
stream.name(),
team.name()
);
}
}
}
Ok(())
});
Ok(())
});
Ok(())
Expand Down
14 changes: 14 additions & 0 deletions teams/all.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,17 @@ excluded-people = [
"celaus",
"opeolluwa",
]

# Private channel with all team members, so that we can have an easy way of reaching them.
[[zulip-streams]]
name = "all/private"
Copy link
Member

Choose a reason for hiding this comment

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

would be kool if this was named similar to the private one for leads

so we would have

  • project members (private)
  • project leads (private)

with this pr, we would have

  • all/private
  • project leads (private)

Copy link
Member Author

Choose a reason for hiding this comment

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

There are already a bunch of XXX/private channels, so the project leads one is an exception, I'd say, which was chosen because the channel already existed.

Copy link
Member

Choose a reason for hiding this comment

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

oh, in that case (offtopic for this pr here), could it be renamed to leads/private to match others

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think we can automatically rename the channel through team, it would probably just create a new one. We'd have to do it by hand, but also sync it with team, so that it doesn't recreate a channel with the old name. So it's not trivial to rename.

# Exclude the following people from the Zulip stream for grandfathering purposes,
# where previously we didn't require all project team members to have Zulip IDs.
excluded-people = [
"U007D",
"andrewpollack",
"arshiamufti",
"bnchi",
"celaus",
"opeolluwa",
]