Merge lp:~stub/charms/precise/postgresql-psql/devel into lp:charms/postgresql-psql

[Stuart Bishop]

Move generated scripts and credentials out of the charm directory

Per Bug #1205286, we shouldn't be generating scripts and storing credentials in the charm directory.

[lp:~stub/charms/precise/postgresql-psql/devel]

24. By Stuart Bishop on 2013-08-19

Missing hook registrations

25. By Stuart Bishop on 2013-08-19

Update charmhelpers

26. By Stuart Bishop on 2013-08-23

Update system PATH correctly

[Mark Mims (mark-mims)]

review: Approve

=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2013-07-15 12:48:49 +0000
+++ hooks/charmhelpers/core/hookenv.py	2013-08-23 11:49:26 +0000
@@ -335,5 +335,6 @@
             return decorated
         return wrapper
 
+
 def charm_dir():
     return os.environ.get('CHARM_DIR')

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2013-07-15 12:48:49 +0000
+++ hooks/charmhelpers/core/host.py	2013-08-23 11:49:26 +0000
@@ -9,12 +9,14 @@
 import os
 import pwd
 import grp
+import random
+import string
 import subprocess
 import hashlib
 
 from collections import OrderedDict
 
-from hookenv import log, execution_environment
+from hookenv import log
 
 
 def service_start(service_name):
@@ -86,36 +88,33 @@
 
 def rsync(from_path, to_path, flags='-r', options=None):
     """Replicate the contents of a path"""
-    context = execution_environment()
     options = options or ['--delete', '--executability']
     cmd = ['/usr/bin/rsync', flags]
     cmd.extend(options)
-    cmd.append(from_path.format(**context))
-    cmd.append(to_path.format(**context))
+    cmd.append(from_path)
+    cmd.append(to_path)
     log(" ".join(cmd))
     return subprocess.check_output(cmd).strip()
 
 
 def symlink(source, destination):
     """Create a symbolic link"""
-    context = execution_environment()
     log("Symlinking {} as {}".format(source, destination))
     cmd = [
         'ln',
         '-sf',
-        source.format(**context),
-        destination.format(**context)
+        source,
+        destination,
     ]
     subprocess.check_call(cmd)
 
 
 def mkdir(path, owner='root', group='root', perms=0555, force=False):
     """Create a directory"""
-    context = execution_environment()
     log("Making dir {} {}:{} {:o}".format(path, owner, group,
                                           perms))
-    uid = pwd.getpwnam(owner.format(**context)).pw_uid
-    gid = grp.getgrnam(group.format(**context)).gr_gid
+    uid = pwd.getpwnam(owner).pw_uid
+    gid = grp.getgrnam(group).gr_gid
     realpath = os.path.abspath(path)
     if os.path.exists(realpath):
         if force and not os.path.isdir(realpath):
@@ -270,3 +269,15 @@
             k, v = l.split('=')
             d[k.strip()] = v.strip()
     return d
+
+
+def pwgen(length=None):
+    '''Generate a random pasword.'''
+    if length is None:
+        length = random.choice(range(35, 45))
+    alphanumeric_chars = [
+        l for l in (string.letters + string.digits)
+        if l not in 'l0QD1vAEIOUaeiou']
+    random_chars = [
+        random.choice(alphanumeric_chars) for _ in range(length)]
+    return(''.join(random_chars))

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-07-15 13:08:40 +0000
+++ hooks/hooks.py	2013-08-23 11:49:26 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os.path
+import re
 import shutil
 import sys
 from textwrap import dedent
@@ -11,6 +12,28 @@
 
 CLIENT_RELATION_TYPES = frozenset(['db', 'db-admin'])
 
+DATA_DIR = os.path.join(
+    '/var/lib/units', hookenv.local_unit().replace('/', '-'))
+SCRIPT_DIR = os.path.join(DATA_DIR, 'bin')
+PGPASS_DIR = os.path.join(DATA_DIR, 'pgpass')
+
+
+def update_system_path():
+    org_lines = open('/etc/environment', 'rb').readlines()
+    env_lines = []
+
+    for line in org_lines:
+        if line.startswith('PATH=') and SCRIPT_DIR not in line:
+            line = re.sub(
+                """(['"]?)$""",
+                ":{}\\1".format(SCRIPT_DIR),
+                line, 1)
+        env_lines.append(line)
+
+    if org_lines != env_lines:
+        content = '\n'.join(env_lines)
+        host.write_file('/etc/environment', content, perms=0o644)
+
 
 def all_relations(relation_types=CLIENT_RELATION_TYPES):
     for reltype in relation_types:
