Merge ~renanrodrigo/ubuntu/+source/ubuntu-advantage-tools:upload-27.14.1-lunar into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Renan Rodrigo]

This is the 27.14.1 release of ubuntu-advantage-tools.
It brings a bugfix to an apt config leak.

See the CHANGELOG and related bug for more information.

[Renan Rodrigo (renanrodrigo)]

Test links:

Xenial:
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.1~16.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.1~16.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.1~16.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + i386: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=i386&trigger=ubuntu-advantage-tools%2F27.14.1~16.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.1~16.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.1~16.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging

Bionic:
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.1~18.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.1~18.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.1~18.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + i386: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=i386&trigger=ubuntu-advantage-tools%2F27.14.1~18.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools%2F27.14.1~18.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F27.14.1~18.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging

Focal:
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F27.14.1~20.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F27.14.1~20.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F27.14.1~20.04.1~rc1%2Bnoflake8&ppa=ua-client%2Fstaging
    + ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=focal&package=ubuntu-advantage-tools&arch=ppc64el&trigger=ubuntu-advantage-tools...

[Athos Ribeiro (athos-ribeiro)]

LGTM! I will sponsor this as soon as we get the test results

review: Approve

[Renan Rodrigo (renanrodrigo)]

- ubuntu-advantage-tools/27.14.1~16.04.1~rc1+noflake8
    + ✅ ubuntu-advantage-tools on xenial for amd64 @ 23.03.23 20:10:57 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on xenial for arm64 @ 23.03.23 19:55:17 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on xenial for armhf @ 23.03.23 19:52:44 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on xenial for i386 @ 23.03.23 20:01:03 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on xenial for ppc64el @ 23.03.23 19:54:49 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on xenial for s390x @ 23.03.23 19:54:21 Log️ 🗒️

- ubuntu-advantage-tools/27.14.1~18.04.1~rc1+noflake8
    + ✅ ubuntu-advantage-tools on bionic for amd64 @ 23.03.23 20:15:53 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on bionic for arm64 @ 23.03.23 19:56:43 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on bionic for armhf @ 23.03.23 19:53:11 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on bionic for i386 @ 23.03.23 20:28:27 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on bionic for ppc64el @ 23.03.23 19:54:25 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on bionic for s390x @ 23.03.23 19:51:42 Log️ 🗒️

The remaining releases are still running

[Renan Rodrigo (renanrodrigo)]

- ubuntu-advantage-tools/27.14.1~20.04.1~rc1+noflake8
    + ✅ ubuntu-advantage-tools on focal for amd64 @ 23.03.23 22:13:00 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on focal for arm64 @ 23.03.23 19:57:34 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on focal for armhf @ 23.03.23 19:53:26 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on focal for ppc64el @ 23.03.23 19:54:23 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on focal for s390x @ 23.03.23 19:54:21 Log️ 🗒️

- ubuntu-advantage-tools/27.14.1~22.04.1~rc1+noflake8
    + ✅ ubuntu-advantage-tools on jammy for amd64 @ 23.03.23 20:16:49 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on jammy for arm64 @ 23.03.23 20:00:05 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on jammy for armhf @ 23.03.23 19:54:25 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on jammy for ppc64el @ 23.03.23 19:54:02 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on jammy for s390x @ 23.03.23 19:52:38 Log️ 🗒️

- ubuntu-advantage-tools/27.14.1~22.10.1~rc1+noflake8
    + ✅ ubuntu-advantage-tools on kinetic for amd64 @ 23.03.23 20:18:00 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on kinetic for arm64 @ 23.03.23 19:55:36 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on kinetic for armhf @ 23.03.23 19:54:42 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on kinetic for ppc64el @ 23.03.23 19:53:38 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on kinetic for s390x @ 23.03.23 19:52:41 Log️ 🗒️

- ubuntu-advantage-tools/27.14.1~23.04.1~rc1+noflake8
    + ✅ ubuntu-advantage-tools on lunar for amd64 @ 23.03.23 21:21:58 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on lunar for arm64 @ 23.03.23 20:10:11 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on lunar for armhf @ 23.03.23 19:54:17 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on lunar for ppc64el @ 23.03.23 19:53:46 Log️ 🗒️
    + ✅ ubuntu-advantage-tools on lunar for s390x @ 23.03.23 19:54:15 Log️ 🗒️

