Merge pull request #729 from github/djdefi-no-es-hookshot

Remove deprecated es-hookshot backup and restore

Author: djdefi

bin/ghe-backup

@@ -203,10 +203,6 @@ commands+=("
 echo \"Backing up audit log ...\"
 ghe-backup-es-audit-log || printf %s \"audit-log \" >> \"$failures_file\"")
 
-commands+=("
-echo \"Backing up hookshot logs ...\"
-ghe-backup-es-hookshot || printf %s \"hookshot \" >> \"$failures_file\"")
-
 commands+=("
 echo \"Backing up Git repositories ...\"
 ghe-backup-repositories || printf %s \"repositories \" >> \"$failures_file\"")

bin/ghe-restore

@@ -380,7 +380,7 @@ if test -f $GHE_RESTORE_SNAPSHOT_PATH/es-scan-complete; then
   ghe-ssh "$GHE_HOSTNAME" -- "sudo touch $GHE_REMOTE_DATA_USER_DIR/common/es-scan-complete"
 fi
 
-# Restore exported audit and hookshot logs to 2.12.9 and newer single nodes and
+# Restore exported audit logs to 2.12.9 and newer single nodes and
 # all releases of cluster
 if $CLUSTER || [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 2.12.9)" ]; then
   if [[ "$GHE_RESTORE_SKIP_AUDIT_LOGS" = "yes" ]]; then
@@ -391,9 +391,6 @@ if $CLUSTER || [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 2.12.9)" ]; the
     ghe-restore-es-audit-log \"$GHE_HOSTNAME\" 1>&3")
   fi
 
-  commands+=("
-  echo \"Restoring hookshot logs ...\"
-  ghe-restore-es-hookshot \"$GHE_HOSTNAME\" 1>&3")
 fi
 
 if [ "$GHE_PARALLEL_ENABLED" = "yes" ]; then

share/github-backup-utils/ghe-backup-es-hookshot

@@ -3,7 +3,7 @@
 # Fake curl command stub for tests.
 set -e
 
-# Return empty list of indexes for ghe-backup-es-audit-log and ghe-backup-es-hookshot
+# Return empty list of indexes for ghe-backup-es-audit-log
 if echo "$@" | grep -q '_cat/indices/'; then
   exit 0
 # Exit with non-zero code to mimic a non-existant index

share/github-backup-utils/ghe-restore-es-hookshot

@@ -132,19 +132,6 @@ begin_test "ghe-backup without password pepper"
 )
 end_test
 
-begin_test "ghe-backup empty hookshot directory"
-(
-  set -e
-
-  rm -rf $GHE_REMOTE_DATA_USER_DIR/hookshot/repository-*
-  rm -rf $GHE_DATA_DIR/current/hookshot/repository-*
-  ghe-backup
-
-  # Check that the "--link-dest arg does not exist" message hasn't occurred.
-  [ ! "$(grep "[l]ink-dest arg does not exist" $TRASHDIR/out)" ]
-)
-end_test
-
 begin_test "ghe-backup empty git-hooks directory"
 (
   set -e

test/bin/curl

@@ -261,11 +261,6 @@ setup_test_data () {
   echo "fake audit log this yr this mth" | gzip > audit_log-1-$this_yr-$this_mth-1.gz
   echo "1" > audit_log-1-$this_yr-$this_mth-1.size
 
-  # Create hookshot logs
-  mkdir -p "$loc/hookshot/"
-  cd "$loc/hookshot/"
-  echo "fake hookshot log" | gzip > hookshot-logs-2018-03-05.gz
-
   # Create some test repositories in the remote repositories dir
   mkdir -p "$loc/repositories/info"
   mkdir -p "$TRASHDIR/hooks"
@@ -497,7 +492,6 @@ verify_all_restored_data() {
   else
     grep -q "fake audit log last yr last mth" "$TRASHDIR/restore-out"
     grep -q "fake audit log this yr this mth" "$TRASHDIR/restore-out"
-    grep -q "fake hookshot log" "$TRASHDIR/restore-out"
   fi
 
   # verify settings import was *not* run due to instance already being