Merge lp:~abentley/charms/precise/juju-reports/no-lp-key into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Don't require key for local deploys, don't set lp-login if no key.

This branch changes lp key handling so that an LP private key is not required if source is not an lp branch. If no private key is supplied, we do not set a launchpad user-id, and fall back to anonymous http usage.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-05-08 20:51:08 +0000
+++ hooks/common.py	2014-05-09 16:26:42 +0000
@@ -3,6 +3,7 @@
     NoSectionError)
 import errno
 import os
+import re
 from StringIO import StringIO
 import subprocess
 import sys
@@ -74,9 +75,11 @@
 
 def get_config():
     config = yaml.safe_load(StringIO(subprocess.check_output('config-get')))
-    for key in ['lp-key', 'source']:
-        if config[key] == '':
-            raise IncompleteConfig('%s not specified.' % key)
+    if config['source'] == '':
+        raise IncompleteConfig('source not specified.')
+    if re.match('(lp:|.*://bazaar.launchpad.net/)', config['source']):
+        if config['lp-key'] == '':
+            raise IncompleteConfig('lp-key not specified.')
     return config
 
 
@@ -86,15 +89,15 @@
 
 @in_juju_reports
 def update_source(source_url, revno, ssh_key):
-    fd = os.open('/root/.ssh/lp_rsa', os.O_WRONLY | os.O_TRUNC | os.O_CREAT,
-                 0600)
-    try:
-        os.write(fd, ssh_key)
-    finally:
-        os.close(fd)
-    # Login to LP
-    bzr_cmd = ['bzr', 'lp-login', 'juju-qa-bot']
-    subprocess.check_call(bzr_cmd)
+    if ssh_key != '':
+        fd = os.open('/root/.ssh/lp_rsa', os.O_WRONLY | os.O_TRUNC |
+                     os.O_CREAT, 0600)
+        try:
+            os.write(fd, ssh_key)
+        finally:
+            os.close(fd)
+        # Login to LP
+        subprocess.check_call(['bzr', 'lp-login', 'juju-qa-bot'])
 
     # Grab the code
     revno = 'revno:%s' % revno