[Athos Ribeiro (athos-ribeiro)]

Thank you, Renan! Uploaded.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.14.1~16.04.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.14.1~16.04.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.14.1~16.04.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.14.1~16.04.1_source.changes: done.
Successfully uploaded packages.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.14.1~18.04.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.14.1~18.04.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.14.1~18.04.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.14.1~18.04.1_source.changes: done.
Successfully uploaded packages.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.14.1~20.04.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.14.1~20.04.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.14.1~20.04.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.14.1~20.04.1_source.changes: done.
Successfully uploaded packages.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.14.1~22.04.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.14.1~22.04.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.14.1~22.04.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.14.1~22.04.1_source.changes: done.
Successfully uploaded packages.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.14.1~22.10.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.14.1~22.10.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.14.1~22.10.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.14.1~22.10.1_source.changes: done.
Successfully uploaded packages.

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_27.14.1~23.04.1.dsc: done.
  Uploading ubuntu-advantage-tools_27.14.1~23.04.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_27.14.1~23.04.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_27.14.1~23.04.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 29fcf04..0e09663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-advantage-tools (27.14.1~23.04.1) lunar; urgency=medium
+
+  * New upstream release 27.14.1
+    - apt: fix a configuration leak in the apt.get_pkg_candidate_version
+      function (LP: #2012642)
+
+ -- Renan Rodrigo <[e-mail]>  Thu, 23 Mar 2023 13:41:05 -0300
+
 ubuntu-advantage-tools (27.14~23.04.1) lunar; urgency=medium
 
   * d/ubuntu-advantage-tools.{postinst,postrm,preinst}:
diff --git a/uaclient/apt.py b/uaclient/apt.py
index 1589931..a3b98d9 100644
--- a/uaclient/apt.py
+++ b/uaclient/apt.py
@@ -265,38 +265,37 @@ def get_esm_cache():
 
 
 def get_pkg_candidate_version(pkg: str) -> Optional[str]:
-    cache = get_apt_cache()
-
-    try:
-        package = cache[pkg]
-    except Exception:
-        return None
+    with PreserveAptCfg(get_apt_cache) as cache:
+        try:
+            package = cache[pkg]
+        except Exception:
+            return None
 
-    if not package.candidate:
-        return None
+        if not package.candidate:
+            return None
 
-    pkg_candidate = getattr(package.candidate, "version")
+        pkg_candidate = getattr(package.candidate, "version")
 
     if not pkg_candidate:
         return None
 
-    esm_cache = get_esm_cache()
-    if esm_cache:
-        try:
-            esm_package = esm_cache[pkg]
-        except Exception:
-            return pkg_candidate
+    with PreserveAptCfg(get_esm_cache) as esm_cache:
+        if esm_cache:
+            try:
+                esm_package = esm_cache[pkg]
+            except Exception:
+                return pkg_candidate
 
-        if not esm_package.candidate:
-            return pkg_candidate
+            if not esm_package.candidate:
+                return pkg_candidate
 
-        esm_pkg_candidate = getattr(esm_package.candidate, "version")
+            esm_pkg_candidate = getattr(esm_package.candidate, "version")
 
-        if not esm_pkg_candidate:
-            return pkg_candidate
+            if not esm_pkg_candidate:
+                return pkg_candidate
 
-        if compare_versions(esm_pkg_candidate, pkg_candidate, "ge"):
-            return esm_pkg_candidate
+            if compare_versions(esm_pkg_candidate, pkg_candidate, "ge"):
+                return esm_pkg_candidate
 
     return pkg_candidate
 
diff --git a/uaclient/security_status.py b/uaclient/security_status.py
index 800b00c..aefe431 100644
--- a/uaclient/security_status.py
+++ b/uaclient/security_status.py
@@ -138,8 +138,6 @@ def filter_security_updates(
     # sources live in a private folder, we need a different apt cache
     # to access them.
     with PreserveAptCfg(get_esm_cache) as esm_cache:
-        esm_cache = get_esm_cache()
-
         for package in packages:
             if package.is_installed:
                 for version in package.versions:
diff --git a/uaclient/version.py b/uaclient/version.py
index 8018154..1a95545 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.14"
+__VERSION__ = "27.14.1"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
 
 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"