github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: unify command declaration across codebase

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-10 01:40:30 -05:00
parent b0abeb49dd
commit e67b96780d
108 changed files with 475 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/storage/internal-functions
View File

@@ -7,9 +7,10 @@ set -eo pipefail
cmd-storage-report() {
declare desc="displays a storage report for one or more apps"
local cmd="storage:report"
declare cmd="storage:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
local APP="$2" INFO_FLAG="$3"
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -77,10 +78,13 @@ fn-storage-bind-mounts() {
cmd-storage-list() {
declare desc="List all bound mounts"
local cmd="storage:list"
declare cmd="storage:list"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1"
local passed_phases="deploy"
[[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$2" && local APP="$2"
[[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$APP"
dokku_log_quiet "$APP volume bind-mounts:"
get_bind_mounts "$(get_phase_file_path "$passed_phases")"
}

11
plugins/storage/subcommands/mount
View File

@@ -7,11 +7,14 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
cmd-storage-mount() {
declare desc="Add bind-mount, redeploy app if running"
local cmd="storage:mount"
declare cmd="storage:mount"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" MOUNT_PATH="$2"
local passed_phases=(deploy run)
[[ -z $3 || $4 ]] && dokku_log_fail "storage:mount requires an app and a two paths divided by colon."
verify_app_name "$2" && local APP="$2"
verify_paths "$3" && local MOUNT_PATH="$3"
[[ -z "$APP" || "$MOUNT_PATH" ]] && dokku_log_fail "storage:mount requires an app and a two paths divided by colon."
verify_app_name "$APP"
verify_paths "$MOUNT_PATH"
check_if_path_exists "$MOUNT_PATH" "$(get_phase_file_path "${passed_phases[@]}")" && dokku_log_fail "Mount path already exists."
add_passed_docker_option passed_phases[@] "-v $MOUNT_PATH"
}

11
plugins/storage/subcommands/unmount
View File

@@ -7,11 +7,14 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
cmd-storage-unmount() {
declare desc="Remove bind-mount, restart app if running"
local cmd="storage:unmount"
declare cmd="storage:unmount"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" MOUNT_PATH="$2"
local passed_phases=(deploy run)
[[ -z $3 || $4 ]] && dokku_log_fail "storage:unmount requires an app and a two paths divided by colon."
verify_app_name "$2" && local APP="$2"
verify_paths "$3" && local MOUNT_PATH="$3"
[[ -z "$APP" || "$MOUNT_PATH" ]] && dokku_log_fail "storage:unmount requires an app and a two paths divided by colon."
verify_app_name "$APP"
verify_paths "$MOUNT_PATH"
check_if_path_exists "$MOUNT_PATH" "$(get_phase_file_path "${passed_phases[@]}")" || dokku_log_fail "Mount path does not exist."
remove_passed_docker_option passed_phases[@] "-v $MOUNT_PATH"
}