@@ -389,7 +389,7 @@ begin_test "ghe-restore with encrypted column current encryption key for version
389
389
)
390
390
end_test
391
391
392
- begin_test " ghe-restore with secret scanning encrypted secrets encryption keys"
392
+ begin_test " ghe-restore with secret scanning encrypted secrets encryption keys for versions below 3.8.0 "
393
393
(
394
394
set -e
395
395
rm -rf " $GHE_REMOTE_ROOT_DIR "
@@ -406,7 +406,7 @@ begin_test "ghe-restore with secret scanning encrypted secrets encryption keys"
406
406
echo " foo" > " $GHE_DATA_DIR /current/$file "
407
407
done
408
408
409
- ghe-restore -v -f localhost
409
+ GHE_REMOTE_VERSION=3.7.0 ghe-restore -v -f localhost
410
410
411
411
required_secrets=(
412
412
" secrets.secret-scanning.encrypted-secrets-current-storage-key"
@@ -416,7 +416,40 @@ begin_test "ghe-restore with secret scanning encrypted secrets encryption keys"
416
416
)
417
417
418
418
for secret in " ${required_secrets[@]} " ; do
419
- [ " $( ghe-ssh " $GHE_HOSTNAME " -- ghe-config " $secret " ) " = " foo" ]
419
+ [ " $( ghe-ssh " $GHE_HOSTNAME " -- ghe-config " $secret " ) " = " " ] # expecting these to not be set for versions below 3.8.0
420
+ done
421
+ )
422
+ end_test
423
+
424
+
425
+ begin_test " ghe-restore with secret scanning encrypted secrets encryption keys for versions 3.8.0+"
426
+ (
427
+ set -e
428
+ rm -rf " $GHE_REMOTE_ROOT_DIR "
429
+ setup_remote_metadata
430
+
431
+ required_files=(
432
+ " secret-scanning-encrypted-secrets-current-storage-key"
433
+ " secret-scanning-encrypted-secrets-delimited-storage-keys"
434
+ " secret-scanning-encrypted-secrets-current-shared-transit-key"
435
+ " secret-scanning-encrypted-secrets-delimited-shared-transit-keys"
436
+ )
437
+
438
+ for file in " ${required_files[@]} " ; do
439
+ echo " foo" > " $GHE_DATA_DIR /current/$file "
440
+ done
441
+
442
+ GHE_REMOTE_VERSION=3.8.0 ghe-restore -v -f localhost
443
+
444
+ required_secrets=(
445
+ " secrets.secret-scanning.encrypted-secrets-current-storage-key"
446
+ " secrets.secret-scanning.encrypted-secrets-delimited-storage-keys"
447
+ " secrets.secret-scanning.encrypted-secrets-current-shared-transit-key"
448
+ " secrets.secret-scanning.encrypted-secrets-delimited-shared-transit-keys"
449
+ )
450
+
451
+ for secret in " ${required_secrets[@]} " ; do
452
+ [ " $( ghe-ssh " $GHE_HOSTNAME " -- ghe-config " $secret " ) " = " foo" ] # expecting this to have been restored successfully for versions 3.8.0+
420
453
done
421
454
)
422
455
end_test
0 commit comments