Add external DSN option for postgres:info

Author: nicolas-brousse

README.md

@@ -75,6 +75,7 @@ dokku postgres:info lolipop
 # you can also retrieve a specific piece of service info via flags
 dokku postgres:info lolipop --data-dir
 dokku postgres:info lolipop --dsn
+dokku postgres:info lolipop --external-dsn
 dokku postgres:info lolipop --exposed-ports
 dokku postgres:info lolipop --id
 dokku postgres:info lolipop --internal-ip

common-functions

@@ -332,6 +332,7 @@ service_info() {
   declare SERVICE="$1" INFO_FLAG="$2"
   local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   local SERVICE_URL=$(service_url "$SERVICE")
+  local SERVICE_EXTERNAL_URL=$(service_external_url "$SERVICE")
   local PORT_FILE="$SERVICE_ROOT/PORT"
   local SERVICE_CONTAINER_ID="$(cat "$SERVICE_ROOT/ID")"
   local flag key valid_flags
@@ -340,6 +341,7 @@ service_info() {
     "--config-dir: ${SERVICE_ROOT}/config"
     "--data-dir: ${SERVICE_ROOT}/data"
     "--dsn: ${SERVICE_URL}"
+    "--external-dsn: ${SERVICE_EXTERNAL_URL}"
     "--exposed-ports: $(service_exposed_ports "$SERVICE")"
     "--id: ${SERVICE_CONTAINER_ID}"
     "--internal-ip: $(get_container_ip "${SERVICE_CONTAINER_ID}")"

functions

@@ -152,3 +152,18 @@ service_url() {
   local SERVICE_DNS_HOSTNAME="$(service_dns_hostname "$SERVICE")"
   echo "$PLUGIN_SCHEME://postgres:$PASSWORD@$SERVICE_DNS_HOSTNAME:${PLUGIN_DATASTORE_PORTS[0]}/$DATABASE_NAME"
 }
+
+service_external_url() {
+  local SERVICE="$1"
+  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  local PORT_FILE="$SERVICE_ROOT/PORT"
+  [[ ! -f $PORT_FILE ]] && echo '-' && return 0
+  local GLOBAL_VHOST_FILE="$DOKKU_ROOT/VHOST"
+  [[ ! -f $GLOBAL_VHOST_FILE ]] && echo '-' && return 0
+
+  local PORTS=($(cat "$PORT_FILE"))
+  local PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
+  local DATABASE_NAME="$(get_database_name "$SERVICE")"
+  local GLOBAL_VHOSTS=($(cat "$GLOBAL_VHOST_FILE"))
+  echo "$PLUGIN_SCHEME://postgres:$PASSWORD@${GLOBAL_VHOSTS[0]}:${PORTS[0]}/$DATABASE_NAME"
+}

subcommands/info

@@ -11,6 +11,7 @@ service-info-cmd() {
   #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --config-dir
   #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --data-dir
   #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --dsn
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --external-dsn
   #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --exposed-ports
   #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --id
   #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --internal-ip
@@ -22,6 +23,7 @@ service-info-cmd() {
   #F --config-dir, show the service configuration directory
   #F --data-dir, show the service data directory
   #F --dsn, show the service DSN
+  #F --external-dsn, show the exposed service DSN
   #F --exposed-ports, show service exposed ports
   #F --id, show the service container id
   #F --internal-ip, show the service internal ip

tests/service_info.bats

@@ -47,6 +47,9 @@ teardown() {
   run dokku "$PLUGIN_COMMAND_PREFIX:info" l --dsn
   assert_success
 
+  run dokku "$PLUGIN_COMMAND_PREFIX:info" l --external-dsn
+  assert_success
+
   run dokku "$PLUGIN_COMMAND_PREFIX:info" l --exposed-ports
   assert_success