Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

[Barry Price]

[Stuart Bishop (stub)]

Looks like a pile of trivial lint fixes to me.

+1

review: Approve

diff --git a/files/check_canonical-livepatch.py b/files/check_canonical-livepatch.py
index 27c9f69..74c61e5 100644
--- a/files/check_canonical-livepatch.py
+++ b/files/check_canonical-livepatch.py
@@ -7,17 +7,19 @@ import nagios_plugin
 from subprocess import check_output
 
 
-################################################################################
+##############################################################################
 
 def check_package_installed():
     cmd = ['snap', 'list', 'canonical-livepatch']
     try:
         check_output(cmd, universal_newlines=True)
     except:
-        raise nagios_plugin.CriticalError("canonical-livepatch snap is not installed")
+        raise nagios_plugin.CriticalError(
+            "canonical-livepatch snap is not installed"
+        )
 
 
-################################################################################
+##############################################################################
 
 def check_vmlinuz():
     vmlinuz = '/vmlinuz'
@@ -39,7 +41,7 @@ def check_vmlinuz():
     return kernel_version.strip()
 
 
-################################################################################
+##############################################################################
 
 def check_status():
     livepatch_output_path = '/var/lib/nagios/canonical-livepatch-status.txt'
@@ -67,7 +69,7 @@ def check_status():
         raise nagios_plugin.WarnError(wrn)
 
 
-################################################################################
+##############################################################################
 
 def main():
     nagios_plugin.try_check(check_package_installed)
@@ -75,7 +77,7 @@ def main():
     print("OK - canonical-livepatch seems to be installed and working")
 
 
-################################################################################
+##############################################################################
 
 if __name__ == "__main__":
     main()
diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index 14f75ec..e511669 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -26,11 +26,17 @@ def file_to_units(local_path, unit_path):
 
 
 def wait_for_path(file_path, timeout=30):
-    hookenv.log('Waiting for up to {}s for {}'.format(timeout, file_path))
+    hookenv.log('Waiting for up to {}s for {}'.format(
+        timeout,
+        file_path)
+    )
     seconds_waited = 0
     interval = 1
     while not (path.exists(file_path)):
-        hookenv.log('{} does not exist - waiting {}s'.format(file_path, interval))
+        hookenv.log('{} does not exist - waiting {}s'.format(
+            file_path,
+            interval)
+        )
         sleep(interval)
         seconds_waited += interval
         if seconds_waited >= timeout:
@@ -40,14 +46,18 @@ def wait_for_path(file_path, timeout=30):
 
 
 def wait_for_livepatch():
-    wait_for_path('/var/snap/canonical-livepatch/current/livepatchd-priv.sock')
+    wait_for_path(
+        '/var/snap/canonical-livepatch/current/livepatchd-priv.sock'
+    )
 
 
 def unit_update(status=None, message=None):
     if status and message:
         hookenv.status_set(status, message)
     else:
-        hookenv.status_set('active', 'Effective kernel {}'.format(get_equiv_kernel_version()))
+        hookenv.status_set('active', 'Effective kernel {}'.format(
+            get_equiv_kernel_version())
+        )
 
 
 def get_equiv_kernel_version():
@@ -78,18 +88,25 @@ def get_equiv_kernel_version():
     return version_string
 
 
-def configure_proxies(http_proxy=None, https_proxy=None, no_proxy=None):
-    config_path = '/var/snap/canonical-livepatch/common/config'
-
-    if path.exists(config_path):
-        with open(config_path, 'r') as stream:
+def get_yaml_if_exists(path_to_yaml):
+    if path.exists(path_to_yaml):
+        with open(path_to_yaml, 'r') as stream:
             try:
                 conf_yaml = load(stream)
-            except:
-                hookenv.log('Unable to load YAML from {}'.format(config_path))
+            except Exception:
+                hookenv.log(
+                    'Unable to load YAML from {}'.format(path_to_yaml)
+                )
     else:
         conf_yaml = {}
 
+    return conf_yaml
+
+
+def configure_proxies(http_proxy=None, https_proxy=None, no_proxy=None):
+    config_path = '/var/snap/canonical-livepatch/common/config'
+    conf_yaml = get_yaml_if_exists(config_path)
+
     if conf_yaml.get('http-proxy'):
         if http_proxy is None:
             del conf_yaml['http-proxy']
@@ -120,7 +137,11 @@ def configure_proxies(http_proxy=None, https_proxy=None, no_proxy=None):
 
 def restart_livepatch():
     # do a clean stop of the service first, 'restart' seems fragile right now
-    cmd = ['/usr/sbin/service', 'snap.canonical-livepatch.canonical-livepatchd', 'stop']
+    cmd = [
+        '/usr/sbin/service',
+        'snap.canonical-livepatch.canonical-livepatchd',
+        'stop'
+    ]
     hookenv.log('Stopping canonical-livepatch service')
     try:
         check_call(cmd, universal_newlines=True)
@@ -128,12 +149,18 @@ def restart_livepatch():
         hookenv.log('Failed to stop the service')
 
     # and now try to start it again, it may fail the first time!
-    cmd = ['/usr/sbin/service', 'snap.canonical-livepatch.canonical-livepatchd', 'start']
+    cmd = [
+        '/usr/sbin/service',
+        'snap.canonical-livepatch.canonical-livepatchd',
+        'start'
+    ]
     hookenv.log('Starting canonical-livepatch service')
     try:
         check_call(cmd, universal_newlines=True)
     except CalledProcessError:
-        hookenv.log('Failed to start the service - waiting 5s and then trying again')
+        hookenv.log(
+            'Failed to start the service - waiting 5s and then trying again'
+        )
         sleep(5)
         check_call(cmd, universal_newlines=True)
 
