GRIF-209: refactor products-contains-component output and added --include-container-roots

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+* refactor output format of service products-contain-component (GRIF-209)
+* container roots are excluded by default (need to use --include-container-roots)
+* when using -r highlight matched term
+
+### Added
+* --include-container_roots in service products-contain-component
+* --exclude-unreleased in service products-contain-component
+
 ## [0.4.2] - 2024-01-14
 ### Added
 * GRIFFON_VERIFY_SSL environment variable

griffon/commands/queries.py

@@ -363,6 +363,20 @@ def retrieve_component_summary(ctx, component_name, strict_name_search, operatio
     help="Regex search.",
     mutually_exclusive_group=["strict_name_search"],
 )
+@click.option(
+    "--include-container-roots",
+    "include_container_roots",
+    is_flag=True,
+    default=get_config_option("default", "include_container_roots", False),
+    help="Include OCI root components in output.",
+)
+@click.option(
+    "--exclude-unreleased",
+    "exclude_unreleased",
+    is_flag=True,
+    default=get_config_option("default", "exclude_unreleased", False),
+    help="Exclude unreleased components.",
+)
 @click.pass_context
 @progress_bar(is_updatable=True)
 def get_product_contain_component(
@@ -395,12 +409,15 @@ def get_product_contain_component(
     verbose,
     operation_status,
     regex_name_search,
+    include_container_roots,
+    exclude_unreleased,
 ):
     # with console_status(ctx) as operation_status:
     """List products of a latest component."""
     if verbose:
         ctx.obj["VERBOSE"] = verbose
-
+    ctx.obj["INCLUDE_CONTAINER_ROOTS"] = include_container_roots
+    ctx.obj["REGEX_NAME_SEARCH"] = regex_name_search
     if (
         not search_latest
         and not search_all
@@ -419,6 +436,7 @@ def get_product_contain_component(
     params.pop("sfm2_flaw_id")
     params.pop("flaw_mode")
     params.pop("affect_mode")
+    params.pop("include_container_roots")
     if component_name:
         q = query_service.invoke(
             core_queries.products_containing_component_query, params, status=operation_status