From fca57468369d0faa24e449b8ee3377073fa13ab7 Mon Sep 17 00:00:00 2001
From: Alessandro Astone <alessandro.astone@canonical.com>
Date: Wed, 31 Jul 2024 15:55:43 +0200
Subject: [PATCH] api: Do not report unattended-upgrade disabled if any config
 is false

There are many configs in the 'Unattended-Upgrade::' prefix which can
be disabled while still keeping the main functionality enabled.
For example:
 - Unattended-Upgrade::OnlyOnACPower "0"
     Allows upgrades even on battery power
 - Unattended-Upgrade::Skip-Updates-On-Metered-Connections "0"
     Allows upgrades even on metered connections
and many more.

You may `grep Unattended-Upgrade:: /usr/bin/unattended-upgrade` for
a list of keys that may make sense to disable while keeping
unattended-upgrades enabled.
---
 ...est_api_u_unattended_upgrades_status_v1.py | 50 +++++++++++++++++--
 .../api/u/unattended_upgrades/status/v1.py    |  3 +-
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/uaclient/api/tests/test_api_u_unattended_upgrades_status_v1.py b/uaclient/api/tests/test_api_u_unattended_upgrades_status_v1.py
index 38dbddcf45..d1c60bf725 100644
--- a/uaclient/api/tests/test_api_u_unattended_upgrades_status_v1.py
+++ b/uaclient/api/tests/test_api_u_unattended_upgrades_status_v1.py
@@ -45,23 +45,63 @@ class TestIsUnattendedUpgradesRunning:
             (False, {}, False, UNATTENDED_UPGRADES_SYSTEMD_JOB_DISABLED),
             (
                 True,
-                {"test": []},
+                {
+                    "APT::Periodic::Enable": "1",
+                    "APT::Periodic::Update-Package-Lists": "1",
+                    "APT::Periodic::Unattended-Upgrade": "1",
+                    "Unattended-Upgrade::Allowed-Origins": [],
+                },
                 False,
                 UNATTENDED_UPGRADES_CFG_LIST_VALUE_EMPTY.format(
-                    cfg_name="test"
+                    cfg_name="Unattended-Upgrade::Allowed-Origins"
                 ),
             ),
             (
                 True,
-                {"test": ["foo"], "test2": "0"},
+                {
+                    "APT::Periodic::Enable": "0",
+                    "APT::Periodic::Update-Package-Lists": "0",
+                    "APT::Periodic::Unattended-Upgrade": "0",
+                    "Unattended-Upgrade::Allowed-Origins": ["foo"],
+                },
                 False,
                 UNATTENDED_UPGRADES_CFG_VALUE_TURNED_OFF.format(
-                    cfg_name="test2"
+                    cfg_name="APT::Periodic::Enable"
                 ),
             ),
             (
                 True,
-                {"test": ["foo"], "test2": "1"},
+                {
+                    "APT::Periodic::Enable": "1",
+                    "APT::Periodic::Update-Package-Lists": "0",
+                    "APT::Periodic::Unattended-Upgrade": "1",
+                    "Unattended-Upgrade::Allowed-Origins": ["foo"],
+                },
+                False,
+                UNATTENDED_UPGRADES_CFG_VALUE_TURNED_OFF.format(
+                    cfg_name="APT::Periodic::Update-Package-Lists"
+                ),
+            ),
+            (
+                True,
+                {
+                    "APT::Periodic::Enable": "1",
+                    "APT::Periodic::Update-Package-Lists": "1",
+                    "APT::Periodic::Unattended-Upgrade": "1",
+                    "Unattended-Upgrade::Allowed-Origins": ["foo"],
+                },
+                True,
+                None,
+            ),
+            (
+                True,
+                {
+                    "APT::Periodic::Enable": "1",
+                    "APT::Periodic::Update-Package-Lists": "1",
+                    "APT::Periodic::Unattended-Upgrade": "1",
+                    "Unattended-Upgrade::Allowed-Origins": ["foo"],
+                    "Unattended-Upgrade::OnlyOnACPower": "0",
+                },
                 True,
                 None,
             ),
diff --git a/uaclient/api/u/unattended_upgrades/status/v1.py b/uaclient/api/u/unattended_upgrades/status/v1.py
index 6094d6ae37..17073e5247 100644
--- a/uaclient/api/u/unattended_upgrades/status/v1.py
+++ b/uaclient/api/u/unattended_upgrades/status/v1.py
@@ -160,7 +160,8 @@ def _is_unattended_upgrades_running(
     if not systemd_apt_timer_enabled:
         return (False, messages.UNATTENDED_UPGRADES_SYSTEMD_JOB_DISABLED)
 
-    for key, value in unattended_upgrades_cfg.items():
+    for key in UNATTENDED_UPGRADES_CONFIG_KEYS:
+        value = unattended_upgrades_cfg.get(key)
         if not value:
             return (
                 False,