@@ -158,13 +185,20 @@ def update_key():
     if livepatch_key:
         # disable prior to enabling to work around LP#1628823
         cmd = ['/snap/bin/canonical-livepatch', 'disable']
-        hookenv.log('Disabling canonical-livepatch ahead of key change to work around LP#1628823')
+        hookenv.log(
+            'Disabling canonical-livepatch ahead of key change '
+            + 'to work around LP#1628823'
+        )
         try:
             check_output(cmd, universal_newlines=True)
         except CalledProcessError as e:
             hookenv.log('Unable to deactivate: {}'.format(str(e)))
 
-        cmd = ['/snap/bin/canonical-livepatch', 'enable', '{}'.format(livepatch_key.strip())]
+        cmd = [
+            '/snap/bin/canonical-livepatch',
+            'enable',
+            '{}'.format(livepatch_key.strip())
+        ]
         hookenv.log('Activating canonical-livepatch with your key')
         try:
             check_output(cmd, universal_newlines=True)
@@ -176,9 +210,14 @@ def update_key():
             set_state('canonical-livepatch.active')
             unit_update()
     else:
-        hookenv.log('Unable to activate canonical-livepatch as no key has been set')
+        hookenv.log(
+            'Unable to activate canonical-livepatch as no key has been set'
+        )
         remove_state('canonical-livepatch.active')
-        unit_update('blocked', 'Service disabled, please set livepatch_key to activate')
+        unit_update(
+            'blocked',
+            'Service disabled, please set livepatch_key to activate'
+        )
 
 
 @when('canonical-livepatch.connected')
@@ -195,7 +234,7 @@ def update_livepatch_proxy():
     # Make sure the service is ready for us
     wait_for_livepatch()
 
-    # force a key update, registration may have been blocked before proxy was set
+    # force a key update, we may have been blocked before proxy was set
     update_key()
 
 
@@ -224,10 +263,11 @@ def init_nagios_checks(nagios):
         )
 
     # use charmhelpers to create the check
-    nrpe_setup.add_check('check_canonical-livepatch',
-                         'Verify canonical-livepatch is working',
-                         '/usr/lib/nagios/plugins/check_canonical-livepatch.py'
-                         )
+    nrpe_setup.add_check(
+        'check_canonical-livepatch',
+        'Verify canonical-livepatch is working',
+        '/usr/lib/nagios/plugins/check_canonical-livepatch.py'
+    )
 
     nrpe_setup.write()
 
diff --git a/tests/99-autogen b/tests/99-autogen
index c57bbf4..05824f0 100755
--- a/tests/99-autogen
+++ b/tests/99-autogen
@@ -20,17 +20,29 @@ class TestDeployment(unittest.TestCase):
         cls.deployment.add('nrpe')
 
         # relate subordinates to parent charm
-        cls.deployment.relate('postgresql:juju-info', 'canonical-livepatch:juju-info')
-        cls.deployment.relate('postgresql:nrpe-external-master', 'nrpe:nrpe-external-master')
+        cls.deployment.relate(
+            'postgresql:juju-info',
+            'canonical-livepatch:juju-info'
+        )
+        cls.deployment.relate(
+            'postgresql:nrpe-external-master',
+            'nrpe:nrpe-external-master'
+        )
 
         # relate livepatch to nrpe for its own nagios checks
-        cls.deployment.relate('canonical-livepatch:nrpe-external-master', 'nrpe:nrpe-external-master')
+        cls.deployment.relate(
+            'canonical-livepatch:nrpe-external-master',
+            'nrpe:nrpe-external-master'
+        )
 
         try:
             cls.deployment.setup(timeout=3600)
             cls.deployment.sentry.wait()
         except amulet.helpers.TimeoutError:
-            amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+            amulet.raise_status(
+                amulet.SKIP,
+                msg="Environment wasn't stood up in time"
+            )
         except:
             raise
 
@@ -38,13 +50,15 @@ class TestDeployment(unittest.TestCase):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]
 
         # verify the snap was installed
-        output, exit_code = livepatch.run('stat /snap/bin/canonical-livepatch')
+        output, exit_code = livepatch.run(
+            'stat /snap/bin/canonical-livepatch'
+        )
         self.assertEqual(exit_code, 0)
 
     def test_status(self):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]
 
-        # run a status check - we expect this to return code 1 due to no access key
+        # run a status check - we expect this to return 1 due to no access key
         output, exit_code = livepatch.run('sudo canonical-livepatch status')
         self.assertEqual(exit_code, 1)
 
@@ -75,8 +89,9 @@ class TestDeployment(unittest.TestCase):
 
         # confirm it showed up in the right place
         output, exit_code = livepatch.run(
-            'grep {} /var/lib/nagios/export/service__*_check_canonical-livepatch.cfg'.format(test_context_name)
-        )
+            'grep {} /var/lib/nagios/export/'
+            + 'service__*_check_canonical-livepatch'
+            + '.cfg'.format(test_context_name))
         self.assertEqual(exit_code, 0)
 
     def test_nagios_servicegroup_change(self):
@@ -94,7 +109,9 @@ class TestDeployment(unittest.TestCase):
 
         # confirm it showed up in the right place
         output, exit_code = livepatch.run(
-            'grep {} /var/lib/nagios/export/service__*_check_canonical-livepatch.cfg'.format(test_servicegroup_name)
+            'grep {} /var/lib/nagios/export/'
+            + 'service__*_check_canonical-livepatch'
+            + '.cfg'.format(test_servicegroup_name)
         )
         self.assertEqual(exit_code, 0)