Merge lp:~mthaddon/charms/precise/pgbouncer/dbproxy-relation-ids into lp:charms/pgbouncer

[Tom Haddon]

If we have more than one db-proxy relation, the charm fails because we get the output of "relation-ids db-proxy" and pass that to "relation-list -r", which only accepts one relation id at a time. So, this fixes that problem.

[Juan L. Negron (negronjl)]

Reviewing now.

-Juan

[Juan L. Negron (negronjl)]

Approved.

-Juan

review: Approve

=== modified file 'hooks/backend-db-admin-relation-changed'
--- hooks/backend-db-admin-relation-changed	2012-11-09 18:40:54 +0000
+++ hooks/backend-db-admin-relation-changed	2013-03-25 11:34:23 +0000
@@ -30,10 +30,15 @@
 /usr/sbin/service pgbouncer reload
 
 # Trigger db-proxy-relation-changed if it exists already
-dbproxyid=$(relation-ids db-proxy)
-if [ -n "$dbproxyid" ]; then
-	dbproxyremoteunit=$(relation-list -r $dbproxyid)
-	if [ -n "$dbproxyremoteunit" ]; then
-		./hooks/db-proxy-relation-changed
-	fi
+dbproxy_relation_ids=$(relation-ids db-proxy)
+if [ -n "${dbproxy_relation_ids}" ]; then
+    for dbproxy_relation_id in $(echo ${dbproxy_relation_ids}); do
+        dbproxyremoteunit=$(relation-list -r ${dbproxy_relation_id})
+        if [ -n "${dbproxyremoteunit}" ]; then
+            ./hooks/db-proxy-relation-changed
+            # We only need to do this once, so we can break out of the for loop
+            # now
+            break
+        fi
+    done
 fi

=== modified file 'hooks/db-proxy-relation-changed'
--- hooks/db-proxy-relation-changed	2013-02-25 07:15:10 +0000
+++ hooks/db-proxy-relation-changed	2013-03-25 11:34:23 +0000
@@ -8,8 +8,8 @@
 # Find the backend-db-admin relationship
 backendid=$(relation-ids backend-db-admin)
 if [ -z "$backendid" ]; then
-	juju-log "No backend-db-admin relation yet, exiting"
-	exit 0
+    juju-log "No backend-db-admin relation yet, exiting"
+    exit 0
 fi
 backendunit=$(relation-list -r $backendid)
 # TODO: Handle multple backend units
@@ -18,111 +18,118 @@
 export PGPASSWORD=$(relation-get -r $backendid password $backendunit)
 export PGDATABASE='template1'
 if [ -z "$PGPASSWORD" ]; then
