From 408c848065464260886ceed170224d1641741831 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Mon, 10 Feb 2025 08:35:23 -0500
Subject: [PATCH] update to use users.add file

---
 local-app/git-xargs/add-gpg-keys.edl.sh       | 18 +++++++++++++--
 .../git-xargs/add-gpg-keys.edl.users-add.txt  |  1 +
 .../git-xargs/submit.add-gpg-keys.edl.sh      | 22 +++++++++++++++++--
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 local-app/git-xargs/add-gpg-keys.edl.users-add.txt

diff --git a/local-app/git-xargs/add-gpg-keys.edl.sh b/local-app/git-xargs/add-gpg-keys.edl.sh
index e30387dd..95eb7213 100755
--- a/local-app/git-xargs/add-gpg-keys.edl.sh
+++ b/local-app/git-xargs/add-gpg-keys.edl.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="1.0.4"
+VERSION="1.1.1"
 LOGFILE="/tmp/git-xargs.$XARGS_REPO_NAME.$$.log"
 THIS=$(basname $0 .sh)
 
@@ -8,7 +8,21 @@ exec 3>&1 4>&2
 trap 'exec 2>&4 1>&3' 0 1 2 3
 exec 1>$LOGFILE 2>&1
 
-USERS="house343 rudd0009 sung0005 vora0002"
+if [ -z "$1" ]
+then
+  USERSFILE="$(pwd)/$THIS.users-add.txt"
+else
+  USERSFILE="$1"
+fi
+
+if [ ! -r $USERSFILE ]
+then
+  echo "* missing $USERSFILE"
+  exit 1
+else
+  echo "* reading users from $USERSFILE"
+  USERS=$(cat $USERSFILE)
+fi
 
 echo "* starting $THIS v$VERSION at $(date)"
 if [[ -d "init/git-secret" ]] && [[ -d ".gitsecret" ]]
diff --git a/local-app/git-xargs/add-gpg-keys.edl.users-add.txt b/local-app/git-xargs/add-gpg-keys.edl.users-add.txt
new file mode 100644
index 00000000..bd1db049
--- /dev/null
+++ b/local-app/git-xargs/add-gpg-keys.edl.users-add.txt
@@ -0,0 +1 @@
+naray007
diff --git a/local-app/git-xargs/submit.add-gpg-keys.edl.sh b/local-app/git-xargs/submit.add-gpg-keys.edl.sh
index cd56c28f..7c126332 100755
--- a/local-app/git-xargs/submit.add-gpg-keys.edl.sh
+++ b/local-app/git-xargs/submit.add-gpg-keys.edl.sh
@@ -1,7 +1,25 @@
+#!/bin/bash
+
+VERSION="1.1.1"
+SCRIPT="$(pwd)/add-gpg-keys.edl.sh"
+SCRIPTBASE=$(basename $SCRIPT .sh)
+LOGFILE="$SCRIPTBASE.sh.$(date +%s).log"
+USERSFILE="$(pwd)/$SCRIPTBASE.users-add.txt"
+if [ ! -r $USERSFILE ]
+then
+  echo "* missing $USERSFILE"
+  exit 1
+else
+  echo "* reading users from $USERSFILE"
+  USERS=$(cat $USERSFILE)
+fi
+
+echo "* running $SCRIPT across all EDL repos for users $USERS, log in $LOGFILE"
+
 GITHUB_HOSTNAME=github.e.it.census.gov GITHUB_OAUTH_TOKEN=ae2f950f5d628d665e6498bc699cdf24566bd94c git-xargs  \
   --branch-name master \
   --skip-pull-requests \
-  --commit-message '[xargs] add gpg for user users' \
+  --commit-message "[xargs] add gpg for users $USERS" \
   --no-skip-ci  \
   --repos tf-repo.edl.txt \
-  "$(pwd)/add-gpg-keys.edl.sh" |& tee add-gpg-keys.edl.sh.$(date +%s).log
+  "$SCRIPT" "$USERSFILE" |& tee $LOGFILE