From a5c60c2b076b3111595809e10c3098c7052be079 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 27 Mar 2019 12:18:18 -0400
Subject: [PATCH] fix: correct issue where aliases were being generated
 incorrectly

---
 common-functions        |  5 +++--
 tests/service_link.bats | 11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/common-functions b/common-functions
index 1bd8ee1..674db66 100755
--- a/common-functions
+++ b/common-functions
@@ -113,9 +113,10 @@ service_alternative_alias() {
   for COLOR in "${COLORS[@]}"; do
     ALIAS="${PLUGIN_ALT_ALIAS}_${COLOR}"
     local IN_USE=$(echo "$EXISTING_CONFIG" | grep "${ALIAS}_URL")
-    if [[ -n $IN_USE ]]; then
-      unset ALIAS
+    if [[ -z "$IN_USE" ]]; then
+      break
     fi
+    unset ALIAS
   done
   echo "$ALIAS"
 }
diff --git a/tests/service_link.bats b/tests/service_link.bats
index d2d78bf..06964ac 100755
--- a/tests/service_link.bats
+++ b/tests/service_link.bats
@@ -3,14 +3,17 @@ load test_helper
 
 setup() {
   dokku "$PLUGIN_COMMAND_PREFIX:create" l
+  dokku "$PLUGIN_COMMAND_PREFIX:create" m
   dokku apps:create my_app
 }
 
 teardown() {
+  dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" m
   dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" l
   dokku --force apps:destroy my_app
 }
 
+
 @test "($PLUGIN_COMMAND_PREFIX:link) error when there are no arguments" {
   run dokku "$PLUGIN_COMMAND_PREFIX:link"
   echo "output: $output"
@@ -69,8 +72,14 @@ teardown() {
   dokku config:set my_app DATABASE_URL=postgres://user:pass@host:5432/db
   dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app
   run dokku config my_app
-  assert_contains "${lines[*]}" "DOKKU_POSTGRES_"
+  assert_contains "${lines[*]}" "DOKKU_POSTGRES_AQUA_URL"
   assert_success
+
+  dokku "$PLUGIN_COMMAND_PREFIX:link" m my_app
+  run dokku config my_app
+  assert_contains "${lines[*]}" "DOKKU_POSTGRES_BLACK_URL"
+  assert_success
+  dokku "$PLUGIN_COMMAND_PREFIX:unlink" m my_app
   dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my_app
 }