-	juju-log "No backend-db-admin relation yet, exiting"
-	exit 0
-fi
-
-# If called out of context
-if [ "$JUJU_RELATION" != "db-proxy" ]; then
-	juju-log "Out of db-proxy relation context, manually setting JUJU vars for db-proxy relation"
-        JUJU_RELATION="db-proxy"
-	export JUJU_RELATION_ID=$(relation-ids db-proxy)
-	# TODO: This must handle multiple db-proxy relationships
-	# for JUJU_RELATION_ID in $JUJU_RELATION_IDS; do
-	export JUJU_REMOTE_UNIT=$(relation-list -r $JUJU_RELATION_ID)
-	if [ -z "$JUJU_REMOTE_UNIT" ]; then
-		juju-log "No db-proxy relation remote-unit yet, exiting"
-		exit 0
-	fi
-fi
-
-# Get remote relationship
-database=$(relation-get database)
-# A comma seperated list of roles can be passed in by the joining charm which will be granted
-# th the db user
-roles=$(relation-get roles)
-user=${JUJU_REMOTE_UNIT///*}
-if [[ -z ${database} ]]; then
-    database=${JUJU_REMOTE_UNIT///*}
-    database=${database//-/_}
-    user=${user//-/_}
-else
-    user="${user//-/_}_${database}"
-fi
-
-host=$(unit-get private-address)
-port=$(config-get listen_port)
-
-service_password_file="/var/lib/juju/${user}.password"
+    juju-log "No backend-db-admin relation yet, exiting"
+    exit 0
+fi
 
 create_password() {
-  password=`pwgen -s 16`
-  echo ${password} > ${service_password_file}
+    password=`pwgen -s 16`
+    echo ${password} > ${service_password_file}
 }
 has_password() {
-  [ -f ${service_password_file} ] && password=`cat ${service_password_file}`
+    [ -f ${service_password_file} ] && password=`cat ${service_password_file}`
 }
-
 create_role() {
-  local l_role=${1}
-  psql -c"create user ${l_role}"
+    local l_role=${1}
+    psql -c"create user ${l_role}"
 }
 create_user() {
-  psql -c"create user ${user} password '${password}'"
+    psql -c"create user ${user} password '${password}'"
 }
 has_user() {
-  local l_role=${1:-$user}
-  psql -c"select rolname from pg_roles;" | grep -wq ${l_role}
+    local l_role=${1:-$user}
+    psql -c"select rolname from pg_roles;" | grep -wq ${l_role}
 }
 set_password() {
-  psql -c"alter user ${user} password '${password}'"
+    psql -c"alter user ${user} password '${password}'"
 }
-
-# If we point pgbouncer at an existing db then the user may exist but the
-# password is unknown. In this case reset the password
-if has_user && ! has_password ; then
-    create_password && set_password
-fi
-has_password || create_password
-has_user || create_user
-
 create_database() {
-  psql -c"create database ${database} owner ${user}" 
-  psql -c"grant all privileges on database ${database} to ${user}"
+    psql -c"create database ${database} owner ${user}"
+    psql -c"grant all privileges on database ${database} to ${user}"
 }
 has_database() {
-  psql -c"select datname from pg_database;" | grep -wq ${database}
+    psql -c"select datname from pg_database;" | grep -wq ${database}
 }
-
-has_database || create_database
-
 grant_role() {
-  local l_role=$1
-  has_user $l_role || create_role $l_role
-  echo "Granting $l_role to ${user};"
-  psql -c"grant ${l_role} to ${user};"
+    local l_role=$1
+    has_user $l_role || create_role $l_role
+    echo "Granting $l_role to ${user};"
+    psql -c"grant ${l_role} to ${user};"
 }
 
-db_owner=`psql -t -c"SELECT rolname FROM pg_database JOIN pg_authid ON pg_database.datdba = pg_authid.oid where datname = '${database}'" | tr -d ' '`
-if [ "${db_owner}" != "${user}" ]; then
-  grant_role $db_owner
-fi
-
-if [ -n "${roles}" ]; then
-  echo "Roles: $roles"
-  allroles=(${roles//,/ })
-
-  for role in "${allroles[@]}"; do
-    grant_role $role
-  done
-fi
-
-relation-set -r $JUJU_RELATION_ID host=${host} \
+function update_db_credentials() {
+    # Get remote relationship
+    database=$(relation-get database)
+    # A comma seperated list of roles can be passed in by the joining charm
+    # which will be granted to the db user
+    roles=$(relation-get roles)
+    user=${JUJU_REMOTE_UNIT///*}
+    if [[ -z ${database} ]]; then
+        database=${JUJU_REMOTE_UNIT///*}
+        database=${database//-/_}
+        user=${user//-/_}
+    else
+        user="${user//-/_}_${database}"
+    fi
+
+    host=$(unit-get private-address)
+    port=$(config-get listen_port)
+
+    service_password_file="/var/lib/juju/${user}.password"
+
+    # If we point pgbouncer at an existing db then the user may exist but the
+    # password is unknown. In this case reset the password
+    if has_user && ! has_password ; then
+        create_password && set_password
+    fi
+    has_password || create_password
+    has_user || create_user
+
+    has_database || create_database
+
+    db_owner=`psql -t -c"SELECT rolname FROM pg_database JOIN pg_authid ON pg_database.datdba = pg_authid.oid where datname = '${database}'" | tr -d ' '`
+    if [ "${db_owner}" != "${user}" ]; then
+        grant_role $db_owner
+    fi
+
+    if [ -n "${roles}" ]; then
+        echo "Roles: $roles"
+        allroles=(${roles//,/ })
+
+        for role in "${allroles[@]}"; do
+            grant_role $role
+        done
+    fi
+
+    relation-set -r $JUJU_RELATION_ID host=${host} \
              port=${port} \
              user=${user} \
              password=${password} \
              database=${database}
 
-echo "${database} = host=${PGHOST} port=5432 dbname=${database}" > /var/lib/juju/db-${database}
+    echo "${database} = host=${PGHOST} port=5432 dbname=${database}" > /var/lib/juju/db-${database}
+}
+
+if [ "$JUJU_RELATION" != "db-proxy" ]; then
+    # If called out of context
+    juju-log "Out of db-proxy relation context, manually setting JUJU vars for db-proxy relation"
+    JUJU_RELATION="db-proxy"
+    export JUJU_RELATION_IDS=$(relation-ids db-proxy)
+    UPDATED="False" 
+    for JUJU_RELATION_ID in $(echo ${JUJU_RELATION_ID}); do
+        export JUJU_REMOTE_UNIT=$(relation-list -r $JUJU_RELATION_ID)
+        if [ -n "$JUJU_REMOTE_UNIT" ]; then
+            update_db_credentials
+            UPDATED="True"
+        fi
+    done
+    if [ "$UPDATED" = "False" ]; then
+        juju-log "Nothing updated, exiting"
+        exit 0
+    fi
+else
+    # We're being called normally
+    update_db_credentials
+fi
 
 update_config