Fix PARTIAL_UPDATE_ID workaround

Adding ID_PREFIX to the base context models broke the heuristics of the workaround in place for translating PARTIAL_UPDATE_ID into UPDATE_ID. fixes #529 (cherry picked from commit eabe014)
pulp · Jul 15, 2022 · 7a2028f · 7a2028f
1 parent 0ba4d11
commit 7a2028f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES/529.bugfix b/CHANGES/529.bugfix
@@ -0,0 +1 @@
+Fixed the heuristics for the `PARTIAL_UPDATE_ID` workaround.
diff --git a/pulpcore/cli/common/context.py b/pulpcore/cli/common/context.py
@@ -516,7 +516,7 @@ def update(
         non_blocking: bool = False,
     ) -> Any:
         # Workaround for plugins that do not have ID_PREFIX in place
-        if not hasattr(self, "ID_PREFIX") and not hasattr(self, "PARTIAL_UPDATE_ID"):
+        if hasattr(self, "UPDATE_ID") and not hasattr(self, "PARTIAL_UPDATE_ID"):
             self.PARTIAL_UPDATE_ID = getattr(self, "UPDATE_ID")
         # ----------------------------------------------------------
         _parameters = {self.HREF: href}

diff --git a/pulpcore/cli/common/openapi.py b/pulpcore/cli/common/openapi.py
@@ -38,7 +38,7 @@ def __init__(
     ):
         if not validate_certs:
             # types-urllib3 does not cover that function
-            urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)  # type:ignore
+            urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
         self.debug_callback: Callable[[int, str], Any] = debug_callback or (lambda i, x: None)
         self.base_url: str = base_url
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed the heuristics for the `PARTIAL_UPDATE_ID` workaround.