Move enforcement to ghe-host-check

This ensures all the individual scripts also detect the version step 
down if run individually.

Author: lildude

bin/ghe-host-check

@@ -91,6 +91,17 @@ if [ -z "$version" ]; then
   exit 2
 fi
 
+# Block restoring snapshots to older releases of GitHub Enterprise
+if [ -n "$GHE_RESTORE_SNAPSHOT_PATH" ]; then
+  snapshot_version=$(cat $GHE_RESTORE_SNAPSHOT_PATH/version)
+  # shellcheck disable=SC2046 # Word splitting is required to populate the variables
+  read -r snapshot_version_major snapshot_version_minor _ <<<$(ghe_parse_version $snapshot_version)
+  if [ "$(version $GHE_REMOTE_VERSION)" -lt "$(version $snapshot_version_major.$snapshot_version_minor.0)" ]; then
+    echo "Error: Snapshot can not be restored to an older release of GitHub Enterprise." >&2
+    exit 1
+  fi
+fi
+
 if [ -z "$GHE_ALLOW_REPLICA_BACKUP" ]; then
   if [ "$(ghe-ssh $host -- cat $GHE_REMOTE_ROOT_DIR/etc/github/repl-state 2>/dev/null || true)" = "replica" ]; then
     echo "Error: high availability replica detected." 1>&2

bin/ghe-restore

@@ -106,15 +106,6 @@ GHE_BACKUP_STRATEGY=$(cat "$GHE_RESTORE_SNAPSHOT_PATH/strategy")
 # Perform a host-check and establish the remote version in GHE_REMOTE_VERSION.
 ghe_remote_version_required "$GHE_HOSTNAME"
 
-# Block restoring snapshots to older releases of GitHub Enterprise
-snapshot_version=$(cat $GHE_RESTORE_SNAPSHOT_PATH/version)
-# shellcheck disable=SC2046 # Word splitting is required to populate the variables
-read -r snapshot_version_major snapshot_version_minor _ <<<$(ghe_parse_version $snapshot_version)
-if [ "$(version $GHE_REMOTE_VERSION)" -lt "$(version $snapshot_version_major.$snapshot_version_minor.0)" ]; then
-  echo "Error: Snapshot can not be restored to an older release of GitHub Enterprise." >&2
-  exit 1
-fi
-
 # Figure out if this instance has been configured or is entirely new.
 instance_configured=false
 if ghe-ssh "$GHE_HOSTNAME" -- "[ -f '$GHE_REMOTE_ROOT_DIR/etc/github/configured' ]"; then

test/test-ghe-host-check.sh

@@ -78,3 +78,16 @@ begin_test "ghe-host-check detects high availability replica"
   GHE_ALLOW_REPLICA_BACKUP=yes ghe-host-check
 )
 end_test
+
+begin_test "ghe-host-check blocks restore to old release"
+(
+  set -e
+  
+  mkdir -p "$GHE_DATA_DIR/current/"
+  echo "$GHE_TEST_REMOTE_VERSION" > "$GHE_DATA_DIR/current/version"
+
+  # shellcheck disable=SC2046 # Word splitting is required to populate the variables
+  read -r bu_version_major bu_version_minor bu_version_patch <<<$(ghe_parse_version $GHE_TEST_REMOTE_VERSION)
+  ! GHE_TEST_REMOTE_VERSION=$bu_version_major.$((bu_version_minor-1)).$bu_version_patch ghe-restore -v
+)
+end_test

test/test-ghe-restore.sh

@@ -398,18 +398,6 @@ begin_test "ghe-restore exits early on unsupported version"
 )
 end_test
 
-begin_test "ghe-restore exits early when restoring to older release"
-(
-  set -e
-  GHE_RESTORE_HOST=127.0.0.1
-  export GHE_RESTORE_HOST
-
-  # shellcheck disable=SC2046 # Word splitting is required to populate the variables
-  read -r bu_version_major bu_version_minor bu_version_patch <<<$(ghe_parse_version $GHE_TEST_REMOTE_VERSION)
-  ! GHE_TEST_REMOTE_VERSION=$bu_version_major.$((bu_version_minor-1)).$bu_version_patch ghe-restore -v
-)
-end_test
-
 # Reset data for sub-subsequent tests
 rm -rf "$GHE_DATA_DIR/1"
 setup_test_data "$GHE_DATA_DIR/1"