roxxers/abra
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add global --skip-check / --skip-update commands

Browse Source
This commit is contained in:
3wc 2021-01-01 18:56:38 +02:00
parent a2d249e3a1
commit a4a3dccd66
2 changed files with 81 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -17,6 +17,8 @@
- Add built-in documentation using `abra help <subcommand>...`, see ([#50](https://git.autonomic.zone/coop-cloud/abra/issues/50)) - Add built-in documentation using `abra help <subcommand>...`, see ([#50](https://git.autonomic.zone/coop-cloud/abra/issues/50))
- `version` subcommand ([e6b24fe](https://git.autonomic.zone/coop-cloud/abra/commit/e6b24fe)) - `version` subcommand ([e6b24fe](https://git.autonomic.zone/coop-cloud/abra/commit/e6b24fe))
- Use `# length=x` comments to generate passwords with `pwgen` and drop `KEY`/`PASSWORD` logic ([#68](https://git.autonomic.zone/coop-cloud/abra/issues/68)) - 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)
# abra 0.4.1 (2020-12-24) # abra 0.4.1 (2020-12-24)

154
abra
View File

@ -40,6 +40,8 @@ Options:
-e, --env=<path> Environment variables to load -e, --env=<path> Environment variables to load
-h, --help Show this message and exit -h, --help Show this message and exit
-s, --stack=<stack> Name of the target stack -s, --stack=<stack> Name of the target stack
-C, --skip-check Don't verify app variables
-U, --skip-update Don't pull latest app definitions
See 'abra help <subcommands>...' to read about a specific subcommand. See 'abra help <subcommands>...' to read about a specific subcommand.
" "
@ -143,69 +145,71 @@ 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() { return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() { printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
[[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() { [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1440} printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1545}
usage=${DOC:40:1169}; digest=3ce63 usage=${DOC:40:1169}; digest=51a25
shorts=(-h -s -e '' '' '' '' '' '' '' '' '' '' '') shorts=(-s -U -h -e '' '' '' '' '' '' -C '' '' '' '')
longs=(--help --stack --env --server --domain --app-name --pass --secrets --status --skip-check --force --no-tty --user --all) longs=(--stack --skip-update --help --env --server --domain --app-name --pass --secrets --status --skip-check --force --no-tty --user --all)
argcounts=(0 1 1 1 1 1 0 0 0 0 0 0 1 0); node_0(){ switch __help 0; }; node_1(){ argcounts=(1 0 0 1 1 1 1 0 0 0 0 0 0 1 0); node_0(){ value __stack 0; }
value __stack 1; }; node_2(){ value __env 2; }; node_3(){ value __server 3; } node_1(){ switch __skip_update 1; }; node_2(){ switch __help 2; }; node_3(){
node_4(){ value __domain 4; }; node_5(){ value __app_name 5; }; node_6(){ value __env 3; }; node_4(){ value __server 4; }; node_5(){ value __domain 5; }
switch __pass 6; }; node_7(){ switch __secrets 7; }; node_8(){ switch __status 8 node_6(){ value __app_name 6; }; node_7(){ switch __pass 7; }; node_8(){
}; node_9(){ switch __skip_check 9; }; node_10(){ switch __force 10; } switch __secrets 8; }; node_9(){ switch __status 9; }; node_10(){
node_11(){ switch __no_tty 11; }; node_12(){ value __user 12; }; node_13(){ switch __skip_check 10; }; node_11(){ switch __force 11; }; node_12(){
switch __all 13; }; node_14(){ value _type_ a; }; node_15(){ value _app_ a; } switch __no_tty 12; }; node_13(){ value __user 13; }; node_14(){ switch __all 14
node_16(){ value _service_ a; }; node_17(){ value _src_ a; }; node_18(){ }; node_15(){ value _type_ a; }; node_16(){ value _app_ a; }; node_17(){
value _dst_ a; }; node_19(){ value _args_ a true; }; node_20(){ value _secret_ a value _service_ a; }; node_18(){ value _src_ a; }; node_19(){ value _dst_ a; }
}; node_21(){ value _version_ a; }; node_22(){ value _cmd_ a; }; node_23(){ node_20(){ value _args_ a true; }; node_21(){ value _secret_ a; }; node_22(){
value _data_ a; }; node_24(){ value _command_ a; }; node_25(){ value _host_ a; } value _version_ a; }; node_23(){ value _cmd_ a; }; node_24(){ value _data_ a; }
node_26(){ value _user_ a; }; node_27(){ value _port_ a; }; node_28(){ node_25(){ value _command_ a; }; node_26(){ value _host_ a; }; node_27(){
value _subcommands_ a true; }; node_29(){ _command app; }; node_30(){ value _user_ a; }; node_28(){ value _port_ a; }; node_29(){
_command new; }; node_31(){ _command list; }; node_32(){ _command ls; } value _subcommands_ a true; }; node_30(){ _command app; }; node_31(){
node_33(){ _command deploy; }; node_34(){ _command undeploy; }; node_35(){ _command new; }; node_32(){ _command list; }; node_33(){ _command ls; }
_command config; }; node_36(){ _command delete; }; node_37(){ _command rm; } node_34(){ _command deploy; }; node_35(){ _command undeploy; }; node_36(){
node_38(){ _command logs; }; node_39(){ _command cp; }; node_40(){ _command config; }; node_37(){ _command delete; }; node_38(){ _command rm; }
_command check; }; node_41(){ _command ps; }; node_42(){ _command run; } node_39(){ _command logs; }; node_40(){ _command cp; }; node_41(){
node_43(){ _command secret; }; node_44(){ _command generate; }; node_45(){ _command check; }; node_42(){ _command ps; }; node_43(){ _command run; }
_command insert; }; node_46(){ _command server; }; node_47(){ _command add; } node_44(){ _command secret; }; node_45(){ _command generate; }; node_46(){
node_48(){ _command init; }; node_49(){ _command apps; }; node_50(){ _command insert; }; node_47(){ _command server; }; node_48(){ _command add; }
_command upgrade; }; node_51(){ _command version; }; node_52(){ _command help; } node_49(){ _command init; }; node_50(){ _command apps; }; node_51(){
node_53(){ optional 0 1 2; }; node_54(){ optional 53; }; node_55(){ optional 3 _command upgrade; }; node_52(){ _command version; }; node_53(){ _command help; }
}; node_56(){ optional 4; }; node_57(){ optional 5; }; node_58(){ optional 6; } node_54(){ optional 0 1 2 3; }; node_55(){ optional 54; }; node_56(){ optional 4
node_59(){ optional 7; }; node_60(){ required 54 29 30 55 56 57 58 59 14; } }; node_57(){ optional 5; }; node_58(){ optional 6; }; node_59(){ optional 7; }
node_61(){ either 31 32; }; node_62(){ required 61; }; node_63(){ optional 8; } node_60(){ optional 8; }; node_61(){ required 55 30 31 56 57 58 59 60 15; }
node_64(){ required 54 29 62 63 55; }; node_65(){ optional 9; }; node_66(){ node_62(){ either 32 33; }; node_63(){ required 62; }; node_64(){ optional 9; }
required 54 29 15 33 65; }; node_67(){ required 54 29 15 34; }; node_68(){ node_65(){ required 55 30 63 64 56; }; node_66(){ optional 10; }; node_67(){
required 54 29 15 35; }; node_69(){ either 36 37; }; node_70(){ required 69; } required 55 30 16 34 66; }; node_68(){ required 55 30 16 35; }; node_69(){
node_71(){ optional 10; }; node_72(){ required 54 29 15 70 71; }; node_73(){ required 55 30 16 36; }; node_70(){ either 37 38; }; node_71(){ required 70; }
optional 16; }; node_74(){ required 54 29 15 38 73; }; node_75(){ node_72(){ optional 11; }; node_73(){ required 55 30 16 71 72; }; node_74(){
required 54 29 15 39 17 18; }; node_76(){ required 54 29 15 40; }; node_77(){ optional 17; }; node_75(){ required 55 30 16 39 74; }; node_76(){
required 54 29 15 41; }; node_78(){ optional 11; }; node_79(){ optional 12; } required 55 30 16 40 18 19; }; node_77(){ required 55 30 16 41; }; node_78(){
node_80(){ oneormore 19; }; node_81(){ required 54 29 15 42 78 79 16 80; } required 55 30 16 42; }; node_79(){ optional 12; }; node_80(){ optional 13; }
node_82(){ required 20 21; }; node_83(){ either 82 13; }; node_84(){ required 83 node_81(){ oneormore 20; }; node_82(){ required 55 30 16 43 79 80 17 81; }
}; node_85(){ optional 22; }; node_86(){ required 54 29 15 43 44 84 85 58; } node_83(){ required 21 22; }; node_84(){ either 83 14; }; node_85(){ required 84
node_87(){ required 54 29 15 43 45 20 21 23 58; }; node_88(){ either 20 13; } }; node_86(){ optional 23; }; node_87(){ required 55 30 16 44 45 85 86 59; }
node_89(){ required 88; }; node_90(){ required 54 29 15 43 70 89 58 71; } node_88(){ required 55 30 16 44 46 21 22 24 59; }; node_89(){ either 21 14; }
node_91(){ optional 80; }; node_92(){ required 54 29 15 24 91; }; node_93(){ node_90(){ required 89; }; node_91(){ required 55 30 16 44 71 90 59 72; }
optional 26; }; node_94(){ optional 27; }; node_95(){ required 54 46 47 25 93 94 node_92(){ optional 81; }; node_93(){ required 55 30 16 25 92; }; node_94(){
}; node_96(){ required 54 46 62; }; node_97(){ required 54 46 25 37; } optional 27; }; node_95(){ optional 28; }; node_96(){ required 55 47 48 26 94 95
node_98(){ required 54 46 25 48; }; node_99(){ required 54 46 25 49 63; } }; node_97(){ required 55 47 63; }; node_98(){ required 55 47 26 38; }
node_100(){ required 54 50; }; node_101(){ required 54 51; }; node_102(){ node_99(){ required 55 47 26 49; }; node_100(){ required 55 47 26 50 64; }
oneormore 28; }; node_103(){ optional 102; }; node_104(){ required 54 52 103; } node_101(){ required 55 51; }; node_102(){ required 55 52; }; node_103(){
node_105(){ oneormore 29; }; node_104(){ optional 103; }; node_105(){ required 55 53 104; }
either 60 64 66 67 68 72 74 75 76 77 81 86 87 90 92 95 96 97 98 99 100 101 104 node_106(){
}; node_106(){ required 105; }; cat <<<' docopt_exit() { either 61 65 67 68 69 73 75 76 77 78 82 87 88 91 93 96 97 98 99 100 101 102 105
}; node_107(){ required 106; }; cat <<<' docopt_exit() {
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1169}" >&2 [[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1169}" >&2
exit 1; }'; unset var___help var___stack var___env var___server var___domain \ exit 1; }'; unset var___stack var___skip_update var___help var___env \
var___app_name var___pass var___secrets var___status var___skip_check \ var___server var___domain var___app_name var___pass var___secrets var___status \
var___force var___no_tty var___user var___all var__type_ var__app_ \ var___skip_check var___force var___no_tty var___user var___all var__type_ \
var__service_ var__src_ var__dst_ var__args_ var__secret_ var__version_ \ var__app_ var__service_ var__src_ var__dst_ var__args_ var__secret_ \
var__cmd_ var__data_ var__command_ var__host_ var__user_ var__port_ \ var__version_ var__cmd_ var__data_ var__command_ var__host_ var__user_ \
var__subcommands_ var_app var_new var_list var_ls var_deploy var_undeploy \ var__port_ var__subcommands_ var_app var_new var_list var_ls var_deploy \
var_config var_delete var_rm var_logs var_cp var_check var_ps var_run \ var_undeploy var_config var_delete var_rm var_logs var_cp var_check var_ps \
var_secret var_generate var_insert var_server var_add var_init var_apps \ var_run var_secret var_generate var_insert var_server var_add var_init \
var_upgrade var_version var_help; parse 106 "$@" var_apps var_upgrade var_version var_help; parse 107 "$@"
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" "${prefix}__stack" \ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" \
"${prefix}__env" "${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ "${prefix}__skip_update" "${prefix}__help" "${prefix}__env" \
"${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \
"${prefix}__pass" "${prefix}__secrets" "${prefix}__status" \ "${prefix}__pass" "${prefix}__secrets" "${prefix}__status" \
"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \ "${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \
"${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \ "${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \
@ -218,8 +222,9 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" "${prefix}__stack" \
"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}generate" \ "${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}generate" \
"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}init" \ "${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}init" \
"${prefix}apps" "${prefix}upgrade" "${prefix}version" "${prefix}help" "${prefix}apps" "${prefix}upgrade" "${prefix}version" "${prefix}help"
eval "${prefix}"'__help=${var___help:-false}'
eval "${prefix}"'__stack=${var___stack:-}' eval "${prefix}"'__stack=${var___stack:-}'
eval "${prefix}"'__skip_update=${var___skip_update:-false}'
eval "${prefix}"'__help=${var___help:-false}'
eval "${prefix}"'__env=${var___env:-}' eval "${prefix}"'__env=${var___env:-}'
eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__server=${var___server:-}'
eval "${prefix}"'__domain=${var___domain:-}' eval "${prefix}"'__domain=${var___domain:-}'
@ -268,8 +273,8 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
eval "${prefix}"'version=${var_version:-false}' eval "${prefix}"'version=${var_version:-false}'
eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1 eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
[[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
declare -p "${prefix}__help" "${prefix}__stack" "${prefix}__env" \ declare -p "${prefix}__stack" "${prefix}__skip_update" "${prefix}__help" \
"${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ "${prefix}__env" "${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \
"${prefix}__pass" "${prefix}__secrets" "${prefix}__status" \ "${prefix}__pass" "${prefix}__secrets" "${prefix}__status" \
"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \ "${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \
"${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \ "${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \
@ -347,7 +352,9 @@ require_app_latest() {
success "Fetched app configuration via Git" success "Fetched app configuration via Git"
fi fi
if [ "$abra___skip_update" = "false" ]; then
cd "$APP_DIR" && git pull > /dev/null 2>&1 cd "$APP_DIR" && git pull > /dev/null 2>&1
fi
} }
# FIXME 3wc: update or remove # FIXME 3wc: update or remove
@ -676,9 +683,6 @@ help_app_deploy (){
Deploy app <domain> to the configured server. Deploy app <domain> to the configured server.
OPTIONS
--skip-check Don't check whether app definition is up-to-date first
POWERED BY POWERED BY
docker stack deploy -c compose.yml <app>" docker stack deploy -c compose.yml <app>"
} }
@ -689,10 +693,6 @@ sub_app_deploy (){
require_app_latest "$TYPE" require_app_latest "$TYPE"
if [ "$abra___skip_check" == "false" ]; then
sub_app_check
fi
echo "About to deploy:" echo "About to deploy:"
echo " Server: $(tput setaf 4)${SERVER}$(tput sgr0)" echo " Server: $(tput setaf 4)${SERVER}$(tput sgr0)"
if [ "${COMPOSE_FILE/:/}" == "${COMPOSE_FILE}" ]; then if [ "${COMPOSE_FILE/:/}" == "${COMPOSE_FILE}" ]; then
@ -795,12 +795,14 @@ Make sure that all an app's required variables are set."
} }
sub_app_check (){ sub_app_check (){
if [ "$abra___skip_check" = "true" ]; then
return 0
fi
load_instance load_instance
load_instance_env load_instance_env
#APP_ENV=$(grep -v '^#' "$ENV_FILE" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
APP_ENV=$(grep -v '^#' "$ENV_FILE" | cut -d' ' -f2 | cut -d'=' -f1 | sort) APP_ENV=$(grep -v '^#' "$ENV_FILE" | cut -d' ' -f2 | cut -d'=' -f1 | sort)
#STACK_ENV=$(grep -v '^#' "$APP_DIR/.env.sample" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
STACK_ENV=$(grep -v '^#' "$APP_DIR/.env.sample" | cut -d' ' -f2 | cut -d'=' -f1 | sort) STACK_ENV=$(grep -v '^#' "$APP_DIR/.env.sample" | cut -d' ' -f2 | cut -d'=' -f1 | sort)
# Only show "1", items in STACK_ENV which aren't in APP_ENV # Only show "1", items in STACK_ENV which aren't in APP_ENV
@ -1348,8 +1350,8 @@ abra() {
abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \ abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \
abra__type_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \ abra__type_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \
abra___server abra___domain abra___force abra___pass \ abra___server abra___domain abra___force abra___pass \
abra___secrets abra___status abra___no_tty abra___skip_check \ abra___secrets abra___status abra___no_tty abra___app_name \
abra__subcommands_ abra___app_name abra__subcommands_ abra___skip_update abra___skip_check
if ! type tput > /dev/null 2>&1; then if ! type tput > /dev/null 2>&1; then
tput() { tput() {