Merge lp:~abentley/charms/precise/juju-reports/external-oauth into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Provide OAauth credentials from config var.

This branch changes the charm to supply OAuth credentials from the lp-oauth config variable.

The file is only updated if it does not match the desired value, so that the Makefile is not triggered unduly.

As a driveby, the Launchpad Code SSH key is added to the ubuntu user, just as it already was for root. This makes initial startup more automated.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2014-06-19 19:58:55 +0000
+++ config.yaml	2014-07-07 13:22:09 +0000
@@ -20,6 +20,10 @@
     type: string
     default: ""
     description: "SSH key for accessing private code on launchpad."
+  lp-oauth:
+    type: string
+    default: ""
+    description: "OAuth credentials for accessing private data on Launchapd."
   dist-clean:
     type: boolean
     default: true

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-06-19 19:58:55 +0000
+++ hooks/common.py	2014-07-07 13:22:09 +0000
@@ -184,6 +184,24 @@
         hookenv.relation_set(relation_id, relation_settings)
 
 
+def update_file(path, new_contents):
+    """Write file only if the contents are changed."""
+    try:
+        file_context = open(path, 'r')
+    except IOError as e:
+        if e.errno == errno.ENOENT:
+            old_contents = None
+        else:
+            raise
+    else:
+        with file_context as fileobj:
+            old_contents = fileobj.read()
+    if old_contents == new_contents:
+        return
+    with open(path, 'w') as fileobj:
+        fileobj.write(new_contents)
+
+
 def update_from_config():
     ini = get_ini()
     mongo_url = get_mongo_url()
@@ -195,13 +213,17 @@
         hookenv.log('Incomplete config: source')
         return
     update_source(config['source'], config['revno'])
+    oauth_path = os.path.join(PROJECT_DIR, 'jujureports/lp_credentials.txt')
+    update_file(oauth_path, config['lp-oauth'] + '\n')
     install_production(config['dist-clean'], config['develop-install'])
     if mongo_url == '':
         hookenv.log('No mongodb set up.')
         return
     ini = install_ini(mongo_url)
-    if config['lp-key'] == '':
-        hookenv.log('Not setting up cron because lp-key not set.')
+    for key in ['lp-key', 'lp-oauth']:
+        if config[key] == '':
+            hookenv.log('Not setting up cron because {} not set.'.format(key))
+            break
     else:
         install_cronjob(config['cron-interval'], config['error-email'])
     start()

=== modified file 'hooks/install'
--- hooks/install	2014-06-06 14:16:14 +0000
+++ hooks/install	2014-07-07 13:22:09 +0000
@@ -25,6 +25,8 @@
 
 # Make sure launchpad is a known host so ssh isn't prompted to accept it.
 cat templates/known_hosts >> /root/.ssh/known_hosts
+cat templates/known_hosts >> /home/ubuntu/.ssh/known_hosts
+chown ubuntu:ubuntu /home/ubuntu/.ssh/known_hosts
 
 # Get the code.
 cd $project_dir