Merge lp:~renanrodrigo/update-manager/ss into lp:update-manager

[Renan Rodrigo]

ubuntu-security-status: Don't show ESM Apps information when the service is disabled, and prefer 'pro security-status' when it is available.

Due to changes in the Pro launch strategy, the tooling should not advertise ESM-Apps even when it goes out of beta. If ubuntu-advantage-tools has made 'pro' available to the system, delegate the 'ubuntu-security-status' call to 'pro security-status' to make sure it reflects the Pro Client output.

[lp:~renanrodrigo/update-manager/ss]

2951. By Renan Rodrigo on 2022-09-29

Prefer redirecting ubuntu-security-status to pro security-status if it exists

[Renan Rodrigo (renanrodrigo)]

Thanks Lucas for the review, I updated the code to the safer version.

[Lucas Albuquerque Medeiros de Moura (lamoura)]

review: Approve

[Brian Murray (brian-murray)]

review: Approve

=== modified file 'ubuntu-security-status'
--- ubuntu-security-status	2022-01-18 16:17:47 +0000
+++ ubuntu-security-status	2022-09-29 02:29:13 +0000
@@ -7,13 +7,13 @@
 import os
 import sys
 import gettext
+import shutil
 import subprocess
 
 from UpdateManager.Core.utils import get_dist
 
 from datetime import datetime
 from textwrap import wrap
-from uaclient.entitlements import ESMAppsEntitlement
 from urllib.error import URLError, HTTPError
 from urllib.request import urlopen
 
@@ -197,6 +197,12 @@
 
 
 if __name__ == "__main__":
+    # Prefer redirecting to 'pro security-status' if it exists
+    if shutil.which("/usr/bin/pro"):
+        print("This command has been replaced with 'pro security-status'.")
+        subprocess.run(["/usr/bin/pro", "security-status"])
+        sys.exit(0)
+
     # gettext
     APP = "update-manager"
     DIR = "/usr/share/locale"
@@ -508,15 +514,11 @@
               ("{:>{width}}".format(len(pkgstats.pkgs_mr),
                                     width=width),
                receive_text, eol_esm.month, eol_esm.year))
-    if lts and pkgstats.pkgs_um and (
-        is_ua_service_enabled("esm-apps") or not ESMAppsEntitlement.is_beta
-    ):
-        receive_text = "could receive"
-        if esm_apps_enabled:
-            if len(pkgstats.pkgs_um) == 1:
-                receive_text = "is receiving"
-            else:
-                receive_text = "are receiving"
+    if lts and pkgstats.pkgs_um and is_ua_service_enabled("esm-apps"):
+        if len(pkgstats.pkgs_um) == 1:
+            receive_text = "is receiving"
+        else:
+            receive_text = "are receiving"
         print("%s %s security updates with ESM Apps "
               "until %d/%d" %
               ("{:>{width}}".format(len(pkgstats.pkgs_um),
@@ -571,32 +573,7 @@
             print_wrapped(msg)
             if ua_attached:
                 print("\nEnable ESM Infra with: ua enable esm-infra")
-    if lts and pkgstats.pkgs_um:
-        if (
-            not esm_apps_enabled and
-            not ESMAppsEntitlement.is_beta
-        ):
-            pkgs_updated_in_esma = pkgstats.pkgs_updated_in_esma
-            print("")
-            msg = gettext.dngettext(
-                "update-manager",
-                "Enable Extended Security "
-                "Maintenance (ESM Apps) to "
-                "get %i security update (so far) ",
-                "Enable Extended Security "
-                "Maintenance (ESM Apps) to "
-                "get %i security updates (so far) ",
-                len(pkgs_updated_in_esma)) % len(pkgs_updated_in_esma)
-            msg += gettext.dngettext(
-                "update-manager",
-                "and enable coverage of %i "
-                "package.",
-                "and enable coverage of %i "
-                "packages.",
-                len(pkgstats.pkgs_um)) % len(pkgstats.pkgs_um)
-            print_wrapped(msg)
-            if ua_attached:
-                print("\nEnable ESM Apps with: ua enable esm-apps")
+
     if lts and not ua_attached:
         print("\nThis machine is not attached to an Ubuntu Advantage "
               "subscription.\nSee https://ubuntu.com/advantage")