Implement support for Commodore component dependencies (SDD #0034)

commodore/cli/component.py

@@ -231,6 +231,12 @@ def decorator(cmd):
             show_default=True,
             help=f"{add_text} golden tests.",
         )(cmd)
+        click.option(
+            "--update-golden-tests/--no-update-golden-tests",
+            default=True,
+            show_default=True,
+            help="Whether to run `make gen-golden(-all)` after applying the template.",
+        )(cmd)
         click.option(
             "--pp/--no-pp",
             default=False if new_cmd else None,
@@ -305,6 +311,7 @@ def component_new(
     owner: str,
     copyright_holder: str,
     golden_tests: bool,
+    update_golden_tests: bool,
     matrix_tests: bool,
     verbose: int,
     output_dir: str,
@@ -331,6 +338,10 @@ def component_new(
     t.copyright_holder = copyright_holder
     t.golden_tests = golden_tests
     t.matrix_tests = matrix_tests
+    # NOTE(sg): Must be after matrix test config, because that setter adjusts
+    # gen_golden_target.
+    if not update_golden_tests:
+        t.gen_golden_target = None
     t.test_cases = ["defaults"] + list(additional_test_case)
     t.automerge_patch = automerge_patch
     t.automerge_patch_v0 = automerge_patch_v0
@@ -435,6 +446,7 @@ def component_update(
     copyright_holder: str,
     template_version: Optional[str],
     golden_tests: Optional[bool],
+    update_golden_tests: Optional[bool],
     matrix_tests: Optional[bool],
     lib: Optional[bool],
     pp: Optional[bool],
@@ -479,6 +491,10 @@ def component_update(
         t.golden_tests = golden_tests
     if matrix_tests is not None:
         t.matrix_tests = matrix_tests
+    # NOTE(sg): Must be after matrix test config, because that setter adjusts
+    # gen_golden_target.
+    if not update_golden_tests:
+        t.gen_golden_target = None
     if lib is not None:
         t.library = lib
     if pp is not None:

commodore/cluster.py

@@ -5,7 +5,7 @@
 import textwrap
 
 from datetime import datetime
-from typing import Any, Optional, Union
+from typing import Any, Iterable, Optional, Union
 
 import click
 
@@ -200,6 +200,7 @@ def render_target(
     target: str,
     components: dict[str, Component],
     component: Optional[str] = None,
+    extra_classes: Optional[Iterable[str]] = None,
 ):
     if not component:
         component = target
@@ -229,15 +230,27 @@ def render_target(
             )
         classes.append(f"components.{target}")
 
+    if extra_classes:
+        classes.extend(extra_classes)
+
     return generate_target(inv, target, components, classes, component)
 
 
-def update_target(cfg: Config, target: str, component: Optional[str] = None):
+def update_target(
+    cfg: Config,
+    target: str,
+    component: Optional[str] = None,
+    extra_classes: Optional[Iterable[str]] = None,
+):
     click.secho(f"Updating Kapitan target for {target}...", bold=True)
     file = cfg.inventory.target_file(target)
     os.makedirs(file.parent, exist_ok=True)
     targetdata = render_target(
-        cfg.inventory, target, cfg.get_components(), component=component
+        cfg.inventory,
+        target,
+        cfg.get_components(),
+        component=component,
+        extra_classes=extra_classes,
     )
     yaml_dump(targetdata, file)
 

commodore/compile.py

@@ -25,6 +25,7 @@
     verify_version_overrides,
 )
 from .dependency_mgmt.component_library import create_component_library_aliases
+from .dependency_mgmt.component_dependency import validate_catalog_dependencies
 from .dependency_mgmt.jsonnet_bundler import (
     fetch_jsonnet_libraries,
     jsonnet_dependencies,
@@ -241,6 +242,9 @@ def setup_compile_environment(config: Config) -> tuple[dict[str, Any], Iterable[
     # Raise exception if component version override without URL is present in the
     # hierarchy.
     verify_version_overrides(cluster_parameters, config.get_component_aliases())
+    # Raise exception if the catalog violates any component dependency version
+    # requirements.
+    validate_catalog_dependencies(config, inventory)
 
     for component in config.get_components().values():
         ckey = component.parameters_key