Merge branch 'main' into czoido/multi-repo-bi

Author: czoido

extensions/commands/art/cmd_build_info.py

@@ -113,8 +113,9 @@ def _get_requested_by(nodes, node_id, artifact_type):
 
 class _BuildInfo:
 
-    def __init__(self, graph, name, number, repositories, build_url=None, with_dependencies=False,
+    def __init__(self, conan_api, graph, name, number, repositories, build_url=None, with_dependencies=False,
                  add_cached_deps=False, url=None, user=None, password=None):
+        self._conan_api = conan_api
         self._graph = graph
         self._name = name
         self._number = number
@@ -165,6 +166,12 @@ def _get_origin_repo(self, node):
             f"The package was not found in any of the specified repositories: {', '.join(self._repositories)}"
         )
 
+    def get_artifacts_folder(self, node, artifact_type):
+        if artifact_type == "package":
+            return node.get("package_folder")
+        else:
+            reference = RecipeReference.loads(node.get("ref"))
+            return self._conan_api.cache.export_path(reference)
 
     def get_artifacts(self, node, artifact_type, is_dependency=False):
         """
@@ -186,14 +193,14 @@ def get_artifacts(self, node, artifact_type, is_dependency=False):
         def _get_local_artifacts():
             local_artifacts = []
             missing_artifacts = []
-            artifacts_folder = node.get("package_folder") if artifact_type == "package" else node.get("recipe_folder")
+            artifacts_folder = self.get_artifacts_folder(node, artifact_type)
             if artifacts_folder is None and artifact_type == "package" and node.get("binary") == "Skip":
                 ConanOutput().warning(f"Package is marked as 'Skip' for {node.get('ref')} and will not be included "
                                       "into the Build Info. If you want to get it included, use the conf argument: "
                                       "'-c:a tools.graph:skip_binaries=False' in your conan create/install command.")
                 return (local_artifacts, missing_artifacts)
 
-            artifacts_folder = Path(node.get("package_folder")) if artifact_type == "package" else Path(node.get("recipe_folder"))
+            artifacts_folder = Path(artifacts_folder)
             dl_folder = artifacts_folder.parents[0] / "d"
             dl_folder_files = [file for file in dl_folder.glob("*") if file.name in artifacts_names]
             artifacts_folder_files = [file for file in artifacts_folder.glob("*") if file.name in artifacts_names]
@@ -279,7 +286,7 @@ def _get_remote_artifacts(artifact):
             if sources_artifact:
                 artifacts.append(sources_artifact)
 
-        folder = node.get("package_folder") if artifact_type == "package" else node.get("recipe_folder")
+        folder = self.get_artifacts_folder(node, artifact_type)
         if not artifacts and folder:
             raise ConanException(f"There are missing artifacts for the {node.get('ref')} {artifact_type}. "
                                   "Check that you have all the packages installed in the Conan cache when creating the Build Info.")
@@ -437,8 +444,7 @@ def build_info_create(conan_api: ConanAPI, parser, subparser, *args):
         data["graph"]["nodes"].pop("0")
 
 
-    bi = _BuildInfo(data, args.build_name, args.build_number,
-                    repositories=args.repository,
+    bi = _BuildInfo(conan_api, data, args.build_name, args.build_number, repositories=args.repository,
                     build_url=args.build_url,
                     with_dependencies=args.with_dependencies,
                     add_cached_deps=args.add_cached_deps, url=url, user=user, password=password)
@@ -629,7 +635,7 @@ def build_info_append(conan_api: ConanAPI, parser, subparser, *args):
             if not any(d['id'] == module.get('id') for d in all_modules):
                 all_modules.append(module)
 
-    bi = _BuildInfo(None, args.build_name, args.build_number, None)
+    bi = _BuildInfo(conan_api, None, args.build_name, args.build_number, None)
     bi_json = bi.header()
     bi_json.update({"modules": all_modules})
     return json.dumps(bi_json, indent=4)

tests/test_artifactory_commands.py

@@ -3,7 +3,7 @@
 import tempfile
 import textwrap
 
-from tools import run, save
+from tools import load, run, save
 from conan.tools.scm import Version
 from conan import conan_version
 
@@ -143,11 +143,30 @@ def test_build_info_export_pkg():
     run("conan upload mypkg/1.0 -c -r extensions-stg")
     run(f'conan art:build-info create export.json mybuildinfo 1 extensions-stg --server=artifactory --out-file=mybuildinfo.json')
 
-    with open(f"mybuildinfo.json", "r") as f:
-        data = json.load(f)
-
-    assert "modules" in data
-    assert any(module.get("type") == "conan" for module in data["modules"])
+    build_info = json.loads(load("mybuildinfo.json"))
+
+    mypkg_modules = [m for m in build_info["modules"] if "mypkg/1.0#294e801a0e1da10084441487e95b80e8" in m.get("id")]
+    assert len(mypkg_modules) == 2  # Assert both recipe and package modules exist
+    mypkg_recipe_module = next(m for m in mypkg_modules if m.get("id") == "mypkg/1.0#294e801a0e1da10084441487e95b80e8")
+    assert len(mypkg_recipe_module["artifacts"]) == 3  # Assert the 3 artifacts exist
+    mypkg_conanmanifest_data = next(
+        artifact for artifact in mypkg_recipe_module["artifacts"]
+        if artifact.get("name") == "conanmanifest.txt"
+    )  # Assert conanmanifest.txt path
+    assert mypkg_conanmanifest_data[
+               "path"] == "extensions-stg/_/mypkg/1.0/_/294e801a0e1da10084441487e95b80e8/export/conanmanifest.txt"
+    mypkg_sources_data = next(
+        artifact for artifact in mypkg_recipe_module["artifacts"]
+        if artifact.get("name") == "conan_sources.tgz"
+    )  # Assert conan_sources.tgz path
+    assert mypkg_sources_data[
+               "path"] == "extensions-stg/_/mypkg/1.0/_/294e801a0e1da10084441487e95b80e8/export/conan_sources.tgz"
+    mypkg_conanfile_data = next(
+        artifact for artifact in mypkg_recipe_module["artifacts"]
+        if artifact.get("name") == "conanfile.py"
+    )  # Assert conanfile.py path
+    assert mypkg_conanfile_data[
+               "path"] == "extensions-stg/_/mypkg/1.0/_/294e801a0e1da10084441487e95b80e8/export/conanfile.py"
 
 
 @pytest.mark.requires_credentials