fix is_default_external_database_snapshot function

christopherb-stripe · christopherb-stripe · commit 1be167b12be4 · 2021-04-12T23:06:56.000-07:00
This function tries to access an argument ($1) but no invocations of this
function pass in an argument. The implementation has been changed to rely on
variables from the environment which allow it correctly find the appropriate
sentinel file.
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
@@ -462,7 +462,7 @@ is_external_database_snapshot(){
 # This file exists if this is a backup for an external database AND the backup was
 # taken via our logical backup strategy.
 is_default_external_database_snapshot(){
-  is_external_database_snapshot && test -f "$1/logical-external-database-backup-sentinel"
+  is_external_database_snapshot && test -f "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/logical-external-database-backup-sentinel"
 }
 
 prompt_for_confirmation(){

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ is_external_database_snapshot(){`
`462`	`462`	`# This file exists if this is a backup for an external database AND the backup was`
`463`	`463`	`# taken via our logical backup strategy.`
`464`	`464`	`is_default_external_database_snapshot(){`
`465`		`- is_external_database_snapshot && test -f "$1/logical-external-database-backup-sentinel"`
	`465`	`+ is_external_database_snapshot && test -f "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/logical-external-database-backup-sentinel"`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`prompt_for_confirmation(){`