Restore enterprise-manage password hash files

Author: rtomayko

bin/ghe-restore

@@ -94,6 +94,13 @@ if $clean_restore; then
         echo "Restoring license ..."
         ghe-ssh "$host" -- 'ghe-import-license' < "$GHE_RESTORE_SNAPSHOT_PATH/enterprise.ghl" 1>&3
 
+        if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" ]; then
+            echo "Restoring management console password ..."
+            cat "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" |
+            ghe-ssh "$host" -- \
+                "sudo -u git dd of='$GHE_REMOTE_DATA_USER_DIR/common/manage-password' 2>&1"
+        fi
+
         echo "
           sudo ghe-service-ensure-mysql &&
           sudo ghe-service-ensure-elasticsearch

test/test-ghe-restore.sh

@@ -43,6 +43,7 @@ echo "fake ghe-export-ssh-host-keys data" > "$GHE_DATA_DIR/current/ssh-host-keys
 echo "fake ghe-export-repositories data" > "$GHE_DATA_DIR/current/repositories.tar"
 echo "fake ghe-export-settings data" > "$GHE_DATA_DIR/current/settings.json"
 echo "fake license data" > "$GHE_DATA_DIR/current/enterprise.ghl"
+echo "fake manage password hash data" > "$GHE_DATA_DIR/current/manage-password"
 echo "rsync" > "$GHE_DATA_DIR/current/strategy"
 
 begin_test "ghe-restore into unconfigured vm"
@@ -56,8 +57,10 @@ begin_test "ghe-restore into unconfigured vm"
     export GHE_RESTORE_HOST
 
     # run ghe-restore and write output to file for asserting against
-    ghe-restore -v > "$TRASHDIR/restore-out" 2>&1
-    cat "$TRASHDIR/restore-out"
+    if ! ghe-restore -v > "$TRASHDIR/restore-out" 2>&1; then
+        cat "$TRASHDIR/restore-out"
+        false
+    fi
 
     # verify connect to right host
     grep -q "Connect 127.0.0.1 OK" "$TRASHDIR/restore-out"
@@ -78,6 +81,12 @@ begin_test "ghe-restore into unconfigured vm"
         test -d "$GHE_REMOTE_DATA_USER_DIR/elasticsearch-legacy"
     fi
 
+    # verify manage password was restored under v2.x or greater VMs
+    if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        test -f "$GHE_REMOTE_DATA_USER_DIR/common/manage-password"
+        [ "$(cat "$GHE_REMOTE_DATA_USER_DIR/common/manage-password")" = "fake manage password hash data" ]
+    fi
+
     # verify service-ensure scripts were run under versions >= v2.x
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
         grep -q "ghe-service-ensure-mysql OK" "$TRASHDIR/restore-out"

test/testlib.sh

@@ -77,6 +77,11 @@ cd "$TRASHDIR"
 setup_remote_metadata () {
     mkdir -p "$GHE_REMOTE_DATA_DIR" "$GHE_REMOTE_DATA_USER_DIR"
     mkdir -p "$(dirname "$GHE_REMOTE_METADATA_FILE")"
+
+    if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        mkdir -p "$GHE_REMOTE_DATA_USER_DIR/common"
+    fi
+
     echo '
     {
       "timestamp": "Wed Jul 30 13:48:52 +0000 2014",