diff --git a/plugins/proxy/functions b/plugins/proxy/functions index f552f441e..010136719 100755 --- a/plugins/proxy/functions +++ b/plugins/proxy/functions @@ -23,3 +23,20 @@ get_app_proxy_type() { echo "$APP_PROXY_TYPE" } + +list_app_proxy_ports() { + declare desc="list proxy port mappings for an app" + local APP="$1"; verify_app_name "$APP" + local PROXY_PORT_MAP="$(config_get "$APP" DOKKU_PROXY_PORT_MAP || true)" + + if [[ -n "$PROXY_PORT_MAP" ]]; then + dokku_log_info1_quiet "Port mappings for $APP" + dokku_col_log_info1_quiet "scheme" "host port" "container port" + local port_map + for port_map in $PROXY_PORT_MAP; do + dokku_col_log_msg "$(cut -d ':' -f1 <<< "$port_map")" "$(cut -d ':' -f2 <<< "$port_map")" "$(cut -d ':' -f3 <<< "$port_map")" + done + else + dokku_log_fail "No port mappings configured for app ($APP)" + fi +} diff --git a/plugins/proxy/subcommands/ports b/plugins/proxy/subcommands/ports index 605e2a116..47a1a6cab 100755 --- a/plugins/proxy/subcommands/ports +++ b/plugins/proxy/subcommands/ports @@ -1,24 +1,15 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions" +source "$PLUGIN_CORE_AVAILABLE_PATH/proxy/functions" source "$PLUGIN_AVAILABLE_PATH/config/functions" proxy_ports_cmd() { - declare desc="list proxy port mappings for an app" + declare desc="cmd wrapper to list proxy port mappings for an app" local cmd="proxy:ports" local APP="$2"; verify_app_name "$APP" - local PROXY_PORT_MAP="$(config_get "$APP" DOKKU_PROXY_PORT_MAP || true)" - if [[ -n "$PROXY_PORT_MAP" ]]; then - dokku_log_info1_quiet "Port mappings for $APP" - dokku_col_log_info1_quiet "scheme" "host port" "container port" - local port_map - for port_map in $PROXY_PORT_MAP; do - dokku_col_log_msg "$(cut -d ':' -f1 <<< "$port_map")" "$(cut -d ':' -f2 <<< "$port_map")" "$(cut -d ':' -f3 <<< "$port_map")" - done - else - dokku_log_fail "No port mappings configured for app ($APP)" - fi + list_app_proxy_ports "$APP" } proxy_ports_cmd "$@" diff --git a/plugins/proxy/subcommands/ports-remove b/plugins/proxy/subcommands/ports-remove index 65927a07d..2c1fe0a90 100755 --- a/plugins/proxy/subcommands/ports-remove +++ b/plugins/proxy/subcommands/ports-remove @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions" +source "$PLUGIN_CORE_AVAILABLE_PATH/proxy/functions" source "$PLUGIN_AVAILABLE_PATH/config/functions" proxy_ports_remove_cmd() { @@ -26,7 +27,7 @@ proxy_ports_remove_cmd() { plugn trigger post-proxy-ports-update "$APP" "remove" else dokku_log_warn "No port mapping specified. Please supply a valid configured host port" - dokku proxy:ports "$APP" + list_app_proxy_ports "$APP" dokku_log_fail "exiting..." fi }