From ecf3cc8c75a1dfb0d885486ccab8865b01184550 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 | 215 +++++++++++++++++++++++++++++---------------------- 2 files changed, 122 insertions(+), 95 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c507468..bdad132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ - `version` subcommand [e6b24fe](https://git.autonomic.zone/coop-cloud/abra/commit/e6b24fe) - 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 367d6b6..952da0a 100755 --- a/abra +++ b/abra @@ -23,11 +23,13 @@ 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 auto [--pass] abra [options] app secret generate [] [--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) @@ -147,89 +149,93 @@ 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:1636} -usage=${DOC:40:1260}; digest=0138f -shorts=(-U -C -e -h -s '' '' '' '' '' '' '' '' '' '') -longs=(--skip-update --skip-check --env --help --stack --status --server --domain --app-name --pass --auto --all --force --no-tty --user) -argcounts=(0 0 1 0 1 0 1 1 1 0 0 0 0 0 1); node_0(){ switch __skip_update 0; } -node_1(){ switch __skip_check 1; }; node_2(){ value __env 2; }; node_3(){ -switch __help 3; }; node_4(){ value __stack 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 __auto 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 auto; }; node_47(){ _command generate; }; node_48(){ -_command insert; }; node_49(){ _command server; }; node_50(){ _command add; } -node_51(){ _command init; }; node_52(){ _command apps; }; node_53(){ -_command upgrade; }; node_54(){ _command version; }; node_55(){ _command help; } -node_56(){ optional 0 1 2 3 4; }; node_57(){ optional 56; }; node_58(){ -either 31 32; }; node_59(){ required 58; }; node_60(){ optional 5; }; node_61(){ -optional 6; }; node_62(){ required 57 30 59 60 61; }; node_63(){ optional 7; } -node_64(){ optional 8; }; node_65(){ optional 9; }; node_66(){ optional 10; } -node_67(){ required 57 30 33 61 63 64 65 66 15; }; node_68(){ either 17 11; } -node_69(){ required 68; }; node_70(){ required 57 30 16 34 69; }; node_71(){ -required 57 30 16 35; }; node_72(){ required 57 30 16 36; }; node_73(){ -required 57 30 16 37; }; node_74(){ required 57 30 16 38 18 19; }; node_75(){ -optional 17; }; node_76(){ required 57 30 16 39 75; }; node_77(){ -required 57 30 16 40; }; node_78(){ required 57 30 16 41 69; }; node_79(){ -either 42 43; }; node_80(){ required 79; }; node_81(){ optional 12; } -node_82(){ required 57 30 16 80 81; }; node_83(){ optional 13; }; node_84(){ -optional 14; }; node_85(){ oneormore 20; }; node_86(){ -required 57 30 16 44 83 84 17 85; }; node_87(){ required 57 30 16 45 46 65; } -node_88(){ optional 23; }; node_89(){ required 57 30 16 45 47 21 22 88 65; } -node_90(){ required 57 30 16 45 48 21 22 24 65; }; node_91(){ either 21 11; } -node_92(){ required 91; }; node_93(){ required 57 30 16 45 80 92 65 81; } -node_94(){ optional 85; }; node_95(){ required 57 30 16 25 94; }; node_96(){ -optional 27; }; node_97(){ optional 28; }; node_98(){ required 57 49 50 26 96 97 -}; node_99(){ required 57 49 59; }; node_100(){ required 57 49 26 42; } -node_101(){ required 57 49 26 51; }; node_102(){ required 57 49 26 52 60; } -node_103(){ required 57 53; }; node_104(){ required 57 54; }; node_105(){ -oneormore 29; }; node_106(){ optional 105; }; node_107(){ required 57 55 106; } -node_108(){ -either 62 67 70 71 72 73 74 76 77 78 82 86 87 89 90 93 95 98 99 100 101 102 103 104 107 -}; node_109(){ required 108; }; cat <<<' docopt_exit() { -[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1260}" >&2 -exit 1; }'; unset var___skip_update var___skip_check var___env var___help \ -var___stack var___status var___server var___domain var___app_name var___pass \ -var___auto 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_auto var_generate var_insert var_server var_add \ -var_init var_apps var_upgrade var_version var_help; parse 109 "$@" -local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__skip_update" \ -"${prefix}__skip_check" "${prefix}__env" "${prefix}__help" "${prefix}__stack" \ -"${prefix}__status" "${prefix}__server" "${prefix}__domain" \ -"${prefix}__app_name" "${prefix}__pass" "${prefix}__auto" "${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}auto" "${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}"'__skip_check=${var___skip_check:-false}' -eval "${prefix}"'__env=${var___env:-}' +printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1733} +usage=${DOC:40:1357}; digest=be96a +shorts=(-h -U -e -s -C '' '' '' '' '' '' '' '' '' '') +longs=(--help --skip-update --env --stack --skip-check --status --server --domain --app-name --pass --auto --all --force --no-tty --user) +argcounts=(0 0 1 1 0 0 1 1 1 0 0 0 0 0 1); node_0(){ switch __help 0; } +node_1(){ switch __skip_update 1; }; node_2(){ value __env 2; }; node_3(){ +value __stack 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 __auto 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 _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 auto; }; node_48(){ _command generate; }; node_49(){ _command insert; } +node_50(){ _command undeploy; }; node_51(){ _command server; }; node_52(){ +_command add; }; node_53(){ _command init; }; node_54(){ _command apps; } +node_55(){ _command upgrade; }; node_56(){ _command version; }; node_57(){ +_command help; }; node_58(){ optional 0 1 2 3 4; }; node_59(){ optional 58; } +node_60(){ either 32 33; }; node_61(){ required 60; }; node_62(){ optional 5; } +node_63(){ optional 6; }; node_64(){ required 59 31 61 62 63; }; node_65(){ +optional 7; }; node_66(){ optional 8; }; node_67(){ optional 9; }; node_68(){ +optional 10; }; node_69(){ required 59 31 34 63 65 66 67 68 15; }; node_70(){ +either 17 11; }; node_71(){ required 70; }; node_72(){ required 59 31 16 35 71 +}; node_73(){ required 59 31 16 36; }; node_74(){ required 59 31 16 37; } +node_75(){ required 59 31 16 38; }; node_76(){ required 59 31 16 39 18 19; } +node_77(){ optional 17; }; node_78(){ required 59 31 16 40 77; }; node_79(){ +required 59 31 16 41; }; node_80(){ required 59 31 16 42 71; }; node_81(){ +either 43 44; }; node_82(){ required 81; }; node_83(){ optional 12; } +node_84(){ required 59 31 16 82 83; }; node_85(){ optional 20; }; node_86(){ +required 59 31 16 42 17 85; }; node_87(){ optional 13; }; node_88(){ optional 14 +}; node_89(){ oneormore 21; }; node_90(){ required 59 31 16 45 87 88 17 89; } +node_91(){ required 59 31 16 46 47 67; }; node_92(){ optional 24; }; node_93(){ +required 59 31 16 46 48 22 23 92 67; }; node_94(){ +required 59 31 16 46 49 22 23 25 67; }; node_95(){ either 22 11; }; node_96(){ +required 95; }; node_97(){ required 59 31 16 46 82 96 67 83; }; node_98(){ +required 59 31 16 50; }; node_99(){ optional 89; }; node_100(){ +required 59 31 16 26 99; }; node_101(){ optional 28; }; node_102(){ optional 29 +}; node_103(){ required 59 51 52 27 101 102; }; node_104(){ required 59 51 61; } +node_105(){ required 59 51 27 43; }; node_106(){ required 59 51 27 53; } +node_107(){ required 59 51 27 54 62; }; node_108(){ required 59 55; } +node_109(){ required 59 56; }; node_110(){ oneormore 30; }; node_111(){ +optional 110; }; node_112(){ required 59 57 111; }; node_113(){ +either 64 69 72 73 74 75 76 78 79 80 84 86 90 91 93 94 97 98 100 103 104 105 106 107 108 109 112 +}; node_114(){ required 113; }; cat <<<' docopt_exit() { +[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1357}" >&2 +exit 1; }'; unset var___help var___skip_update var___env var___stack \ +var___skip_check var___status var___server var___domain var___app_name \ +var___pass var___auto var___all var___force var___no_tty var___user 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_auto var_generate var_insert \ +var_undeploy var_server var_add var_init var_apps var_upgrade var_version \ +var_help; parse 114 "$@"; local prefix=${DOCOPT_PREFIX:-''} +unset "${prefix}__help" "${prefix}__skip_update" "${prefix}__env" \ +"${prefix}__stack" "${prefix}__skip_check" "${prefix}__status" \ +"${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ +"${prefix}__pass" "${prefix}__auto" "${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}auto" \ +"${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}"'__skip_update=${var___skip_update:-false}' +eval "${prefix}"'__env=${var___env:-}' eval "${prefix}"'__stack=${var___stack:-}' +eval "${prefix}"'__skip_check=${var___skip_check:-false}' eval "${prefix}"'__status=${var___status:-false}' eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__domain=${var___domain:-}' @@ -243,6 +249,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_:-}' @@ -271,6 +278,7 @@ eval "${prefix}"'secret=${var_secret:-false}' eval "${prefix}"'auto=${var_auto:-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}' @@ -279,21 +287,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}__skip_check" "${prefix}__env" \ -"${prefix}__help" "${prefix}__stack" "${prefix}__status" "${prefix}__server" \ -"${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" "${prefix}__auto" \ -"${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" \ +declare -p "${prefix}__help" "${prefix}__skip_update" "${prefix}__env" \ +"${prefix}__stack" "${prefix}__skip_check" "${prefix}__status" \ +"${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ +"${prefix}__pass" "${prefix}__auto" "${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}auto" \ -"${prefix}generate" "${prefix}insert" "${prefix}server" "${prefix}add" \ -"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}version" \ -"${prefix}help"; done; } +"${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") @@ -704,6 +713,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] @@ -1385,7 +1411,8 @@ abra() { abra__type_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \ abra___server abra___domain abra___force abra___pass \ abra___auto 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() {