Merge ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-29.3-mantic into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Lucas Albuquerque Medeiros de Moura]

Release 29.3 of Ubuntu Pro client addressing a bug on importing an API endpoint

[Sergio Durigan Junior (sergiodj)]

Thanks, Lucas.

I see that the builds have passed. The changes are simple, so +1 from me.

Uploaded:

$ dput ubuntu-advantage-tools_29.3_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/ubuntu-advantage-tools/ubuntu-advantage-tools_29.3_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/ubuntu-advantage-tools/ubuntu-advantage-tools_29.3.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_29.3.dsc: done.
  Uploading ubuntu-advantage-tools_29.3.tar.xz: done.
  Uploading ubuntu-advantage-tools_29.3_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_29.3_source.changes: done.
Successfully uploaded packages.

review: Approve

[Sergio Durigan Junior (sergiodj)]

Also uploaded to X/B/F/J/L.

diff --git a/debian/changelog b/debian/changelog
index 1378858..308c1d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-advantage-tools (29.3) mantic; urgency=medium
+
+  * api: fix circular import that prevents enabled_services
+    endpoint from being imported
+
+ -- Lucas Moura <[e-mail]>  Fri, 25 Aug 2023 14:26:37 -0300
+
 ubuntu-advantage-tools (29.2) mantic; urgency=medium
 
   * d/ubuntu-advantage-tools.postinst:
diff --git a/features/api.feature b/features/api.feature
index f7ce206..31a8691 100644
--- a/features/api.feature
+++ b/features/api.feature
@@ -1,6 +1,39 @@
 Feature: Client behaviour for the API endpoints
 
     @series.all
+    @uses.config.machine_type.any
+    @uses.config.machine_type.lxd-container
+    Scenario Outline: all API endpoints can be imported individually
+    Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
+    When I run `python3 -c "from uaclient.api.u.pro.attach.auto.configure_retry_service.v1 import configure_retry_service"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.attach.auto.full_auto_attach.v1 import full_auto_attach"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.attach.auto.should_auto_attach.v1 import should_auto_attach"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.attach.magic.initiate.v1 import initiate"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.attach.magic.revoke.v1 import revoke"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.attach.magic.wait.v1 import wait"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.packages.summary.v1 import summary"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.packages.updates.v1 import updates"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.security.fix.cve.plan.v1 import plan"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.security.fix.usn.plan.v1 import plan"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.security.status.livepatch_cves.v1 import livepatch_cves"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.security.status.reboot_required.v1 import reboot_required"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.status.enabled_services.v1 import enabled_services"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.status.is_attached.v1 import is_attached"` as non-root
+    When I run `python3 -c "from uaclient.api.u.pro.version.v1 import version"` as non-root
+    When I run `python3 -c "from uaclient.api.u.security.package_manifest.v1 import package_manifest"` as non-root
+    When I run `python3 -c "from uaclient.api.u.unattended_upgrades.status.v1 import status"` as non-root
+    When I run `python3 -c "from uaclient.api.u.apt_news.current_news.v1 import current_news"` as non-root
+
+    Examples: ubuntu release
+        | release | machine_type  |
+        | xenial  | lxd-container |
+        | bionic  | lxd-container |
+        | focal   | lxd-container |
+        | jammy   | lxd-container |
+        | lunar   | lxd-container |
+        | mantic  | lxd-container |
+
+    @series.all
     @uses.config.machine_type.lxd-container
     Scenario Outline: API invalid endpoint or args
     Given a `<release>` machine with ubuntu-advantage-tools installed
diff --git a/uaclient/api/u/pro/status/enabled_services/v1.py b/uaclient/api/u/pro/status/enabled_services/v1.py
index 3e2e398..440c1f2 100644
--- a/uaclient/api/u/pro/status/enabled_services/v1.py
+++ b/uaclient/api/u/pro/status/enabled_services/v1.py
@@ -11,7 +11,6 @@ from uaclient.data_types import (
     StringDataValue,
     data_list,
 )
-from uaclient.entitlements.entitlement_status import UserFacingStatus
 
 
 class EnabledService(DataObject):
@@ -48,6 +47,7 @@ def enabled_services() -> EnabledServicesResult:
 
 def _enabled_services(cfg: UAConfig) -> EnabledServicesResult:
     from uaclient.entitlements import ENTITLEMENT_CLASSES
+    from uaclient.entitlements.entitlement_status import UserFacingStatus
 
     if not _is_attached(cfg).is_attached:
         return EnabledServicesResult(enabled_services=[])
diff --git a/uaclient/version.py b/uaclient/version.py
index 5191f37..4d61635 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__ = "29.2"
+__VERSION__ = "29.3"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
 
 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"