Update imports on cve/usn endpoints

We want users to import all necessary data objects directly from the cve/usn endpoint. To achieve that, we are moving some imports directly into those modules
canonical · Oct 11, 2023 · f1ae776 · f1ae776
1 parent c3ae838
commit f1ae776
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/uaclient/api/u/pro/security/fix/cve/execute/v1.py b/uaclient/api/u/pro/security/fix/cve/execute/v1.py
@@ -6,8 +6,11 @@
     FixStatus,
     get_expected_overall_status,
 )
-from uaclient.api.u.pro.security.fix._common.execute.v1 import (
+from uaclient.api.u.pro.security.fix._common.execute.v1 import (  # noqa: F401
+    FailedUpgrade,
+    FixExecuteError,
     FixExecuteResult,
+    UpgradedPackage,
     _execute_fix,
 )
 from uaclient.api.u.pro.security.fix.cve.plan.v1 import (

diff --git a/uaclient/api/u/pro/security/fix/cve/plan/v1.py b/uaclient/api/u/pro/security/fix/cve/plan/v1.py
@@ -3,8 +3,17 @@
 from uaclient.api.api import APIEndpoint
 from uaclient.api.data_types import AdditionalInfo
 from uaclient.api.u.pro.security.fix._common import get_expected_overall_status
-from uaclient.api.u.pro.security.fix._common.plan.v1 import (
+from uaclient.api.u.pro.security.fix._common.plan.v1 import (  # noqa: F401
+    AptUpgradeData,
+    AttachData,
+    EnableData,
+    FixPlanError,
     FixPlanResult,
+    FixPlanStep,
+    FixPlanWarning,
+    NoOpData,
+    PackageCannotBeInstalledData,
+    SecurityIssueNotFixedData,
     fix_plan_cve,
 )
 from uaclient.config import UAConfig

diff --git a/uaclient/api/u/pro/security/fix/usn/execute/v1.py b/uaclient/api/u/pro/security/fix/usn/execute/v1.py
@@ -6,8 +6,11 @@
     FixStatus,
     get_expected_overall_status,
 )
-from uaclient.api.u.pro.security.fix._common.execute.v1 import (
+from uaclient.api.u.pro.security.fix._common.execute.v1 import (  # noqa: F401
+    FailedUpgrade,
+    FixExecuteError,
     FixExecuteResult,
+    UpgradedPackage,
     _execute_fix,
 )
 from uaclient.api.u.pro.security.fix.usn.plan.v1 import (

diff --git a/uaclient/api/u/pro/security/fix/usn/plan/v1.py b/uaclient/api/u/pro/security/fix/usn/plan/v1.py
@@ -3,8 +3,18 @@
 from uaclient.api.api import APIEndpoint
 from uaclient.api.data_types import AdditionalInfo
 from uaclient.api.u.pro.security.fix._common import get_expected_overall_status
-from uaclient.api.u.pro.security.fix._common.plan.v1 import (
+from uaclient.api.u.pro.security.fix._common.plan.v1 import (  # noqa: F401
+    AptUpgradeData,
+    AttachData,
+    EnableData,
+    FixPlanError,
+    FixPlanResult,
+    FixPlanStep,
     FixPlanUSNResult,
+    FixPlanWarning,
+    NoOpData,
+    PackageCannotBeInstalledData,
+    SecurityIssueNotFixedData,
     fix_plan_usn,
 )
 from uaclient.config import UAConfig