cli: Reduce 'info' components API calls

crobinso · crobinso · commit 63ac060eec1f · 2020-01-08T17:50:53.000-05:00
We weren't being entirely optimal with our calls here. Rework
things slightly to minimize the possible number of calls.

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -609,18 +609,18 @@ def _filter_components(compdetails):
         return ret
 
     productname = (opt.components or opt.component_owners or opt.versions)
-    include_fields = ["name", "id"]
     fastcomponents = (opt.components and not opt.active_components)
+
+    include_fields = ["name", "id"]
+    if opt.components or opt.component_owners:
+        include_fields += ["components.name"]
+        if opt.component_owners:
+            include_fields += ["components.default_assigned_to"]
+        if opt.active_components:
+            include_fields += ["components.is_active"]
+
     if opt.versions:
         include_fields += ["versions"]
-    if opt.component_owners:
-        include_fields += [
-            "components.default_assigned_to",
-            "components.name",
-        ]
-    if (opt.active_components and
-        any(["components" in i for i in include_fields])):
-        include_fields += ["components.is_active"]
 
     bz.refresh_products(names=productname and [productname] or None,
             include_fields=include_fields)
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -838,16 +838,15 @@ def getcomponents(self, product, force_refresh=False):
         proddict = self._lookup_product_in_cache(product)
         product_id = proddict.get("id", None)
 
-        if (force_refresh or
-            product_id is None or
-            product_id not in self._cache.component_names):
+        if force_refresh or product_id is None:
             self.refresh_products(names=[product],
                                   include_fields=["name", "id"])
             proddict = self._lookup_product_in_cache(product)
             if "id" not in proddict:
                 raise BugzillaError("Product '%s' not found" % product)
             product_id = proddict["id"]
 
+        if product_id not in self._cache.component_names:
             opts = {'product_id': product_id, 'field': 'component'}
             names = self._backend.bug_legal_values(opts)["values"]
             self._cache.component_names[product_id] = names
