Merge ~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools:upload-28.1-mantic into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Grant Orndorff]

This is release 28.1 of ubuntu-advantage-tools.
This adds fixes for two bugs found during verification of 28, which is currently in -proposed.

SRU Bug: https://bugs.launchpad.net/ubuntu/+source/ubuntu-advantage-tools/+bug/2017949

[Robie Basak (racb)]

I don't see any SRU implications. Good job finding this before (SRU) release.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Grant! LGTM. As it was already approved by Robie, I just uploaded it to Mantic:

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_28.1.dsc: done.
  Uploading ubuntu-advantage-tools_28.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_28.1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6a53910..85d1272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ubuntu-advantage-tools (28.1) mantic; urgency=medium
+
+  * New upstream release 28.1 (LP: #2017949)
+    - fips: ensure shim-signed is updated to the version in the fips repo
+      if necessary
+    - status: fix bug where an existing status cache could influence the
+      simulated status output
+
+ -- Grant Orndorff <[e-mail]>  Mon, 26 Jun 2023 15:05:11 -0400
+
 ubuntu-advantage-tools (28) mantic; urgency=medium
 
   * d/ubuntu-advantage-tools.postinst:
diff --git a/uaclient/entitlements/fips.py b/uaclient/entitlements/fips.py
index 42f0431..21b3ea2 100644
--- a/uaclient/entitlements/fips.py
+++ b/uaclient/entitlements/fips.py
@@ -27,6 +27,7 @@ CONDITIONAL_PACKAGES_EVERYWHERE = [
     "strongswan-hmac",
     "openssh-client",
     "openssh-server",
+    "shim-signed",
 ]
 CONDITIONAL_PACKAGES_OPENSSH_HMAC = [
     "openssh-client-hmac",
@@ -112,6 +113,7 @@ class FIPSCommonEntitlement(repo.RepoEntitlement):
         "libgcrypt20",
         "libgcrypt20-hmac",
         "fips-initramfs-generic",
+        "shim-signed",
     ]
 
     @property
diff --git a/uaclient/status.py b/uaclient/status.py
index aecd69f..1f0b362 100644
--- a/uaclient/status.py
+++ b/uaclient/status.py
@@ -507,20 +507,14 @@ def simulate_status(
             event.info("This token is not valid.\n" + message.msg + "\n")
             ret = 1
 
-    status_cache = cfg.read_cache("status-cache")
-    if status_cache:
-        resources = status_cache.get("services")
-    else:
-        resources = get_available_resources(cfg)
-
-    entitlements = contract_info.get("resourceEntitlements", [])
-
+    resources = get_available_resources(cfg)
     inapplicable_resources = [
         resource["name"]
         for resource in sorted(resources, key=lambda x: x["name"])
         if not resource["available"]
     ]
 
+    entitlements = contract_info.get("resourceEntitlements", [])
     for resource in resources:
         entitlement_name = resource.get("name", "")
         try:
diff --git a/uaclient/version.py b/uaclient/version.py
index 75e0f2c..ff640c2 100644
--- a/uaclient/version.py
+++ b/uaclient/version.py
@@ -15,7 +15,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH
 from uaclient.exceptions import ProcessExecutionError
 from uaclient.system import subp
 
-__VERSION__ = "28"
+__VERSION__ = "28.1"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
 
 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"