Skip to content

fix(ng-dev): handle case where emea caretaker group does not exist #3053

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

Closed
wants to merge 1 commit into from
Closed

fix(ng-dev): handle case where emea caretaker group does not exist #3053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 45 additions & 31 deletions ng-dev/caretaker/handoff/update-github-team.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ export async function updateCaretakerTeamViaPrompt() {
getGroupMembers(`${caretakerGroup}-roster`),
getGroupMembers(`${caretakerGroup}-roster-emea`),
]);
if (emeaRoster === null) {
Log.debug(` Unable to retrieve members of the group: ${caretakerGroup}-roster-emea`);
}
if (roster === null) {
Log.error(` ✘ Unable to retrieve members of the group: ${caretakerGroup}-roster`);
return;
}

/** The list of users selected to be members of the caretaker group. */
const selectedPrimaryAndSecondary = await Prompt.checkbox<string>({
Expand All @@ -44,31 +51,34 @@ export async function updateCaretakerTeamViaPrompt() {
},
});

const emeaOptions = emeaRoster
// Do not show members that are already selected as primary/secondary.
.filter((m) => !selectedPrimaryAndSecondary.includes(m))
.map((member) => ({
value: member,
name: `${member} (EMEA)`,
checked: current.has(member),
}));
const selectedEmea = await Prompt.select<string>({
choices: emeaOptions,
message: 'Select EMEA caretaker',
});
let selectedEmea = '';
if (emeaRoster !== null) {
const emeaOptions = emeaRoster
// Do not show members that are already selected as primary/secondary.
.filter((m) => !selectedPrimaryAndSecondary.includes(m))
.map((member) => ({
value: member,
name: `${member} (EMEA)`,
checked: current.has(member),
}));
selectedEmea = await Prompt.select<string>({
choices: emeaOptions,
message: 'Select EMEA caretaker',
});

/** Whether the user positively confirmed the selected made. */
const confirmation = await Prompt.confirm({
default: true,
message: 'Are you sure?',
});
/** Whether the user positively confirmed the selected made. */
const confirmation = await Prompt.confirm({
default: true,
message: 'Are you sure?',
});

if (confirmation === false) {
Log.warn(' ⚠ Skipping caretaker group update.');
return;
if (confirmation === false) {
Log.warn(' ⚠ Skipping caretaker group update.');
return;
}
}

const selectedSorted = [...selectedPrimaryAndSecondary, selectedEmea].sort();
const selectedSorted = [...selectedPrimaryAndSecondary, selectedEmea].filter((_) => !!_).sort();
const currentSorted = Array.from(current).sort();

if (JSON.stringify(selectedSorted) === JSON.stringify(currentSorted)) {
Expand All @@ -89,15 +99,19 @@ export async function updateCaretakerTeamViaPrompt() {
async function getGroupMembers(group: string) {
/** The authenticated GitClient instance. */
const git = await AuthenticatedGitClient.get();

return (
await git.github.teams.listMembersInOrg({
org: git.remoteConfig.owner,
team_slug: group,
})
).data
.filter((_) => !!_)
.map((member) => member!.login);
try {
return (
await git.github.teams.listMembersInOrg({
org: git.remoteConfig.owner,
team_slug: group,
})
).data
.filter((_) => !!_)
.map((member) => member!.login);
} catch (e) {
Log.debug(e);
return null;
}
}

async function setCaretakerGroup(group: string, members: string[]) {
Expand All @@ -106,7 +120,7 @@ async function setCaretakerGroup(group: string, members: string[]) {
/** The full name of the group <org>/<group name>. */
const fullSlug = `${git.remoteConfig.owner}/${group}`;
/** The list of current members of the group. */
const current = await getGroupMembers(group);
const current = (await getGroupMembers(group)) || [];
/** The list of users to be removed from the group. */
const removed = current.filter((login) => !members.includes(login));
/** Add a user to the group. */
Expand Down
Loading