CH-260 fix tag generation for task images

Author: filippomc

tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py

@@ -357,7 +357,7 @@ def _clear_unused_db_configuration(self, harness_config):
 
     def image_tag(self, image_name, build_context_path=None, dependencies=()):
         tag = self.tag
-    
+
         return self.registry + image_name + (f':{tag}' if tag else '')
 
 

tools/deployment-cli-tools/ch_cli_tools/preprocessing.py

@@ -5,7 +5,7 @@
 
 import shutil
 from glob import glob
-from os.path import join, basename, isabs, relpath
+from os.path import join, basename, dirname, isabs, relpath
 
 from .helm import KEY_APPS, KEY_TASK_IMAGES, KEY_HARNESS, KEY_DEPLOYMENT
 from .configurationgenerator import DEFAULT_IGNORE, generate_tag_from_content
@@ -136,6 +136,18 @@ def get_build_paths(root_paths, helm_values, merge_build_path=DEFAULT_MERGE_PATH
                     relpath(base_path, root_path)
                 )
 
+            for task_path in find_subdirs(join(base_path, 'tasks')):
+                task_name = app_name_from_path(relpath(task_path, dirname(base_path)))
+                if task_name not in helm_values.get(KEY_TASK_IMAGES, {}):
+                    continue
+                if task_name not in artifacts:
+                    artifacts[task_name] = task_path
+                else:
+                    artifacts[task_name] = join(
+                        merge_build_path,
+                        relpath(task_path, root_path)
+                    )
+
     return artifacts
 
 

tools/deployment-cli-tools/ch_cli_tools/utils.py

@@ -280,7 +280,7 @@ def merge_configuration_directories(source: Union[str, pathlib.Path], destinatio
     merge_roots = ('deploy', 'deployment')
     spec = pathspec.PathSpec.from_lines('gitwildmatch', exclude)
     copy_single_files = False
-    
+
     if not destination_path.exists():
         logging.info("Creating merged directory %s from %s", destination, source)
         merge_roots_set = set(merge_roots)

tools/deployment-cli-tools/harness-deployment

@@ -126,7 +126,6 @@ if __name__ == "__main__":
                 app_version=args.app_version,
             ))
 
-
         helm_values = chart_fn(**chart_args)
 
         merged_root_paths = preprocess_build_overrides(

tools/deployment-cli-tools/tests/test_preprocessing.py

@@ -1,5 +1,7 @@
+import copy
 import shutil
 import os
+import tempfile
 
 from ch_cli_tools.helm import *
 from ch_cli_tools.preprocessing import *
@@ -72,3 +74,58 @@ def test_generate_hash_based_image_tags_uses_merged_content():
     assert image_before != image_after
 
     shutil.rmtree(MERGE_BUILD_DIR)
+
+
+def test_task_file_changes_trigger_different_tag():
+    """Modifying a file under applications/*/tasks/*/* must produce a different
+    hash-based tag for the corresponding task image."""
+
+    values = create_helm_chart(
+        [CLOUDHARNESS_ROOT], output_path=OUT, include=['workflows'],
+        domain="my.local", namespace='test', env='dev', local=False,
+        tag=None, registry='reg',
+    )
+
+    # Pick a task image that lives under applications/workflows/tasks/
+    task_key = 'workflows-notify-queue'
+    assert task_key in values[KEY_TASK_IMAGES], (
+        f"Expected '{task_key}' in task-images; got {list(values[KEY_TASK_IMAGES].keys())}"
+    )
+
+    # --- first run: compute tags on the original tree ---
+    preprocess_build_overrides(
+        root_paths=[CLOUDHARNESS_ROOT], helm_values=values,
+        merge_build_path=MERGE_BUILD_DIR,
+    )
+    values_before = copy.deepcopy(values)
+    generate_hash_based_image_tags(
+        root_paths=[CLOUDHARNESS_ROOT], helm_values=values_before,
+        merge_build_path=MERGE_BUILD_DIR,
+    )
+    tag_before = values_before[KEY_TASK_IMAGES][task_key]
+
+    # --- mutate a task file and recompute ---
+    task_dir = os.path.join(
+        CLOUDHARNESS_ROOT, 'applications', 'workflows', 'tasks', 'notify-queue',
+    )
+    tmp_file = os.path.join(task_dir, '_tag_test_tmp_file')
+    try:
+        with open(tmp_file, 'w') as f:
+            f.write('trigger-tag-change')
+
+        values_after = copy.deepcopy(values)
+        generate_hash_based_image_tags(
+            root_paths=[CLOUDHARNESS_ROOT], helm_values=values_after,
+            merge_build_path=MERGE_BUILD_DIR,
+        )
+        tag_after = values_after[KEY_TASK_IMAGES][task_key]
+    finally:
+        if os.path.exists(tmp_file):
+            os.remove(tmp_file)
+        if os.path.exists(MERGE_BUILD_DIR):
+            shutil.rmtree(MERGE_BUILD_DIR)
+
+    assert tag_before != tag_after, (
+        f"Task image tag for '{task_key}' did not change after modifying task files. "
+        f"Before: {tag_before}, After: {tag_after}"
+    )