Rewrite pack resolver and ordering logic

Author: rvermeulen

codeql_bundle/cli.py

@@ -80,32 +80,32 @@ def main(
     try:
         bundle = CustomBundle(bundle_path, workspace)
         logger.info(f"Looking for CodeQL packs in workspace {workspace}")
-        packs_in_workspace = bundle.codeql.pack_ls(workspace)
+        packs_in_workspace = bundle.getCodeQLPacks()
         logger.info(
-            f"Found the CodeQL packs: {','.join(map(lambda p: p.name, packs_in_workspace))}"
+            f"Found the CodeQL packs: {','.join(map(lambda p: p.config.name, packs_in_workspace))}"
         )
 
         if len(packs) > 0:
             selected_packs = [
                 available_pack
                 for available_pack in packs_in_workspace
-                if available_pack.name in packs
+                if available_pack.config.name in packs
             ]
         else:
             selected_packs = packs_in_workspace
 
         logger.info(
-            f"Considering the following CodeQL packs for inclusion in the custom bundle: {','.join(map(lambda p: p.name, selected_packs))}"
+            f"Considering the following CodeQL packs for inclusion in the custom bundle: {','.join(map(lambda p: p.config.name, selected_packs))}"
         )
-        missing_packs = set(packs) - {pack.name for pack in selected_packs}
+        missing_packs = set(packs) - {pack.config.name for pack in selected_packs}
         if len(missing_packs) > 0:
             logger.fatal(
                 f"The provided CodeQL workspace doesn't contain the provided packs '{','.join(missing_packs)}'",
             )
             sys.exit(1)
 
         logger.info(
-            f"Adding the packs {','.join(map(lambda p: p.name, selected_packs))} to the custom bundle."
+            f"Adding the packs {','.join(map(lambda p: p.config.name, selected_packs))} and its workspace dependencies to the custom bundle."
         )
         bundle.add_packs(*selected_packs)
         logger.info(f"Bundling custom bundle at {output}")