Merge ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-27.13.1-lunar into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Lucas Albuquerque Medeiros de Moura]

Pro release for SRU:
https://bugs.launchpad.net/ubuntu/+source/ubuntu-advantage-tools/+bug/2003018

With a better isolated esm apt setup

[Paride Legovini (paride)]

LGTM and should address the issue Andreas raised in his comment to the SRU bug.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index bf2df4b..519bdf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-advantage-tools (27.13.1~23.04.1) lunar; urgency=medium
+
+  * apt: better isolate apt esm cache by only fetching necessary
+    configuration from the system apt
+
+ -- Lucas Moura <[e-mail]>  Mon, 23 Jan 2023 11:54:06 -0300
+
 ubuntu-advantage-tools (27.13~23.04.1) lunar; urgency=medium
 
   * d/bash-completion:
diff --git a/uaclient/apt.py b/uaclient/apt.py
index e98a637..15e9368 100644
--- a/uaclient/apt.py
+++ b/uaclient/apt.py
@@ -603,6 +603,7 @@ def update_esm_caches(cfg) -> None:
         return
 
     import apt  # type: ignore
+    import apt_pkg  # type: ignore
 
     from uaclient.entitlements.entitlement_status import ApplicationStatus
     from uaclient.entitlements.esm import (
@@ -623,5 +624,13 @@ def update_esm_caches(cfg) -> None:
             infra.setup_local_esm_repo()
 
     # Read the cache and update it
+    # Take care to initialize the cache with only the
+    # Acquire configuration preserved
+    for key in apt_pkg.config.keys():
+        if "Acquire" not in key:
+            apt_pkg.config.clear(key)
+    apt_pkg.config.set("Dir", ESM_APT_ROOTDIR)
+    apt_pkg.init_config()
+
     cache = apt.Cache(rootdir=ESM_APT_ROOTDIR)
     cache.update()
diff --git a/uaclient/tests/test_apt.py b/uaclient/tests/test_apt.py
index 9dc3829..087a3cf 100644
--- a/uaclient/tests/test_apt.py
+++ b/uaclient/tests/test_apt.py
@@ -1087,8 +1087,12 @@ class TestAptCacheTime:
     @mock.patch("uaclient.apt.system.is_current_series_lts")
     @mock.patch("uaclient.apt.system.is_current_series_active_esm")
     @mock.patch("apt.Cache")
+    @mock.patch("apt_pkg.config")
+    @mock.patch("apt_pkg.init_config")
     def test_update_esm_caches_based_on_lts(
         self,
+        _m_apt_pkg_init_config,
+        _m_apt_pkg_config,
         m_cache,
         m_is_esm,
         m_is_lts,
diff --git a/uaclient/version.py b/uaclient/version.py
index b87f757..6d14ab2 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__ = "27.13"
+__VERSION__ = "27.13.1"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
 
 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"