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

feat: add ability to report domains globally

Browse Source 
The `domains` command previously had this functionality, but is deprecated, and thus we should provide an alternative method of presenting the information.
This commit is contained in:
Jose Diaz-Gonzalez
2019-04-16 21:23:45 -04:00
parent 8a56740a7c
commit 887c0ebdd6
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuration/domains.md
View File

@@ -10,7 +10,7 @@ domains:disable <app> # Disable VHOST support
domains:enable <app> # Enable VHOST support domains:enable <app> # Enable VHOST support
domains:remove <app> <domain> [<domain> ...] # Remove domains from app domains:remove <app> <domain> [<domain> ...] # Remove domains from app
domains:remove-global <domain> [<domain> ...] # Remove global domain names domains:remove-global <domain> [<domain> ...] # Remove global domain names
domains:report [<app>] [<flag>] # Displays a domains report for one or more apps domains:report [<app>|--global] [<flag>] # Displays a domains report for one or more apps
domains:set <app> <domain> [<domain> ...] # Set domains for app domains:set <app> <domain> [<domain> ...] # Set domains for app
domains:set-global <domain> [<domain> ...] # Set global domain names domains:set-global <domain> [<domain> ...] # Set global domain names
``` ```

30
plugins/domains/internal-functions
View File

@@ -10,6 +10,11 @@ cmd-domains-report() {
local INSTALLED_APPS=$(dokku_apps) local INSTALLED_APPS=$(dokku_apps)
local APP="$2" INFO_FLAG="$3" local APP="$2" INFO_FLAG="$3"
if [[ "$APP" == "--global" ]]; then
cmd-domains-report-single "$APP" "$INFO_FLAG"
return
fi
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP" INFO_FLAG="$APP"
APP="" APP=""
@@ -33,16 +38,29 @@ cmd-domains-report-single() {
if [[ "$INFO_FLAG" == "true" ]]; then if [[ "$INFO_FLAG" == "true" ]]; then
INFO_FLAG="" INFO_FLAG=""
fi fi
verify_app_name "$APP" local flag_map=() app_flags=() global_flags=()
local flag_map=(
"--domains-app-enabled: $(fn-domains-app-enabled "$APP")" if [[ "$APP" != "--global" ]]; then
"--domains-app-vhosts: $(fn-domains-app-vhosts "$APP")" verify_app_name "$APP"
app_flags=(
"--domains-app-enabled: $(fn-domains-app-enabled "$APP")"
"--domains-app-vhosts: $(fn-domains-app-vhosts "$APP")"
)
fi
global_flags=(
"--domains-global-enabled: $(fn-domains-global-enabled)" "--domains-global-enabled: $(fn-domains-global-enabled)"
"--domains-global-vhosts: $(fn-domains-global-vhosts)" "--domains-global-vhosts: $(fn-domains-global-vhosts)"
) )
flag_map=("${app_flags[@]}" "${global_flags[@]}")
if [[ -z "$INFO_FLAG" ]]; then if [[ -z "$INFO_FLAG" ]]; then
dokku_log_info2_quiet "$APP domains information" if [[ "$APP" == "--global" ]]; then
dokku_log_info2_quiet "Global domains information"
else
dokku_log_info2_quiet "$APP domains information"
fi
for flag in "${flag_map[@]}"; do for flag in "${flag_map[@]}"; do
key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')" key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
dokku_log_verbose "$(printf "%-30s %-25s" "${key^}" "${flag#*: }")" dokku_log_verbose "$(printf "%-30s %-25s" "${key^}" "${flag#*: }")"
@@ -78,7 +96,7 @@ domains_help_content_func() {
domains:enable <app>, Enable VHOST support domains:enable <app>, Enable VHOST support
domains:remove <app> <domain> [<domain> ...], Remove domains from app domains:remove <app> <domain> [<domain> ...], Remove domains from app
domains:remove-global <domain> [<domain> ...], Remove global domain names domains:remove-global <domain> [<domain> ...], Remove global domain names
domains:report [<app>] [<flag>], Displays a domains report for one or more apps domains:report [<app>|--global] [<flag>], Displays a domains report for one or more apps
domains:set <app> <domain> [<domain> ...], Set domains for app domains:set <app> <domain> [<domain> ...], Set domains for app
domains:set-global <domain> [<domain> ...], Set global domain names domains:set-global <domain> [<domain> ...], Set global domain names
help_content help_content

5
tests/unit/20_domains.bats
View File

@@ -191,6 +191,11 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "dokku domains:report --global"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku domains 2>/dev/null | egrep -qw '^global.dokku.me\$'" run /bin/bash -c "dokku domains 2>/dev/null | egrep -qw '^global.dokku.me\$'"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"