Merge ~jocave/plainbox-provider-resource:new-assertions-output into plainbox-provider-resource:master

[Jonathan Cave]

Depends on https://code.launchpad.net/~jocave/checkbox-support/+git/checkbox-support/+merge/391270

Use the new functions in checkbox-support to output assertion information in the corresponding resource jobs. Now produces valid output on UC20.

[Sheila Miguez (codersquid)]

I have a question about the cases where there are zero assertions.

[Jonathan Cave (jocave)]

> I have a question about the cases where there are zero assertions.

I deleted it because I thought I initially put it there because checkbox used to have a bug with resources that did not produce any resource units (i.e. the job outputted nothing). That bug was fixed.

Now I think about it I wonder if I was actually trying to prevent warnings being outputted on systems that had yet to receive an assertion for some reason. Tbh I can't remember what the scenario was.

[Sheila Miguez (codersquid)]

If it's okay not to print anything when there are no assertions then this lgtm. Maybe check with the others to see if they know about that before marking this as really approved.

review: Approve

[Sylvain Pineau (sylvain-pineau)]

@Sheila. Good question. Actually it's not needed anymore. Checkbox can now process empty resources w/o crashing. Needless to output dummy stuff.

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[bionic] [17:16:03] starting container
[xenial] [17:16:04] starting container
[focal] [17:16:05] starting container
Device project added to bionic-testing
Device project added to xenial-testing
Device project added to focal-testing
[xenial] [17:16:16] provisioning container
[bionic] [17:16:22] provisioning container
[focal] [17:16:23] provisioning container
[xenial] [17:16:34] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-resource-generic
[bionic] [17:16:45] Starting tests...
[bionic] Found a test script: ./requirements/container-tests-provider-resource-generic
[focal] [17:16:58] Starting tests...
[focal] Found a test script: ./requirements/container-tests-provider-resource-generic
[focal] [17:18:04] container-tests-provider-resource-generic: FAIL
[focal] output: https://paste.ubuntu.com/p/gGvFCnRBpD/
[focal] [17:18:08] Fixing file permissions in source directory
[focal] [17:18:08] Destroying container
[bionic] [17:18:17] container-tests-provider-resource-generic: FAIL
[bionic] output: https://paste.ubuntu.com/p/PSW3R6YTcr/
[bionic] [17:18:19] Fixing file permissions in source directory
[bionic] [17:18:19] Destroying container
[xenial] [17:18:20] container-tests-provider-resource-generic: FAIL
[xenial] output: https://paste.ubuntu.com/p/G9gmgbnRmW/
[xenial] [17:18:23] Fixing file permissions in source directory
[xenial] [17:18:23] Destroying container

review: Needs Fixing

diff --git a/bin/snapd_resource.py b/bin/snapd_resource.py
index 5ce87c1..fa3ef46 100755
--- a/bin/snapd_resource.py
+++ b/bin/snapd_resource.py
@@ -6,11 +6,13 @@
 #    Authors: Jonathan Cave <[e-mail]>
 
 import argparse
-import io
 import os
 import string
 import sys
 
+from checkbox_support.snap_utils.asserts import decode
+from checkbox_support.snap_utils.asserts import model_to_resource
+from checkbox_support.snap_utils.asserts import serial_to_resource
 from checkbox_support.snap_utils.snapd import Snapd
 from checkbox_support.snap_utils.system import get_kernel_snap
 
@@ -24,53 +26,25 @@ def slugify(_string):
     return ''.join(c if c in valid_chars else '_' for c in _string)
 
 
-def http_to_resource(assertion_stream):
-    """ Super naive Assertion parser
-
-    No attempt to handle assertions with a body. Discards signatures based
-    on lack of colon characters. Update: need to be less naive about
-    gadget and kernel names on UC18
-    """
-    count = int(assertion_stream.headers['X-Ubuntu-Assertions-Count'])
-    if count > 0:
-        for line in io.StringIO(assertion_stream.text):
-            if line.strip() == "":
-                print()
-            if line.count(':') == 1:
-                key, val = [x.strip() for x in line.split(':')]
-                if key in ('gadget', 'kernel'):
-                    if '=' in val:
-                        snap, track = [x.strip() for x in val.split('=')]
-                        print('{}: {}'.format(key, snap))
-                        print('{}_track: {}'.format(key, track))
-                        continue
-                print(line.strip())
-    return count
-
-
 class ModelAssertion():
 
     def invoked(self):
-        count = http_to_resource(Snapd().get_assertions('model'))
-        if count == 0:
-            # Print a dummy assertion - not nice but really trick to use
-            # plainbox resources without some defualt value
-            print('type: model')
-            print('authority-id: None')
-            print('model: None')
+        models = decode(Snapd().get_assertions('model'))
+        for m in models:
+            r = model_to_resource(m)
+            for key, val in r.items():
+                print('{}: {}'.format(key, val))
             print()
 
 
 class SerialAssertion():
 
     def invoked(self):
-        count = http_to_resource(Snapd().get_assertions('serial'))
-        if count == 0:
-            # Print a dummy assertion - not nice but really trick to use
-            # plainbox resources without some defualt value
-            print('type: serial')
-            print('authority-id: None')
-            print('serial: None')
+        serials = decode(Snapd().get_assertions('serial'))
+        for s in serials:
+            r = serial_to_resource(s)
+            for key, val in r.items():
+                print('{}: {}'.format(key, val))
             print()