From 54f05ddda05d9120e07b443e21e34018d084ba49 Mon Sep 17 00:00:00 2001
From: "Stephen Lewis (Burrows)" <stephenrlewis@google.com>
Date: Thu, 17 Nov 2022 08:56:47 -0800
Subject: [PATCH] Updated reviewer pool (#6798)

* Updated reviewer pool

* Removed megan from reviewer pool
---
 .ci/containers/contributor-checker/check-contributor.sh     | 6 +++---
 .../terraform-vcr-community/reverse_check_membership.sh     | 2 +-
 .ci/containers/terraform-vcr-tester/check_membership.sh     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ci/containers/contributor-checker/check-contributor.sh b/.ci/containers/contributor-checker/check-contributor.sh
index 6d0d5f57023e..12355765acc1 100755
--- a/.ci/containers/contributor-checker/check-contributor.sh
+++ b/.ci/containers/contributor-checker/check-contributor.sh
@@ -16,7 +16,7 @@ USER=$(curl -H "Authorization: token ${GITHUB_TOKEN}" \
 
 # This is where you add users who do not need to have an assignee chosen for
 # them.
-if $(echo $USER | fgrep -wq -e megan07 -e rambleraptor -e SirGitsalot -e slevenick -e c2thorn -e rileykarson -e melinath -e ScottSuarez -e shuyama1 -e SarahFrench); then
+if $(echo $USER | fgrep -wq -e megan07 -e slevenick -e c2thorn -e rileykarson -e melinath -e ScottSuarez -e shuyama1 -e SarahFrench -e roaks3); then
   echo "User is on the list, not assigning."
   exit 0
 fi
@@ -40,7 +40,7 @@ else
     # re-request review list
     # only re-request reviews from previous reviewers who are on the random-assignee rotation.
     # If you add people to the random-assignee rotation list below, please also add them to this list
-    if $(echo $reviewer | fgrep -wq -e rileykarson -e slevenick -e c2thorn -e melinath -e ScottSuarez -e shuyama1 -e megan07); then
+    if $(echo $reviewer | fgrep -wq -e rileykarson -e slevenick -e c2thorn -e melinath -e ScottSuarez -e shuyama1 -e megan07 -e roaks3); then
       curl -H "Authorization: token ${GITHUB_TOKEN}" \
         -d "$(jq -r --arg assignee "$reviewer" -n "{reviewers: [\$assignee], team_reviewers: []}")" \
         "https://api.github.com/repos/GoogleCloudPlatform/magic-modules/pulls/${PR_NUMBER}/requested_reviewers"
@@ -52,7 +52,7 @@ fi
 # This is where you add people to the random-assignee rotation. This list
 # might not equal the list of users who do not need to have an assigne.
 # If you add people to this list, please also add them to the re-request review list above
-ASSIGNEE=$(shuf -n 1 <(printf "rileykarson\nc2thorn\nslevenick\nscottsuarez\nshuyama1\nmegan07\nmelinath"))
+ASSIGNEE=$(shuf -n 1 <(printf "rileykarson\nc2thorn\nslevenick\nscottsuarez\nshuyama1\nmelinath\nroaks3"))
 comment=$(cat << EOF
 Hello!  I am a robot who works on Magic Modules PRs.
 
diff --git a/.ci/containers/terraform-vcr-community/reverse_check_membership.sh b/.ci/containers/terraform-vcr-community/reverse_check_membership.sh
index 438047511b54..6238701b9cfa 100755
--- a/.ci/containers/terraform-vcr-community/reverse_check_membership.sh
+++ b/.ci/containers/terraform-vcr-community/reverse_check_membership.sh
@@ -9,7 +9,7 @@ USER=$(curl -H "Authorization: token ${GITHUB_TOKEN}" \
 
 # This image runs tests for community PRs. This script reverses check_membership.sh to exit without running tests
 # for users for who tests are automatically run.
-if $(echo $USER | fgrep -wq -e megan07 -e rambleraptor -e SirGitsalot -e slevenick -e c2thorn -e rileykarson -e melinath -e ScottSuarez -e shuyama1 -e trodge); then
+if $(echo $USER | fgrep -wq -e megan07 -e slevenick -e c2thorn -e rileykarson -e melinath -e ScottSuarez -e shuyama1 -e trodge -e roaks3); then
 	echo "User is on the list, skipping."
 	exit 0
 else
diff --git a/.ci/containers/terraform-vcr-tester/check_membership.sh b/.ci/containers/terraform-vcr-tester/check_membership.sh
index aa0b42f8f26f..f1240cf733ab 100755
--- a/.ci/containers/terraform-vcr-tester/check_membership.sh
+++ b/.ci/containers/terraform-vcr-tester/check_membership.sh
@@ -8,7 +8,7 @@ USER=$(curl -H "Authorization: token ${GITHUB_TOKEN}" \
   "https://api.github.com/repos/GoogleCloudPlatform/magic-modules/issues/${pr_number}" | jq -r .user.login)
 
 # Only run tests for safe users
-if $(echo $USER | fgrep -wq -e megan07 -e rambleraptor -e SirGitsalot -e slevenick -e c2thorn -e rileykarson -e melinath -e ScottSuarez -e shuyama1 -e trodge); then
+if $(echo $USER | fgrep -wq -e megan07 -e slevenick -e c2thorn -e rileykarson -e melinath -e ScottSuarez -e shuyama1 -e trodge -e roaks3); then
 	echo "User is on the list, not skipping."
 else
 	echo "Checking GCP org membership"