refactor: ghe-cluster-each --print, --ip, --uuid flags

Author: tyliec

share/github-backup-utils/ghe-cluster-nodes

@@ -28,7 +28,7 @@ prefix="$2"
 role=$(echo "$prefix" | cut -d '-' -f1)
 
 if ghe-ssh "$GHE_HOSTNAME" test -f $GHE_REMOTE_ROOT_DIR/etc/github/cluster; then
-  node_uuids=$(ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r "$role" -u)
+  node_uuids=$(ghe-ssh "$GHE_HOSTNAME" /usr/local/bin/ghe-cluster-nodes -r "$role" -u | cut -f 2)
   hostnames=''
   for uuid in $node_uuids; do
     hostnames+="$prefix-$uuid "

test/bin/ghe-cluster-each

@@ -1,21 +1,11 @@
 #!/usr/bin/env bash
-# Usage: ghe-config
-# Emulates the remote GitHub ghe-config command. Tests use this
+# Usage: ghe-cluster-each
+# Emulates the remote GitHub ghe-cluster-each command. Tests use this
 # to assert that the command was executed.
 set -e
 
 for _ in "$@"; do
   case "$1" in
-    -u)
-      SHOW_UUID=true
-      shift
-      ;;
-    -r|--role)
-        # fake change last save timestamp every 1s
-        ROLE=$2
-        shift
-        shift
-        ;;
     --)
       if [ "$1" = "--" ]; then
         shift
@@ -43,22 +33,3 @@ if [ "$COMMAND" == "/usr/local/share/enterprise/ghe-nomad-cleanup" ]; then
   echo "nomad cleanup"
   exit 0
 fi
-
-if $SHOW_UUID; then
-  CONFIG="$GHE_REMOTE_DATA_USER_DIR/common/cluster.conf"
-
-  hosts=$(git config -f $CONFIG --get-regexp cluster.*.hostname | cut -d ' ' -f2)
-
-  if [ -z "$hosts" ]; then
-    # Mimic `ghe-cluster-each $role -u`
-    echo "fake-uuid
-  fake-uuid1
-  fake-uuid2
-  "
-  else
-    for hostname in $hosts; do
-      [ -n "$ROLE" ] && [ "$(git config -f $CONFIG cluster.$hostname.$ROLE-server)" != "true" ] && continue
-      echo $hostname
-    done
-  fi
-fi

test/bin/ghe-cluster-nodes

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Usage: ghe-cluster-nodes
+# Emulates the remote GitHub ghe-cluster-nodes command. Tests use this
+# to assert that the command was executed.
+set -e
+
+for _ in "$@"; do
+  case "$1" in
+    -r|--role)
+        MATCH_ROLE=$2
+        shift
+        ;;
+    -u|--uuid)
+        PRINT_UUIDS=true
+        shift
+        ;;
+  esac
+done
+
+CONFIG="$GHE_REMOTE_DATA_USER_DIR/common/cluster.conf"
+
+hosts=$(git config -f $CONFIG --get-regexp cluster.*.hostname | cut -d ' ' -f2)
+
+for hostname in $hosts; do
+    [ -n "$MATCH_ROLE" ] && [ "$(git config -f $CONFIG cluster.$hostname.$MATCH_ROLE-server)" != "true" ] && continue
+
+    print_line="$hostname"
+
+    if [ -n "$PRINT_UUIDS" ]; then
+        uuid="$(ghe-config cluster.$hostname.uuid || true)"
+        print_line="$print_line\t$uuid"
+    fi
+
+    echo -e "${print_line#\\t}"
+done