cici-tools 0.16.1__py3-none-any.whl → 0.17.0__py3-none-any.whl

cici/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.16.1'
-__version_tuple__ = version_tuple = (0, 16, 1)
+__version__ = version = '0.17.0'
+__version_tuple__ = version_tuple = (0, 17, 0)
 
-__commit_id__ = commit_id = 'gcf94f688a'
+__commit_id__ = commit_id = 'ge723e80c8'

cici/cli/bundle.py

@@ -64,6 +64,7 @@ def load_cici_or_nothing(base_path: Path) -> Optional[cici_config.File]:
 
 
 def bundle_command(parser, args):
+
     logging.basicConfig(level=logging.INFO, format="[%(levelname)s] %(message)s")
 
     provider = import_module(f".{DEFAULT_PROVIDER}", "cici.providers")

cici/config/project/serializers.py

@@ -142,6 +142,7 @@ def loads(
         precommit_hooks = {}
 
     yaml = ruamel.yaml.YAML(typ="safe")
+
     data = yaml.load(text)
 
     # verify targets exists even if empty

cici/providers/gitlab/serializers.py

@@ -43,7 +43,12 @@ def to_dict(obj):
     return msgspec.json.decode(encoded)
 
 
-def expand_job_extends(jobs: dict[str, gitlab.Job], job: gitlab.Job) -> gitlab.Job:
+def expand_job_extends(
+    jobs: dict[str, gitlab.Job],
+    job: gitlab.Job,
+    root_name: str,
+) -> gitlab.Job:
+
     # If the job does not use 'extends', return it unchanged
     if not job.extends:
         return job
@@ -58,11 +63,20 @@ def expand_job_extends(jobs: dict[str, gitlab.Job], job: gitlab.Job) -> gitlab.J
     # for each parent job listed in extends:
     for extend in extends:
         # recursively expand the parent first so fit the parent also has 'extends' it gets resolved too
-        parent_job = expand_job_extends(jobs, jobs[extend])
+        parent_job = expand_job_extends(jobs, jobs[extend], root_name=root_name)
         # convert expanded parent struct into plain dict to easily merge its fields
         parent_dict = to_dict(parent_job)
-        # Add parent fields to accumulator (later parents should override earlier ones if conflicts)
-        merged.update(parent_dict)
+
+        # Replace merged.update with block to preserve variables from ALL parents
+        for field_name, parent_value in parent_dict.items():
+            existing_value = merged.get(field_name)
+
+            if isinstance(parent_value, dict) and isinstance(existing_value, dict):
+                # deep merge dict fields (ie variables) so later, parents
+                # override keys without wiping earlier ones
+                merged[field_name] = {**existing_value, **parent_value}
+            else:
+                merged[field_name] = parent_value
 
     # convert child job into a dict
     child_dict = to_dict(job)
@@ -89,8 +103,9 @@ def expand_job_extends(jobs: dict[str, gitlab.Job], job: gitlab.Job) -> gitlab.J
 def expand_jobs(file_struct: gitlab.File) -> gitlab.File:
     patched_jobs = {}
     for job_name, job in file_struct.jobs.items():
-        expanded_job = expand_job_extends(file_struct.jobs, job)
+        expanded_job = expand_job_extends(file_struct.jobs, job, root_name=job_name)
         patched_jobs[job_name] = expanded_job
+
     return replace(file_struct, jobs=patched_jobs)
 
 
@@ -278,7 +293,9 @@ def loads(
     file_struct = expand_jobs(file_struct)
 
     # inject container defaults
-    return inject_container_into_job(file_struct, cici_config_file)
+    file_struct = inject_container_into_job(file_struct, cici_config_file)
+
+    return file_struct
 
 
 # convert struct back to dict, apply container injection + YAML dump

{cici_tools-0.16.1.dist-info → cici_tools-0.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.16.1
+Version: 0.17.0
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0

{cici_tools-0.16.1.dist-info → cici_tools-0.17.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cici/__init__.py,sha256=wdYYpZKxK2omc_mRJgPj86Ec-QwoB4noZzlk71sBjnk,87
 cici/__main__.py,sha256=TWDBrcS5vXSclLWLm0Iu3uUXOkDw0PzcJ8a0zd7_ClU,150
-cici/_version.py,sha256=90rUavbhkIhBQf-kxpnqScRMnTL6Q4EaDd_ssigF4es,714
+cici/_version.py,sha256=6_JSiRppnIHtq0DJEvEjYAiuuKICeLbLn7ufD3dGVCE,714
 cici/constants.py,sha256=ydShHTAbuanWWXeg9tJZ5GLm65M41AKmIibUheKV5nw,913
 cici/exceptions.py,sha256=JMpcD5YjYwKdn65D0iOEchXiAgIVsKApAyngCTwVgI4,139
 cici/main.py,sha256=ceH9s7i2XdB-mpUtDWuzLVn9TZHiwmsq-daZOgB9oRI,748
@@ -8,7 +8,7 @@ cici/paths.py,sha256=R-zBlX70uUJKR-ttGmZ7gI8iIKdxz9hLN1bP1pSXZxI,1103
 cici/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cici/utils.py,sha256=E6GrD6qCvsFqaR-fhsuBf8qotxyUO2ZdOoKj2vRUUHs,1917
 cici/cli/__init__.py,sha256=wdYYpZKxK2omc_mRJgPj86Ec-QwoB4noZzlk71sBjnk,87
-cici/cli/bundle.py,sha256=XTsyXdlJHTK4Ca0i0S637pOIendaAI6hra5GdRgrYsw,3928
+cici/cli/bundle.py,sha256=sTcbWiNz_k5OgJVC7XAG5KaHGQZmWLi1Fqdg3JENHDg,3929
 cici/cli/readme.py,sha256=w2-Pi2aDxWGcLMnVEUmejItAneMIqHj0QiR4foFcHYs,2475
 cici/cli/schema.py,sha256=tQNirJrMyUf96iaA8XBmALeo4EvdRGqWLkTKCtvWR5M,1623
 cici/cli/update.py,sha256=8PZpd6HqJucoZDhLLX8eHAMSFh-Ngox6UYiVqsy6ZCs,4825
@@ -16,13 +16,13 @@ cici/config/__init__.py,sha256=TIewA-VCl2VYl_d0EviE3EEQSmBtDwjU26R68pDT38E,141
 cici/config/user.py,sha256=UBz21P-Vj41rKy2DAZwdAp5vcliAEEQlEQeEfHk-EZ4,841
 cici/config/project/__init__.py,sha256=wdYYpZKxK2omc_mRJgPj86Ec-QwoB4noZzlk71sBjnk,87
 cici/config/project/models.py,sha256=Ao8MGliXihoYRgqplWQAIyC3r4Jb0aj53F7EhgZGcu4,5873
-cici/config/project/serializers.py,sha256=Mlqodt4j2Q4KXK-LjxAA8jdopCenbBMokQ-LfITtJRc,6119
+cici/config/project/serializers.py,sha256=XvcOZeSsWRHbEgsPE4a9sYbmHj909hs1m-PejiyPDpo,6120
 cici/providers/__init__.py,sha256=wdYYpZKxK2omc_mRJgPj86Ec-QwoB4noZzlk71sBjnk,87
 cici/providers/gitlab/__init__.py,sha256=8ej6k3hd25UFOGFhHymLa2mvz9hEwMjdxyu66hnJwOQ,259
 cici/providers/gitlab/constants.py,sha256=nA36aqGvwBBood8lTFJueEY8lKEsOVjkp6ciMjAeKJA,1786
 cici/providers/gitlab/models.py,sha256=zPOLSfb811yVYgkKNirAEhcAPkoBwE-r_fmxMfxn8GU,7084
 cici/providers/gitlab/normalizers.py,sha256=EFQiJzRDkoahes0zwIMahuVC3DOy9A97eZDhMXdamno,4762
-cici/providers/gitlab/serializers.py,sha256=WmIFhztf5-oLhitJwzezKcKp4hMdctZgm9BaJWbELtw,10581
+cici/providers/gitlab/serializers.py,sha256=4lV2WBksMwYcm9GDU3LEzH4yyAzko1-VHJEAsOqz7uE,11105
 cici/providers/gitlab/utils.py,sha256=NUZ25rAosSWQyWh7m3xhiHRotqVl1krckZL58yR0LKQ,651
 cici/providers/gitlab/yaml_style.py,sha256=Obqm6JxmGgksCG_KYOFL9JH3S-bwzH9qFRvtD68mNjs,13409
 cici/schema/LICENSE.gitlab,sha256=0N7FHuinuoGBqZE6aUlD84yw3CGylx8lyfzertgmtY0,2001
@@ -39,10 +39,10 @@ cici/templates/target-table.md.j2,sha256=NYspLbP3ap1706WnehZRtu6a2uxL_mKf7zfm3y0
 cici/templates/targets.md.j2,sha256=k-lkfReFJMCu9t2SjuD5YJ-Q_KECJxdY7v-0TWDTaCM,116
 cici/templates/variable-list.md.j2,sha256=M9r3j7d8H171okQNj8j4pc92kMdeWSRoeZQ5QB3NUTQ,613
 cici/templates/variables.md.j2,sha256=2DquXagNupqBkD95_3ZI4guJOK-eG_igaaMdRIUDrcE,84
-cici_tools-0.16.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cici_tools-0.16.1.dist-info/licenses/NOTICE,sha256=dIBr-7sfvnoYXYvgHIozlRJTLD4EHORRtRJtIe4znW8,55
-cici_tools-0.16.1.dist-info/METADATA,sha256=7vg4UJn1mkeC35j6wt6j654Q4vBFjsDPXr8bYhcMAAY,4178
-cici_tools-0.16.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cici_tools-0.16.1.dist-info/entry_points.txt,sha256=CuBAwYG3z7qOKm4IYARjZzdX5fytMLKyr59HLLJx_Is,44
-cici_tools-0.16.1.dist-info/top_level.txt,sha256=sv8xIjFuuqtyBMoyzueczNvZo_--q12r64Zc0lGKKF8,5
-cici_tools-0.16.1.dist-info/RECORD,,
+cici_tools-0.17.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cici_tools-0.17.0.dist-info/licenses/NOTICE,sha256=dIBr-7sfvnoYXYvgHIozlRJTLD4EHORRtRJtIe4znW8,55
+cici_tools-0.17.0.dist-info/METADATA,sha256=X89XEiIN6fkNtifCbwZYSBwdSwBXcebX-gp2NqDYHcA,4178
+cici_tools-0.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cici_tools-0.17.0.dist-info/entry_points.txt,sha256=CuBAwYG3z7qOKm4IYARjZzdX5fytMLKyr59HLLJx_Is,44
+cici_tools-0.17.0.dist-info/top_level.txt,sha256=sv8xIjFuuqtyBMoyzueczNvZo_--q12r64Zc0lGKKF8,5
+cici_tools-0.17.0.dist-info/RECORD,,