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

[Barry Price]

Improve NRPE error reporting, use YAML module for snap channel parsing, add a refresh action

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Looks good. Some potentially spurious whitespace, commented on inline.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 6189420d461cdcbe9a144e322a96800c4159d503

diff --git a/actions.yaml b/actions.yaml
index 52655b6..29037fd 100644
--- a/actions.yaml
+++ b/actions.yaml
@@ -2,3 +2,5 @@ activate:
   description: Activate the Livepatch service.
 deactivate:
   description: Deactivate the Livepatch service.
+refresh:
+  description: Refresh the Livepatch service.
diff --git a/actions/actions.py b/actions/actions.py
index d618758..6c956cd 100755
--- a/actions/actions.py
+++ b/actions/actions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/local/sbin/charm-env python3
 
 import os.path
 import sys
@@ -7,7 +7,7 @@ from subprocess import check_output, CalledProcessError
 from charmhelpers.core import hookenv
 
 
-def activate():
+def activate(params):
     config = hookenv.config()
     livepatch_key = config.get('livepatch_key')
 
@@ -32,7 +32,7 @@ def activate():
         hookenv.action_fail('Unable to activate as no key has been set')
 
 
-def deactivate():
+def deactivate(params):
     cmd = ['/snap/bin/canonical-livepatch', 'disable']
     try:
         check_output(cmd, universal_newlines=True)
@@ -42,6 +42,16 @@ def deactivate():
     hookenv.action_set(dict(result='Deactivated'))
 
 
+def refresh(params):
+    cmd = ['/snap/bin/canonical-livepatch', 'refresh']
+    try:
+        check_output(cmd, universal_newlines=True)
+    except CalledProcessError as e:
+        hookenv.action_fail('Unable to refresh: {}'.format(str(e)))
+        return
+    hookenv.action_set(dict(result='Refreshed'))
+
+
 def main(argv):
     action = os.path.basename(argv[0])
     params = hookenv.action_get()
@@ -50,6 +60,8 @@ def main(argv):
             activate(params)
         elif action == 'deactivate':
             deactivate(params)
+        elif action == 'refresh':
+            refresh(params)
         else:
             hookenv.action_fail('Action {} not implemented'.format(action))
     except Exception:
diff --git a/actions/refresh b/actions/refresh
new file mode 120000
index 0000000..405a394
--- /dev/null
+++ b/actions/refresh
@@ -0,0 +1 @@
+actions.py
\ No newline at end of file
diff --git a/files/check_canonical-livepatch.py b/files/check_canonical-livepatch.py
index 3a13062..e4eaa91 100755
--- a/files/check_canonical-livepatch.py
+++ b/files/check_canonical-livepatch.py
@@ -53,13 +53,15 @@ def check_status():
             line = line.strip()
             if 'State:' in line:
                 if 'apply-failed' in line:
-                    err_lines.append('Patch failed')
+                    err_lines.append('Livepatch failed to apply patches. ')
                 elif 'check-failed' in line:
-                    err_lines.append('Check failed')
+                    err_lines.append('Livepatch failed to check the remote service for patches. ')
                 elif 'unknown' in line:
-                    err_lines.append('Unknown error')
+                    err_lines.append('Livepatch reports an unknown error. ')
+                elif 'kernel-upgrade-required' in line:
+                    err_lines.append('A kernel upgrade (and reboot) is required. ')
             elif 'Machine is not enabled' in line:
-                err_lines.append('Machine is not enabled')
+                err_lines.append('Machine is not enabled. ')
 
     if err_lines:
         err = " ".join(err_lines)
diff --git a/tests/99-autogen b/tests/99-autogen
index f4b0af9..d7bed72 100755
--- a/tests/99-autogen
+++ b/tests/99-autogen
@@ -3,6 +3,7 @@
 import amulet
 import unittest
 from time import sleep
+from yaml import safe_load
 
 
 class TestDeployment(unittest.TestCase):
@@ -97,7 +98,6 @@ class TestDeployment(unittest.TestCase):
             '.cfg'.format(test_context_name))
         self.assertEqual(exit_code, 0)
 
-
     def test_channel_change(self):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]
 
@@ -106,10 +106,8 @@ class TestDeployment(unittest.TestCase):
         self.assertEqual(exit_code, 0)
 
         # confirm we're tracking 'stable'
-        channel = ''
-        for line in output.split('\n'):
-            if line.startswith('tracking:'):
-                channel = line.strip().split(' ')[-1]
+        output_yaml = safe_load(output)
+        channel = output_yaml['tracking']
         self.assertEqual(channel, 'stable')
 
         # change channel to 'beta'
@@ -125,13 +123,10 @@ class TestDeployment(unittest.TestCase):
         self.assertEqual(exit_code, 0)
 
         # confirm we're tracking 'beta'
-        channel = ''
-        for line in output.split('\n'):
-            if line.startswith('tracking:'):
-                channel = line.strip().split(' ')[-1]
+        output_yaml = safe_load(output)
+        channel = output_yaml['tracking']
         self.assertEqual(channel, 'beta')
 
-
     def test_nagios_servicegroup_change(self):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]