move encrypted column encryption key restore tests _above_ actions setup

Author: KyFaSt

test/test-ghe-restore.sh

@@ -281,44 +281,14 @@ begin_test "ghe-restore with no pages backup"
 )
 end_test
 
-# Setup Actions data for the subsequent tests
-setup_actions_test_data "$GHE_DATA_DIR/1"
-
-begin_test "ghe-restore invokes ghe-import-mssql"
-(
-  set -e
-  rm -rf "$GHE_REMOTE_ROOT_DIR"
-  setup_remote_metadata
-  enable_actions
-
-  # enable maintenance mode and create required directories
-  setup_maintenance_mode
-
-  # set restore host environ var
-  GHE_RESTORE_HOST=127.0.0.1
-  export GHE_RESTORE_HOST
-
-  # run ghe-restore and write output to file for asserting against
-  if ! ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
-      cat "$TRASHDIR/restore-out"
-      : ghe-restore should have exited successfully
-      false
-  fi
-
-  grep -q "Restoring MSSQL database" "$TRASHDIR/restore-out"
-  grep -q "ghe-import-mssql .* OK" "$TRASHDIR/restore-out"
-)
-end_test
-
-begin_test "ghe-restore with Kredz settings"
+begin_test "ghe-restore with encrypted column encryption keying material"
 (
   set -e
   rm -rf "$GHE_REMOTE_ROOT_DIR"
   setup_remote_metadata
-  enable_actions
 
   required_files=(
-    "kredz-credz-hmac"
+    "encrypted-column-encryption-keying-material"
   )
 
   for file in "${required_files[@]}"; do
@@ -327,24 +297,23 @@ begin_test "ghe-restore with Kredz settings"
 
   ghe-restore -v -f localhost
   required_secrets=(
-    "secrets.kredz.credz-hmac-secret"
+    "secrets.github.encrypted-column-keying-material"
   )
-  
+
   for secret in "${required_secrets[@]}"; do
     [ "$(ghe-ssh "$GHE_HOSTNAME" -- ghe-config "$secret")" = "foo" ]
   done
 )
 end_test
 
-begin_test "ghe-restore with kredz-varz settings"
+begin_test "ghe-restore with encrypted column current encryption key"
 (
   set -e
   rm -rf "$GHE_REMOTE_ROOT_DIR"
   setup_remote_metadata
-  enable_actions
 
   required_files=(
-    "kredz-varz-hmac"
+    "encrypted-column-current-encryption-key"
   )
 
   for file in "${required_files[@]}"; do
@@ -353,7 +322,7 @@ begin_test "ghe-restore with kredz-varz settings"
 
   ghe-restore -v -f localhost
   required_secrets=(
-    "secrets.kredz.varz-hmac-secret"
+    "secrets.github.encrypted-column-current-encryption-key"
   )
 
   for secret in "${required_secrets[@]}"; do
@@ -362,15 +331,44 @@ begin_test "ghe-restore with kredz-varz settings"
 )
 end_test
 
+# Setup Actions data for the subsequent tests
+setup_actions_test_data "$GHE_DATA_DIR/1"
 
-begin_test "ghe-restore with encrypted column encryption keying material"
+begin_test "ghe-restore invokes ghe-import-mssql"
 (
   set -e
   rm -rf "$GHE_REMOTE_ROOT_DIR"
   setup_remote_metadata
+  enable_actions
+
+  # enable maintenance mode and create required directories
+  setup_maintenance_mode
+
+  # set restore host environ var
+  GHE_RESTORE_HOST=127.0.0.1
+  export GHE_RESTORE_HOST
+
+  # run ghe-restore and write output to file for asserting against
+  if ! ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
+      cat "$TRASHDIR/restore-out"
+      : ghe-restore should have exited successfully
+      false
+  fi
+
+  grep -q "Restoring MSSQL database" "$TRASHDIR/restore-out"
+  grep -q "ghe-import-mssql .* OK" "$TRASHDIR/restore-out"
+)
+end_test
+
+begin_test "ghe-restore with Kredz settings"
+(
+  set -e
+  rm -rf "$GHE_REMOTE_ROOT_DIR"
+  setup_remote_metadata
+  enable_actions
 
   required_files=(
-    "encrypted-column-encryption-keying-material"
+    "kredz-credz-hmac"
   )
 
   for file in "${required_files[@]}"; do
@@ -379,7 +377,7 @@ begin_test "ghe-restore with encrypted column encryption keying material"
 
   ghe-restore -v -f localhost
   required_secrets=(
-    "secrets.github.encrypted-column-keying-material"
+    "secrets.kredz.credz-hmac-secret"
   )
 
   for secret in "${required_secrets[@]}"; do
@@ -388,14 +386,15 @@ begin_test "ghe-restore with encrypted column encryption keying material"
 )
 end_test
 
-begin_test "ghe-restore with encrypted column current encryption key"
+begin_test "ghe-restore with kredz-varz settings"
 (
   set -e
   rm -rf "$GHE_REMOTE_ROOT_DIR"
   setup_remote_metadata
+  enable_actions
 
   required_files=(
-    "encrypted-column-current-encryption-key"
+    "kredz-varz-hmac"
   )
 
   for file in "${required_files[@]}"; do
@@ -404,7 +403,7 @@ begin_test "ghe-restore with encrypted column current encryption key"
 
   ghe-restore -v -f localhost
   required_secrets=(
-    "secrets.github.encrypted-column-current-encryption-key"
+    "secrets.kredz.varz-hmac-secret"
   )
 
   for secret in "${required_secrets[@]}"; do