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

Fix URL error and add test

Browse Source
This commit is contained in:
Domonkos Czinke
2016-07-11 15:41:05 +02:00
committed by Jose Diaz-Gonzalez
parent 5af42dc678
commit 0efb690992
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/common/functions
View File

@@ -985,6 +985,7 @@ get_container_ports() {
get_app_urls() {
declare desc="print an app's available urls"
source "$PLUGIN_AVAILABLE_PATH/certs/functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
source "$PLUGIN_AVAILABLE_PATH/domains/functions"
source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
@@ -1000,7 +1001,7 @@ get_app_urls() {
local port_map app_vhost
local app_vhosts=$(get_app_domains "$APP")
for port_map in $DOKKU_PROXY_PORT_MAP; do
local scheme="$(awk -F ':' '{ print $1 }' <<< "$port_map")"
local scheme="$(awk -F ':' '{ print $1 }' <<< "$port_map")"
local listen_port="$(awk -F ':' '{ print $2 }' <<< "$port_map")"
for app_vhost in $app_vhosts; do
if [[ "$listen_port" != "80" ]] && [[ "$listen_port" != "443" ]]; then
@@ -1015,7 +1016,11 @@ get_app_urls() {
local URLS="$(merge_dedupe_list "$port_urls $app_urls" " ")"
case "$1" in
url)
echo "$URLS" | tr ' ' '\n' | tail -1
if is_ssl_enabled "$APP"; then
echo "$URLS" | tr ' ' '\n' | grep https | head -n1
else
echo "$URLS" | tr ' ' '\n' | head -n1
fi
;;
urls)
echo "$URLS" | tr ' ' '\n' | sort

18
tests/unit/40_core_2.bats
View File

@@ -22,6 +22,15 @@ assert_urls() {
assert_output < <(tr ' ' '\n' <<< "${urls}" | sort)
}
assert_url() {
url=$1
run dokku url $TEST_APP
echo "output: "$output
echo "status: "$status
echo "url: ${url}"
assert_output < <("${url}")
}
build_nginx_config() {
# simulate nginx post-deploy
dokku domains:setup $TEST_APP
@@ -64,6 +73,15 @@ build_nginx_config() {
assert_urls "http://test.dokku.me" "http://${TEST_APP}.dokku.me" "https://test.dokku.me" "https://${TEST_APP}.dokku.me"
}
@test "(core) url (app ssl)" {
setup_test_tls
assert_url "https://dokku.me"
build_nginx_config
assert_url "https://${TEST_APP}.dokku.me"
add_domain "test.dokku.me"
assert_url "https://test.dokku.me" "https://${TEST_APP}.dokku.me"
}
@test "(core) urls (wildcard ssl)" {
setup_test_tls wildcard
assert_urls "https://dokku.me"