Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add --all option to include all dependencies in Artifactory build info JSON #124

Closed
wants to merge 1 commit into from
Closed

Add --all option to include all dependencies in Artifactory build info JSON #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions extensions/commands/art/cmd_build_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from utils import NotFoundException, api_request, assert_server_or_url_user_password, load_json
from cmd_property import get_properties, set_properties
from cmd_server import get_url_user_password
from cmd_server import get_url_user_password, _get_server


def get_buildinfo(build_name, build_number, url, user, password, project=None):
Expand Down Expand Up @@ -110,7 +110,7 @@ def _get_requested_by(nodes, node_id, artifact_type):
class _BuildInfo:

def __init__(self, graph, name, number, repository, with_dependencies=False,
url=None, user=None, password=None):
include_all=False, url=None, user=None, password=None):
self._graph = graph
self._name = name
self._number = number
Expand All @@ -120,6 +120,7 @@ def __init__(self, graph, name, number, repository, with_dependencies=False,
self._password = password
self._cached_artifact_info = {}
self._with_dependencies = with_dependencies
self._include_all = include_all

def get_artifacts(self, node, artifact_type, is_dependency=False):
"""
Expand Down Expand Up @@ -242,8 +243,8 @@ def get_modules(self):
if ref:
transitive_dependencies = node.get("dependencies").keys() if node.get("dependencies").keys() else []

# only add the nodes that were marked as built
if node.get("binary") == "Build":
# only add the nodes that were marked as built, unless --all option was passed
if node.get("binary") == "Build" or self._include_all:

# recipe module
module = {
Expand All @@ -260,7 +261,6 @@ def get_modules(self):
all_dependencies.extend(deps_artifacts)

module.update({"dependencies": all_dependencies})

ret.append(module)

# package module
Expand All @@ -279,9 +279,7 @@ def get_modules(self):
all_dependencies.extend(deps_artifacts)

module.update({"dependencies": all_dependencies})

ret.append(module)

return ret

def header(self):
Expand Down Expand Up @@ -338,6 +336,7 @@ def _add_default_arguments(subparser, is_bi_create=False, is_bi_create_bundle=Fa
subparser.add_argument("--user", help="User name for the Artifactory server.")
subparser.add_argument("--password", help="Password for the Artifactory server.")
subparser.add_argument("--token", help="Token for the Artifactory server.")
subparser.add_argument("--all", action="store_true", default=False, help="Add all packages in conan generated JSON.")
return subparser


Expand Down Expand Up @@ -374,7 +373,7 @@ def build_info_create(conan_api: ConanAPI, parser, subparser, *args):
# remove the 'conanfile' node
data["graph"]["nodes"].pop("0")
bi = _BuildInfo(data, args.build_name, args.build_number, args.repository,
with_dependencies=args.with_dependencies, url=url, user=user, password=password)
with_dependencies=args.with_dependencies, include_all=args.all, url=url, user=user, password=password)

cli_out_write(bi.create())

Expand Down