From 5d84cef63cf0fe2ad993bd385947ed9c0d5fcf50 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Fri, 1 Jan 2021 22:14:54 +0200 Subject: [PATCH] `app restore` --- CHANGELOG.md | 2 +- abra | 200 +++++++++++++++++++++++++++++---------------------- 2 files changed, 114 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b53cc84..527053d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ - Use `# length=x` comments to generate passwords with `pwgen` and drop `KEY`/`PASSWORD` logic ([#68](https://git.autonomic.zone/coop-cloud/abra/issues/68)) - Global `--skip-update` / `--skip-check` options to make things quicker, [37e8b00](https://git.autonomic.zone/coop-cloud/abra/commit/37e8b00) -- `app backup` command; requires per-app definition -- see +- `app backup` and `app restore` commands; requires per-app definition -- see [#70](https://git.autonomic.zone/coop-cloud/abra/issues/70) # abra 0.4.1 (2020-12-24) diff --git a/abra b/abra index f0af2a4..030fd77 100755 --- a/abra +++ b/abra @@ -23,10 +23,12 @@ Usage: abra [options] app ps abra [options] app restore (|--all) abra [options] app (rm|delete) [--force] + abra [options] app restore [] abra [options] app run [--no-tty] [--user=] ... abra [options] app secret generate ( |--all) [] [--pass] abra [options] app secret insert [--pass] abra [options] app secret (rm|delete) (|--all) [--pass] [--force] + abra [options] app undeploy abra [options] app [...] abra [options] server add [] [] abra [options] server (list|ls) @@ -146,89 +148,92 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() { printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() { [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() { -printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1599} -usage=${DOC:40:1223}; digest=70cdc -shorts=(-U -e -s -h -C '' '' '' '' '' '' '' '' '' '') -longs=(--skip-update --env --stack --help --skip-check --status --server --domain --app-name --pass --secrets --all --force --no-tty --user) -argcounts=(0 1 1 0 0 0 1 1 1 0 0 0 0 0 1); node_0(){ switch __skip_update 0; } -node_1(){ value __env 1; }; node_2(){ value __stack 2; }; node_3(){ -switch __help 3; }; node_4(){ switch __skip_check 4; }; node_5(){ +printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1696} +usage=${DOC:40:1320}; digest=563d5 +shorts=(-h -s -e -U -C '' '' '' '' '' '' '' '' '' '') +longs=(--help --stack --env --skip-update --skip-check --status --server --domain --app-name --pass --secrets --all --force --no-tty --user) +argcounts=(0 1 1 0 0 0 1 1 1 0 0 0 0 0 1); node_0(){ switch __help 0; } +node_1(){ value __stack 1; }; node_2(){ value __env 2; }; node_3(){ +switch __skip_update 3; }; node_4(){ switch __skip_check 4; }; node_5(){ switch __status 5; }; node_6(){ value __server 6; }; node_7(){ value __domain 7 }; node_8(){ value __app_name 8; }; node_9(){ switch __pass 9; }; node_10(){ switch __secrets 10; }; node_11(){ switch __all 11; }; node_12(){ switch __force 12; }; node_13(){ switch __no_tty 13; }; node_14(){ value __user 14; }; node_15(){ value _type_ a; }; node_16(){ value _app_ a; } node_17(){ value _service_ a; }; node_18(){ value _src_ a; }; node_19(){ -value _dst_ a; }; node_20(){ value _args_ a true; }; node_21(){ value _secret_ a -}; node_22(){ value _version_ a; }; node_23(){ value _cmd_ a; }; node_24(){ -value _data_ a; }; node_25(){ value _command_ a; }; node_26(){ value _host_ a; } -node_27(){ value _user_ a; }; node_28(){ value _port_ a; }; node_29(){ -value _subcommands_ a true; }; node_30(){ _command app; }; node_31(){ -_command list; }; node_32(){ _command ls; }; node_33(){ _command new; } -node_34(){ _command backup; }; node_35(){ _command deploy; }; node_36(){ -_command check; }; node_37(){ _command config; }; node_38(){ _command cp; } -node_39(){ _command logs; }; node_40(){ _command ps; }; node_41(){ -_command restore; }; node_42(){ _command rm; }; node_43(){ _command delete; } -node_44(){ _command run; }; node_45(){ _command secret; }; node_46(){ -_command generate; }; node_47(){ _command insert; }; node_48(){ _command server -}; node_49(){ _command add; }; node_50(){ _command init; }; node_51(){ -_command apps; }; node_52(){ _command upgrade; }; node_53(){ _command version; } -node_54(){ _command help; }; node_55(){ optional 0 1 2 3 4; }; node_56(){ -optional 55; }; node_57(){ either 31 32; }; node_58(){ required 57; } -node_59(){ optional 5; }; node_60(){ optional 6; }; node_61(){ -required 56 30 58 59 60; }; node_62(){ optional 7; }; node_63(){ optional 8; } -node_64(){ optional 9; }; node_65(){ optional 10; }; node_66(){ -required 56 30 33 60 62 63 64 65 15; }; node_67(){ either 17 11; }; node_68(){ -required 67; }; node_69(){ required 56 30 16 34 68; }; node_70(){ -required 56 30 16 35; }; node_71(){ required 56 30 16 36; }; node_72(){ -required 56 30 16 37; }; node_73(){ required 56 30 16 38 18 19; }; node_74(){ -optional 17; }; node_75(){ required 56 30 16 39 74; }; node_76(){ -required 56 30 16 40; }; node_77(){ required 56 30 16 41 68; }; node_78(){ -either 42 43; }; node_79(){ required 78; }; node_80(){ optional 12; } -node_81(){ required 56 30 16 79 80; }; node_82(){ optional 13; }; node_83(){ -optional 14; }; node_84(){ oneormore 20; }; node_85(){ -required 56 30 16 44 82 83 17 84; }; node_86(){ required 21 22; }; node_87(){ -either 86 11; }; node_88(){ required 87; }; node_89(){ optional 23; } -node_90(){ required 56 30 16 45 46 88 89 64; }; node_91(){ -required 56 30 16 45 47 21 22 24 64; }; node_92(){ either 21 11; }; node_93(){ -required 92; }; node_94(){ required 56 30 16 45 79 93 64 80; }; node_95(){ -optional 84; }; node_96(){ required 56 30 16 25 95; }; node_97(){ optional 27; } -node_98(){ optional 28; }; node_99(){ required 56 48 49 26 97 98; }; node_100(){ -required 56 48 58; }; node_101(){ required 56 48 26 42; }; node_102(){ -required 56 48 26 50; }; node_103(){ required 56 48 26 51 59; }; node_104(){ -required 56 52; }; node_105(){ required 56 53; }; node_106(){ oneormore 29; } -node_107(){ optional 106; }; node_108(){ required 56 54 107; }; node_109(){ -either 61 66 69 70 71 72 73 75 76 77 81 85 90 91 94 96 99 100 101 102 103 104 105 108 -}; node_110(){ required 109; }; cat <<<' docopt_exit() { -[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1223}" >&2 -exit 1; }'; unset var___skip_update var___env var___stack var___help \ +value _dst_ a; }; node_20(){ value _backup_file_ a; }; node_21(){ +value _args_ a true; }; node_22(){ value _secret_ a; }; node_23(){ +value _version_ a; }; node_24(){ value _cmd_ a; }; node_25(){ value _data_ a; } +node_26(){ value _command_ a; }; node_27(){ value _host_ a; }; node_28(){ +value _user_ a; }; node_29(){ value _port_ a; }; node_30(){ +value _subcommands_ a true; }; node_31(){ _command app; }; node_32(){ +_command list; }; node_33(){ _command ls; }; node_34(){ _command new; } +node_35(){ _command backup; }; node_36(){ _command deploy; }; node_37(){ +_command check; }; node_38(){ _command config; }; node_39(){ _command cp; } +node_40(){ _command logs; }; node_41(){ _command ps; }; node_42(){ +_command restore; }; node_43(){ _command rm; }; node_44(){ _command delete; } +node_45(){ _command run; }; node_46(){ _command secret; }; node_47(){ +_command generate; }; node_48(){ _command insert; }; node_49(){ +_command undeploy; }; node_50(){ _command server; }; node_51(){ _command add; } +node_52(){ _command init; }; node_53(){ _command apps; }; node_54(){ +_command upgrade; }; node_55(){ _command version; }; node_56(){ _command help; } +node_57(){ optional 0 1 2 3 4; }; node_58(){ optional 57; }; node_59(){ +either 32 33; }; node_60(){ required 59; }; node_61(){ optional 5; }; node_62(){ +optional 6; }; node_63(){ required 58 31 60 61 62; }; node_64(){ optional 7; } +node_65(){ optional 8; }; node_66(){ optional 9; }; node_67(){ optional 10; } +node_68(){ required 58 31 34 62 64 65 66 67 15; }; node_69(){ either 17 11; } +node_70(){ required 69; }; node_71(){ required 58 31 16 35 70; }; node_72(){ +required 58 31 16 36; }; node_73(){ required 58 31 16 37; }; node_74(){ +required 58 31 16 38; }; node_75(){ required 58 31 16 39 18 19; }; node_76(){ +optional 17; }; node_77(){ required 58 31 16 40 76; }; node_78(){ +required 58 31 16 41; }; node_79(){ required 58 31 16 42 70; }; node_80(){ +either 43 44; }; node_81(){ required 80; }; node_82(){ optional 12; } +node_83(){ required 58 31 16 81 82; }; node_84(){ optional 20; }; node_85(){ +required 58 31 16 42 17 84; }; node_86(){ optional 13; }; node_87(){ optional 14 +}; node_88(){ oneormore 21; }; node_89(){ required 58 31 16 45 86 87 17 88; } +node_90(){ required 22 23; }; node_91(){ either 90 11; }; node_92(){ required 91 +}; node_93(){ optional 24; }; node_94(){ required 58 31 16 46 47 92 93 66; } +node_95(){ required 58 31 16 46 48 22 23 25 66; }; node_96(){ either 22 11; } +node_97(){ required 96; }; node_98(){ required 58 31 16 46 81 97 66 82; } +node_99(){ required 58 31 16 49; }; node_100(){ optional 88; }; node_101(){ +required 58 31 16 26 100; }; node_102(){ optional 28; }; node_103(){ optional 29 +}; node_104(){ required 58 50 51 27 102 103; }; node_105(){ required 58 50 60; } +node_106(){ required 58 50 27 43; }; node_107(){ required 58 50 27 52; } +node_108(){ required 58 50 27 53 61; }; node_109(){ required 58 54; } +node_110(){ required 58 55; }; node_111(){ oneormore 30; }; node_112(){ +optional 111; }; node_113(){ required 58 56 112; }; node_114(){ +either 63 68 71 72 73 74 75 77 78 79 83 85 89 94 95 98 99 101 104 105 106 107 108 109 110 113 +}; node_115(){ required 114; }; cat <<<' docopt_exit() { +[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1320}" >&2 +exit 1; }'; unset var___help var___stack var___env var___skip_update \ var___skip_check var___status var___server var___domain var___app_name \ var___pass var___secrets var___all var___force var___no_tty var___user \ -var__type_ var__app_ var__service_ var__src_ var__dst_ var__args_ var__secret_ \ -var__version_ var__cmd_ var__data_ var__command_ var__host_ var__user_ \ -var__port_ var__subcommands_ var_app var_list var_ls var_new var_backup \ -var_deploy var_check var_config var_cp var_logs var_ps var_restore var_rm \ -var_delete var_run var_secret var_generate var_insert var_server var_add \ -var_init var_apps var_upgrade var_version var_help; parse 110 "$@" -local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__skip_update" \ -"${prefix}__env" "${prefix}__stack" "${prefix}__help" "${prefix}__skip_check" \ -"${prefix}__status" "${prefix}__server" "${prefix}__domain" \ -"${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \ -"${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}_type_" \ -"${prefix}_app_" "${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" \ -"${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" \ -"${prefix}_data_" "${prefix}_command_" "${prefix}_host_" "${prefix}_user_" \ -"${prefix}_port_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \ -"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \ -"${prefix}check" "${prefix}config" "${prefix}cp" "${prefix}logs" "${prefix}ps" \ -"${prefix}restore" "${prefix}rm" "${prefix}delete" "${prefix}run" \ -"${prefix}secret" "${prefix}generate" "${prefix}insert" "${prefix}server" \ -"${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \ -"${prefix}version" "${prefix}help" -eval "${prefix}"'__skip_update=${var___skip_update:-false}' -eval "${prefix}"'__env=${var___env:-}' +var__type_ var__app_ var__service_ var__src_ var__dst_ var__backup_file_ \ +var__args_ var__secret_ var__version_ var__cmd_ var__data_ var__command_ \ +var__host_ var__user_ var__port_ var__subcommands_ var_app var_list var_ls \ +var_new var_backup var_deploy var_check var_config var_cp var_logs var_ps \ +var_restore var_rm var_delete var_run var_secret var_generate var_insert \ +var_undeploy var_server var_add var_init var_apps var_upgrade var_version \ +var_help; parse 115 "$@"; local prefix=${DOCOPT_PREFIX:-''} +unset "${prefix}__help" "${prefix}__stack" "${prefix}__env" \ +"${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__status" \ +"${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ +"${prefix}__pass" "${prefix}__secrets" "${prefix}__all" "${prefix}__force" \ +"${prefix}__no_tty" "${prefix}__user" "${prefix}_type_" "${prefix}_app_" \ +"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" \ +"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \ +"${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" \ +"${prefix}_host_" "${prefix}_user_" "${prefix}_port_" "${prefix}_subcommands_" \ +"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \ +"${prefix}deploy" "${prefix}check" "${prefix}config" "${prefix}cp" \ +"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \ +"${prefix}delete" "${prefix}run" "${prefix}secret" "${prefix}generate" \ +"${prefix}insert" "${prefix}undeploy" "${prefix}server" "${prefix}add" \ +"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}version" \ +"${prefix}help"; eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__stack=${var___stack:-}' -eval "${prefix}"'__help=${var___help:-false}' +eval "${prefix}"'__env=${var___env:-}' +eval "${prefix}"'__skip_update=${var___skip_update:-false}' eval "${prefix}"'__skip_check=${var___skip_check:-false}' eval "${prefix}"'__status=${var___status:-false}' eval "${prefix}"'__server=${var___server:-}' @@ -243,6 +248,7 @@ eval "${prefix}"'__user=${var___user:-}' eval "${prefix}"'_type_=${var__type_:-}'; eval "${prefix}"'_app_=${var__app_:-}' eval "${prefix}"'_service_=${var__service_:-}' eval "${prefix}"'_src_=${var__src_:-}'; eval "${prefix}"'_dst_=${var__dst_:-}' +eval "${prefix}"'_backup_file_=${var__backup_file_:-}' if declare -p var__args_ >/dev/null 2>&1; then eval "${prefix}"'_args_=("${var__args_[@]}")'; else eval "${prefix}"'_args_=()' fi; eval "${prefix}"'_secret_=${var__secret_:-}' @@ -270,6 +276,7 @@ eval "${prefix}"'run=${var_run:-false}' eval "${prefix}"'secret=${var_secret:-false}' eval "${prefix}"'generate=${var_generate:-false}' eval "${prefix}"'insert=${var_insert:-false}' +eval "${prefix}"'undeploy=${var_undeploy:-false}' eval "${prefix}"'server=${var_server:-false}' eval "${prefix}"'add=${var_add:-false}' eval "${prefix}"'init=${var_init:-false}' @@ -278,21 +285,22 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}' eval "${prefix}"'version=${var_version:-false}' eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do -declare -p "${prefix}__skip_update" "${prefix}__env" "${prefix}__stack" \ -"${prefix}__help" "${prefix}__skip_check" "${prefix}__status" \ +declare -p "${prefix}__help" "${prefix}__stack" "${prefix}__env" \ +"${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__status" \ "${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" "${prefix}__force" \ "${prefix}__no_tty" "${prefix}__user" "${prefix}_type_" "${prefix}_app_" \ -"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \ -"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \ -"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \ -"${prefix}_subcommands_" "${prefix}app" "${prefix}list" "${prefix}ls" \ -"${prefix}new" "${prefix}backup" "${prefix}deploy" "${prefix}check" \ -"${prefix}config" "${prefix}cp" "${prefix}logs" "${prefix}ps" \ -"${prefix}restore" "${prefix}rm" "${prefix}delete" "${prefix}run" \ -"${prefix}secret" "${prefix}generate" "${prefix}insert" "${prefix}server" \ -"${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \ -"${prefix}version" "${prefix}help"; done; } +"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" \ +"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \ +"${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" \ +"${prefix}_host_" "${prefix}_user_" "${prefix}_port_" "${prefix}_subcommands_" \ +"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \ +"${prefix}deploy" "${prefix}check" "${prefix}config" "${prefix}cp" \ +"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \ +"${prefix}delete" "${prefix}run" "${prefix}secret" "${prefix}generate" \ +"${prefix}insert" "${prefix}undeploy" "${prefix}server" "${prefix}add" \ +"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}version" \ +"${prefix}help"; done; } # docopt parser above, complete command for generating this parser is `docopt.sh abra` PROGRAM_NAME=$(basename "$0") @@ -703,6 +711,23 @@ sub_app_backup (){ $FUNCTION } +###### .. app restore +sub_app_restore (){ + load_instance + load_instance_env + + require_app_latest "$TYPE" + + FUNCTION="abra_restore_$abra__service_" + + if ! type "$FUNCTION" > /dev/null 2>&1; then + error "'$TYPE' doesn't know how to restore '${abra__service_}' backups."\ + "See $GIT_URL$TYPE/issues/" + fi + + $FUNCTION "$abra__backup_file_" +} + ###### .. app deploy help_app_deploy (){ echo "abra [options] app deploy [--skip-check] @@ -1377,7 +1402,8 @@ abra() { abra__type_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \ abra___server abra___domain abra___force abra___pass \ abra___secrets abra___status abra___no_tty abra___app_name \ - abra__subcommands_ abra___skip_update abra___skip_check + abra__subcommands_ abra___skip_update abra___skip_check \ + abra__backup_file_ if ! type tput > /dev/null 2>&1; then tput() {