merge params from keyword arg to avoid kwargs collisions

Author: qrkourier

netfoundry/ctl.py

@@ -540,7 +540,7 @@ def get(cli, echo: bool = True, spinner: object = None):
                         cli.log.warn(f"using 'id' only, ignoring params: '{', '.join(query_keys)}'")
                     match = network.get_resource_by_id(type=cli.args.resource_type, id=cli.args.query['id'], accept=cli.args.accept)
                 else:
-                    matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, **cli.args.query)
+                    matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, params=cli.args.query)
                     if len(matches) == 1:
                         match = matches[0]
 
@@ -669,7 +669,7 @@ def list(cli, spinner: object = None):
             if cli.args.resource_type == "data-centers":
                 matches = network.find_edge_router_data_centers(**cli.args.query)
             else:
-                matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, **cli.args.query)
+                matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, params=cli.args.query)
 
     if len(matches) == 0:
         spinner.fail(f"Found no {cli.args.resource_type} by '{', '.join(query_keys)}'")

netfoundry/network.py

@@ -383,7 +383,7 @@ def get_resource_by_id(self, type: str, id: str, accept: str = None):
         return(resource)
     get_resource = get_resource_by_id
 
-    def find_resources(self, type: str, accept: str = None, deleted: bool = False, **kwargs):
+    def find_resources(self, type: str, accept: str = None, deleted: bool = False, params: dict = dict(), **kwargs):
         """Find resources by type.
 
         :param str type: plural of an entity type in the network domain e.g. networks, endpoints, services, posture-checks, etc...
@@ -399,7 +399,6 @@ def find_resources(self, type: str, accept: str = None, deleted: bool = False, *
         if type == "data-centers":
             self.logger.warn("don't call network.get_resources() for data centers, always use network.get_edge_router_data_centers() to filter for locations that support this network's version")
 
-        params = dict()
         for param in kwargs.keys():
             params[param] = kwargs[param]
         if not plural(type) == 'networks':

netfoundry/utility.py

@@ -484,9 +484,8 @@ def __post_init__(self):
 class ResourceType(ResourceTypeParent):
     """Typed resource type spec.
 
-    As close as I could get to a Go struct. This helps us to suggest possible
-    operations such as all resource types in the network domain that can be
-    mutated (C_UD).
+    This helps the CLI to suggest possible operations such as all resource
+    types in the network domain that can be mutated (C_UD).
     """
 
     name: str                                               # plural form as kebab-case e.g. edge-routers