Mirror changes in #382

Author: dooleydevin

bin/ghe-restore

@@ -369,9 +369,9 @@ fi
 
 # Always restore column encryption keys
 if [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 3.7.0)" ]; then
-  log_info "Always restore encrypted column encryption keys on GHES verions 3.7.0+"
+  echo "Always restore encrypted column encryption keys on GHES verions 3.7.0+"
+  ghe-restore-column-encryption-keys "$GHE_HOSTNAME"
 fi
-ghe-restore-column-encryption-keys "$GHE_HOSTNAME"
 
 # Make sure mysql and elasticsearch are prep'd and running before restoring.
 # These services will not have been started on appliances that have not been

share/github-backup-utils/ghe-restore-column-encryption-keys

@@ -11,7 +11,7 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
-bm_start "$(basename $0)"
+bm_start "$(basename "$0")"
 
 # Grab host arg
 GHE_HOSTNAME="$1"
@@ -21,22 +21,22 @@ ghe_remote_version_required "$GHE_HOSTNAME"
 
 # The snapshot to restore should be set by the ghe-restore command but this lets
 # us run this script directly.
-: ${GHE_RESTORE_SNAPSHOT:=current}
+: "${GHE_RESTORE_SNAPSHOT:=current}"
 
 # Path to snapshot dir we're restoring from
-: ${GHE_RESTORE_SNAPSHOT_PATH:="$GHE_DATA_DIR/current"}
+: "${GHE_RESTORE_SNAPSHOT_PATH:="$GHE_DATA_DIR/current"}"
 
 # Restore encrypted column encryption keying material for GHES 3.7.0 onward
-if [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 3.7.0)" ]; then
-  log_info "Restoring encrypted column encryption keying material"
+if [ "$(version "$GHE_REMOTE_VERSION")" -ge "$(version 3.7.0)" ]; then
+  echo "Restoring encrypted column encryption keying material"
   restore-secret "encrypted column encryption keying material" "encrypted-column-encryption-keying-material" "secrets.github.encrypted-column-keying-material"
 fi
 
 # Restore encrypted column current encryption key for GHES 3.8.0 onwards
-if [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 3.8.0)" ]; then
-  log_info "Restoring encrypted column current encryption key"
+if [ "$(version "$GHE_REMOTE_VERSION")" -ge "$(version 3.8.0)" ]; then
+  echo "Restoring encrypted column current encryption key"
   restore-secret "encrypted column current encryption key" "encrypted-column-current-encryption-key" "secrets.github.encrypted-column-current-encryption-key"
 fi
 
 
-bm_end "$(basename $0)"
+bm_end "$(basename "$0")"

test/test-ghe-restore.sh

@@ -337,10 +337,10 @@ end_test
 
 begin_test "ghe-restore does not encrypted column current encryption key for versions below 3.8.0"
 (
- GHE_REMOTE_VERSION=2.1.10 restore -v -f | grep -q "encrypted column current encryption key not set" && exit 1
+ GHE_REMOTE_VERSION=2.1.10 ghe-restore -v -f | grep -q "encrypted column current encryption key not set" && exit 1
   [ ! -f "$GHE_DATA_DIR/current/encrypted-column-current-encryption-key" ]
 
-  GHE_REMOTE_VERSION=3.7.0 restore -v -f | grep -q "encrypted column current encryption key not set" && exit 1
+  GHE_REMOTE_VERSION=3.7.0 ghe-restore -v -f | grep -q "encrypted column current encryption key not set" && exit 1
   [ ! -f "$GHE_DATA_DIR/current/encrypted-column-current-encryption-key" ]
 
 )