Merge ~nteodosio/update-manager:no-ua-shell into update-manager:main

[Nathan Teodosio]

Drop call to ua security-status --format=json. Use uaclient.api.u.pro.packages.updates.v1.updates instead.

[Grant Orndorff (orndorffgrant)]

Some small questions and comments but generally looks good!

[Nathan Teodosio (nteodosio)]

Thanks for the review, Grant, I responded to your comments.

[Sebastien Bacher (seb128)]

Seems fine from my perspective, I think Grant's comment also got addressed so we should be good to go ... Grant can you confirm it's now fine for you?

review: Approve

[Nathan Teodosio (nteodosio)]

By the way, I submited this to build in a PPA for subsequent autopkgtesting, as I'm no match for the linters.

[Nathan Teodosio (nteodosio)]

Autopkgtests ran successfully.

[Grant Orndorff (orndorffgrant)]

LGTM Thanks!

review: Approve

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 2e6aed4..efe654e 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -25,6 +25,7 @@ from gi.repository import Gdk, GdkX11
 from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import GObject
+import uaclient.api.u.pro.packages.updates.v1 as ua
 
 GdkX11  # pyflakes
 
@@ -36,10 +37,10 @@ warnings.filterwarnings(
 
 import distro_info
 import fnmatch
-import json
 import os
 import subprocess
 import sys
+import threading
 import time
 from gettext import gettext as _
 
@@ -276,36 +277,37 @@ class UpdateManager(Gtk.Window):
             if fnmatch.fnmatch(pkg.name, "oem-*-meta") and pkg.installed:
                 self.oem_metapackages.add(pkg)
 
+    def _fetch_ua_updates(self):
+        self.ua_updates = ua.updates().updates
+
     def _get_ua_security_status(self):
         self.ua_security_packages = []
-        try:
-            p = subprocess.Popen(['pro', 'security-status', '--format=json'],
-                                 stdout=subprocess.PIPE)
-        except OSError:
-            pass
-        else:
-            while p.poll() is None:
-                while Gtk.events_pending():
-                    Gtk.main_iteration()
-                time.sleep(0.05)
-            s = json.load(p.stdout)
-            for package in s.get('packages', []):
-                if package.get('service_name', '') == 'standard-security':
-                    continue
-                status = package.get('status', '')
-                if (
-                    status == 'pending_attach'
-                    or status == 'pending_enable'
-                    or status == 'upgrade_available'
-                ):
-                    name = package.get('package', '')
-                    version = package.get('version', '')
-                    size = package.get('download_size', 0)
-                    downloadable = status == 'upgrade_available'
-                    self.ua_security_packages.append(
-                        (name, version, size, downloadable)
-                    )
-            self.cache.create_pro_cache(self.ua_security_packages)
+        t = threading.Thread(target=self._fetch_ua_updates, daemon=True)
+        t.start()
+        while t.is_alive():
+            while Gtk.events_pending():
+                Gtk.main_iteration()
+            time.sleep(0.05)
+        for package in self.ua_updates:
+            if (
+                package.provided_by == 'standard-security'
+                or package.provided_by == 'standard-updates'
+            ):
+                continue
+            status = package.status
+            if (
+                status == 'pending_attach'
+                or status == 'pending_enable'
+                or status == 'upgrade_available'
+            ):
+                name = package.package
+                version = package.version
+                size = package.download_size
+                downloadable = status == 'upgrade_available'
+                self.ua_security_packages.append(
+                    (name, version, size, downloadable)
+                )
+        self.cache.create_pro_cache(self.ua_security_packages)
 
     def _make_available_pane(
         self,