Merge lp:~stub/charms/precise/postgresql/bug-1190141-client-access-fail into lp:charms/postgresql

[Stuart Bishop]

Restore basic functionality to the charm by actually granting clients access.

Tests now pass (all one of them):

$ TEST_DEBUG_FILE=debug.log TEST_TIMEOUT=600 ./test.py -vv
test_basic (__main__.PostgreSQLCharmTestCase)
__main__.PostgreSQLCharmTestCase.test_basic ... ok

----------------------------------------------------------------------
Ran 1 test in 635.891s

OK

[Stuart Bishop (stub)]

Running the tests requires local:postgresql-psql from lp:~stub/charms/precise/postgresql-psql/devel (up for review elsewhere).

[lp:~stub/charms/precise/postgresql/bug-1190141-client-access-fail]

62. By Stuart Bishop on 2013-06-19

Merged tests into bug-1190141-client-access-fail.

63. By Stuart Bishop on 2013-06-19

Merged tests into bug-1190141-client-access-fail.

64. By Stuart Bishop on 2013-06-19

Merged tests into bug-1190141-client-access-fail.

65. By Stuart Bishop on 2013-06-19

Merged tests into bug-1190141-client-access-fail.

66. By Stuart Bishop on 2013-06-19

Merged tests into bug-1190141-client-access-fail.

67. By Stuart Bishop on 2013-06-19

Merged tests into bug-1190141-client-access-fail.

68. By Stuart Bishop on 2013-06-20

Merged tests into bug-1190141-client-access-fail.

69. By Stuart Bishop on 2013-06-20

Merged tests into bug-1190141-client-access-fail.

[Mark Mims (mark-mims)]

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-06-20 14:25:33 +0000
+++ hooks/hooks.py	2013-06-20 14:25:34 +0000
@@ -622,13 +622,17 @@
     for relid in relation_ids(relation_types=['db', 'db-admin']):
         local_relation = relation_get(
             unit_name=os.environ['JUJU_UNIT_NAME'], relation_id=relid)
+
+        # We might see relations that have not yet been setup enough.
+        # At a minimum, the relation-joined hook needs to have been run
+        # on the server so we have information about the usernames and
+        # databases to allow in.
+        if 'user' not in local_relation:
+            continue
+
         for unit in relation_list(relid):
             relation = relation_get(unit_name=unit, relation_id=relid)
 
-            # If a relation is not yet completely setup, skip it.
-            if 'user' not in relation:
-                continue
-
             relation['relation-id']  = relid
             relation['unit'] = unit