From 4e4629a7c55898c75c1055cc7cf0e534dac0762e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 28 Aug 2016 21:24:44 -0400
Subject: [PATCH] Document exposed ports when an invalid number of arguments
 are specified

---
 functions                 | 4 ++--
 tests/service_expose.bats | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/functions b/functions
index a22e772..ae2c8e5 100755
--- a/functions
+++ b/functions
@@ -314,7 +314,7 @@ service_port_unpause() {
   PORTS=(${PORTS[@]:-$(get_random_ports ${#PLUGIN_DATASTORE_PORTS[@]})})
   local ID=$(cat "$SERVICE_ROOT/ID")
 
-  [[ "${#PORTS[@]}" != "${#PLUGIN_DATASTORE_PORTS[@]}" ]] && dokku_log_fail "${#PLUGIN_DATASTORE_PORTS[@]} ports to be exposed need to be provided"
+  [[ "${#PORTS[@]}" != "${#PLUGIN_DATASTORE_PORTS[@]}" ]] && dokku_log_fail "${#PLUGIN_DATASTORE_PORTS[@]} ports to be exposed need to be provided in the following order: ${PLUGIN_DATASTORE_PORTS[*]}"
 
   if [[ "$LOG_FAIL" == "true" ]]; then
     [[ -f "$PORT_FILE" ]] && PORTS=($(cat "$PORT_FILE")) && dokku_log_fail "Service $SERVICE already exposed on port(s) ${PORTS[*]}"
@@ -328,7 +328,7 @@ service_port_unpause() {
   # shellcheck disable=SC2046
   docker run -d --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" --name "$EXPOSED_NAME" $(docker_ports_options "${PORTS[@]}") --restart always --label dokku=ambassador --label "dokku.ambassador=$PLUGIN_COMMAND_PREFIX" svendowideit/ambassador > /dev/null
   if [[ "$LOG_FAIL" == "true" ]]; then
-    dokku_log_info1 "Service $SERVICE exposed on port(s) ${PORTS[*]}"
+    dokku_log_info1 "Service $SERVICE exposed on port(s) [container~>host]: $(service_exposed_ports "$SERVICE")"
   fi
 }
 
diff --git a/tests/service_expose.bats b/tests/service_expose.bats
index feecb85..daa0c43 100755
--- a/tests/service_expose.bats
+++ b/tests/service_expose.bats
@@ -26,5 +26,5 @@ teardown() {
 
 @test "($PLUGIN_COMMAND_PREFIX:expose) success when providing custom ports" {
   run dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242 4243 4244 4245
-  assert_contains "${lines[*]}" "exposed on port(s) 4242 4243 4244 4245"
+  assert_contains "${lines[*]}" "exposed on port(s) [container~>host]: 27017~>4242 27018~>4243 27019~>4244 28017~>4245"
 }