Merge lp:~abentley/charms/precise/juju-reports/configure-s3 into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Configure S3.

This branch enables configuring S3 for juju-reports, so that it can download data from s3.

[Curtis Hovey (sinzui)]

Thank you

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2014-07-15 14:31:47 +0000
+++ config.yaml	2014-07-21 20:21:39 +0000
@@ -40,4 +40,11 @@
     type: string
     default: http://juju-ci.vapour.ws:8080
     description: "The Jenkins URL to use for retrieving Juju CI data."
-
+  aws-access-key:
+    type: string
+    default: ""
+    description: "The access key to use for the s3 bucket."
+  aws-secret-key:
+    type: string
+    default: ""
+    description: "The secret key to use for the s3 bucket."

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-07-15 14:31:47 +0000
+++ hooks/common.py	2014-07-21 20:21:39 +0000
@@ -18,7 +18,6 @@
 HOME = '/home/ubuntu'
 PROJECT_DIR = os.path.join(HOME, 'juju-reports')
 INI = 'production.ini'
-INI_TEMPLATE = 'resources/production.ini.template'
 
 
 def get_ini_path():
@@ -31,19 +30,50 @@
     return config
 
 
+def get_template_path(name):
+    return os.path.join(PROJECT_DIR, 'resources/{}.template'.format(name))
+
+
 def install_ini(mongo_url, gh_token, jujuci_url):
     config = ConfigParser()
-    path = os.path.join(PROJECT_DIR, INI_TEMPLATE)
+    path = get_template_path(INI)
     if not os.path.exists(path):
         path = get_ini_path()
     config.read(path)
     config.set('app:main', 'mongo.url', mongo_url)
     config.set('app:main', 'gh_token', gh_token)
     config.set('app:main', 'jujuci.url', jujuci_url)
+    config.set('app:main', 'home', HOME)
     config.write(open(get_ini_path(), 'w'))
     return config
 
 
+def configure_s3(config):
+    template_path = get_template_path('juju-qa.s3cfg')
+    try:
+        template_cm = open(template_path)
+    except IOError as e:
+        if e.errno == errno.ENOENT:
+            hookenv.log('Skipping s3 config due to missing template.')
+            return
+    with template_cm as template_file:
+        template = template_file.read()
+    config_path = os.path.join(PROJECT_DIR, 'juju-qa.s3cfg')
+    s3config = template.format(access_key=config['aws-access-key'],
+                               secret_key=config['aws-secret-key'])
+    update_file(config_path, s3config)
+    ensure_dir(os.path.join(HOME, 'juju-qa-data'))
+    ensure_dir(os.path.join(HOME, 'juju-qa-data/cbtest'))
+
+
+def ensure_dir(path):
+    try:
+        os.mkdir(path)
+    except OSError as e:
+        if e.errno != errno.EEXIST:
+            raise
+
+
 def get_configured_port(ini):
     return ini_get(ini, 'server:main', 'port')
 
@@ -223,6 +253,7 @@
         hookenv.log('No mongodb set up.')
         return
     ini = install_ini(mongo_url, config['gh-token'], config['jujuci-url'])
+    configure_s3(config)
     for key in ['lp-key', 'lp-oauth', 'gh-token']:
         if config[key] == '':
             hookenv.log('Not setting up cron because {} not set.'.format(key))