@@ -19,22 +42,18 @@
                 yield reltype, relid, unit, hookenv.relation_get(
                     unit=unit, rid=relid)
 
-hooks = hookenv.Hooks()
 
[e-mail](
-    'config-changed', 'upgrade-charm',
-    'db-relation-changed', 'db-relation-joined',
-    'db-admin-relation-changed', 'db-admin-relation-joined')
 def rebuild_all_relations():
     config = hookenv.config()
 
     # Clear out old scripts and pgpass files
-    if os.path.exists('bin'):
-        shutil.rmtree('bin')
-    if os.path.exists('pgpass'):
-        shutil.rmtree('pgpass')
-    host.mkdir('bin', perms=0o755)
-    host.mkdir('pgpass', group='ubuntu', perms=0o750)
+    if os.path.exists(SCRIPT_DIR):
+        shutil.rmtree(SCRIPT_DIR)
+    if os.path.exists(PGPASS_DIR):
+        shutil.rmtree(PGPASS_DIR)
+    host.mkdir(DATA_DIR, perms=0o755)
+    host.mkdir(SCRIPT_DIR, perms=0o755)
+    host.mkdir(PGPASS_DIR, group='ubuntu', perms=0o750)
 
     for _, relid, unit, relation in all_relations(relation_types=['db']):
         log("{} {} {!r}".format(relid, unit, relation), DEBUG)
@@ -72,8 +91,8 @@
 def build_script(script_name, relation):
     # Install a wrapper to psql that connects it to the desired database
     # by default. One wrapper per unit per relation.
-    script_path = os.path.abspath(os.path.join('bin', script_name))
-    pgpass_path = os.path.abspath(os.path.join('pgpass', script_name))
+    script_path = os.path.abspath(os.path.join(SCRIPT_DIR, script_name))
+    pgpass_path = os.path.abspath(os.path.join(PGPASS_DIR, script_name))
     script = dedent("""\
         #!/bin/sh
         exec env \\
@@ -96,7 +115,38 @@
     pgpass = "*:*:*:{user}:{password}".format(
         user=relation['user'], password=relation['password'])
     host.write_file(
-        pgpass_path, pgpass, owner="ubuntu", group="ubuntu", mode=0o400)
+        pgpass_path, pgpass, owner="ubuntu", group="ubuntu", perms=0o400)
+
+
+hooks = hookenv.Hooks()
+
+
[e-mail]()
+def install():
+    host.apt_install(
+        ['language-pack-en', 'postgresql-client', 'python-psycopg2'],
+        fatal=True)
+    update_system_path()
+
+
[e-mail]()
+def upgrade_charm():
+    # Per Bug #1205286, we can't store scripts and passwords in the
+    # charm directory.
+    if os.path.exists('bin'):
+        shutil.rmtree('bin')
+    if os.path.exists('pgpass'):
+        shutil.rmtree('pgpass')
+    update_system_path()
+    return rebuild_all_relations()
+
+
[e-mail](
+    'config-changed', 'db-admin-relation-broken',
+    'db-admin-relation-changed', 'db-admin-relation-joined',
+    'db-relation-broken', 'db-relation-changed', 'db-relation-joined')
+def rebuild_hook():
+    return rebuild_all_relations()
 
 
 if __name__ == '__main__':

=== modified file 'hooks/install'
--- hooks/install	2013-06-17 16:50:51 +0000
+++ hooks/install	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-PACKAGES="postgresql-client python-psycopg2 language-pack-en"
-juju-log "Installing ${PACKAGES}"
-apt-get -y install -qq ${PACKAGES}
-
-juju-log "Adding ${PWD}/bin to \$PATH"
-sed -e "/^PATH/s|\"\$|:${PWD}/bin\"|g" -i.bak /etc/environment

=== target is u'./hooks.py'