cici-tools 0.17.1__py3-none-any.whl → 0.18.1__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.17.1'
-__version_tuple__ = version_tuple = (0, 17, 1)
+__version__ = version = '0.18.1'
+__version_tuple__ = version_tuple = (0, 18, 1)
 
-__commit_id__ = commit_id = 'ge578edc48'
+__commit_id__ = commit_id = 'g340c844f3'

cici/providers/gitlab/serializers.py

@@ -327,13 +327,23 @@ def dump(
     data = unpack_jobs(data)
     data = style_scalars(data)
 
+    # DEBUG
+    # job = data.get("opentofu-trivy") or {}
+    # script = job.get("script") or []
+    # if script:
+    #     print("\n[DUMP DEBUG] opentofu-trivy script[0] type:", type(script[0]))
+    #     print("[DUMP DEBUG] script[0] repr:", repr(str(script[0])))
+    #     print("[DUMP DEBUG] contains \\n\\n?:", "\n\n" in str(script[0]))
+    #     print("[DUMP DEBUG] contains \\n?:", "\n" in str(script[0]))
+    # END DEBUG
+
     # user round trip mode to preserve ruamel scalar styles (FoldedScalarString etc)
     yaml = ruamel.yaml.YAML(typ="rt")
     yaml.default_flow_style = False
     yaml.explicit_start = False
     yaml.preserve_quotes = True  # respect the quotes set in style_scalars()
     yaml.indent(mapping=2, sequence=4, offset=2)
-    yaml.width = 1000  # prevent unwanted line wrapping
+    yaml.width = 120  # prevent unwanted line wrapping
     # makes sure ruamel.yml to always emit double quoted strings """"
     yaml.representer.add_representer(DoubleQuotedScalarString, always_double_quoted)
 

cici/providers/gitlab/yaml_style.py

@@ -46,17 +46,34 @@ def make_scalar_string(line: str, quote: bool = False):
 
     # fix extra - >- between lines accidentally created with echo commands
     if unindented.startswith("echo "):
-        # inline if short and simple
-        if len(unindented) < 100 and not any(
-            sym in unindented for sym in ("&&", ";", "\\", "|")
+        stripped = unindented.strip()
+
+        if len(stripped) < 100 and not any(
+            sym in stripped for sym in ("&&", ";", "\\", "|")
         ):
-            return unindented
+            return stripped
 
-        return FoldedScalarString(wrap_if_long(unindented))
+        folded_scalar = FoldedScalarString(stripped)
+
+        # If its piping "echo... | docker login ...", fold at the pipe for correct display
+        if " | " in stripped:
+            pipe_position = stripped.index(" | ")
+            folded_scalar.fold_pos = [pipe_position]  # type: ignore[attr-defined]
+
+        return folded_scalar
 
-    # Commands and long lines get folded
+    # Folding long lines logic (like a script that is super long so that it does not do anything weird in the folding process)
     if unindented.startswith(("docker ", "helm ", "tar ", "curl ")):
-        return FoldedScalarString(wrap_if_long(unindented))
+        command_string = unindented.strip()
+
+        folded_scalar = FoldedScalarString(command_string)
+
+        if " | " in command_string:
+            pipe_position = command_string.index(" | ")
+            # mypy does not like fold_pos however it solves an issue that breaks the .gitlab-ci.yaml
+            folded_scalar.fold_pos = [pipe_position]  # type: ignore[attr-defined]
+
+        return folded_scalar
 
     # Multi-command sequences get folded
     if any(sym in unindented for sym in ("&&", ";", "\\")):
@@ -339,7 +356,7 @@ def style_scalars(
             "on_success",
             "on_failure",
             "manual",
-            "cobertura",  # :white_check_mark: coverage format
+            "cobertura",  # coverage format
             "sigstore",
         }
         if stripped in UNQUOTED_KEYWORDS:

{cici_tools-0.17.1.dist-info → cici_tools-0.18.1.dist-info}/METADATA

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

{cici_tools-0.17.1.dist-info → cici_tools-0.18.1.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=UcfJr5SDMbnLubKNu1a83szGr60gwIDKBmzvM_wxU6c,714
+cici/_version.py,sha256=HCwUW5wQpxXJvLAWrQTjHoecYzV_2aKTl10EXbZPyY4,714
 cici/constants.py,sha256=ydShHTAbuanWWXeg9tJZ5GLm65M41AKmIibUheKV5nw,913
 cici/exceptions.py,sha256=JMpcD5YjYwKdn65D0iOEchXiAgIVsKApAyngCTwVgI4,139
 cici/main.py,sha256=ceH9s7i2XdB-mpUtDWuzLVn9TZHiwmsq-daZOgB9oRI,748
@@ -22,9 +22,9 @@ cici/providers/gitlab/__init__.py,sha256=8ej6k3hd25UFOGFhHymLa2mvz9hEwMjdxyu66hn
 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=4lV2WBksMwYcm9GDU3LEzH4yyAzko1-VHJEAsOqz7uE,11105
+cici/providers/gitlab/serializers.py,sha256=heczGlwcmKesugYX8PhwIhVIw8kExsfXKsC52sAwLrc,11533
 cici/providers/gitlab/utils.py,sha256=NUZ25rAosSWQyWh7m3xhiHRotqVl1krckZL58yR0LKQ,651
-cici/providers/gitlab/yaml_style.py,sha256=Obqm6JxmGgksCG_KYOFL9JH3S-bwzH9qFRvtD68mNjs,13409
+cici/providers/gitlab/yaml_style.py,sha256=emgrHqjhMmAWhlgtYJ8NgIYRntSaXQC8T5QDehSbOCM,14101
 cici/schema/LICENSE.gitlab,sha256=0N7FHuinuoGBqZE6aUlD84yw3CGylx8lyfzertgmtY0,2001
 cici/schema/__init__.py,sha256=wdYYpZKxK2omc_mRJgPj86Ec-QwoB4noZzlk71sBjnk,87
 cici/schema/gitlab-ci.json,sha256=BCymn2i9JOrUGS2SsvpoXCH8JcofQz9Rhux46zEnS_8,70638
@@ -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.17.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cici_tools-0.17.1.dist-info/licenses/NOTICE,sha256=dIBr-7sfvnoYXYvgHIozlRJTLD4EHORRtRJtIe4znW8,55
-cici_tools-0.17.1.dist-info/METADATA,sha256=teqs6ew12daHh-3g_JIJN7p17X_1XH3FpkjMauDoVX8,4178
-cici_tools-0.17.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cici_tools-0.17.1.dist-info/entry_points.txt,sha256=CuBAwYG3z7qOKm4IYARjZzdX5fytMLKyr59HLLJx_Is,44
-cici_tools-0.17.1.dist-info/top_level.txt,sha256=sv8xIjFuuqtyBMoyzueczNvZo_--q12r64Zc0lGKKF8,5
-cici_tools-0.17.1.dist-info/RECORD,,
+cici_tools-0.18.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cici_tools-0.18.1.dist-info/licenses/NOTICE,sha256=dIBr-7sfvnoYXYvgHIozlRJTLD4EHORRtRJtIe4znW8,55
+cici_tools-0.18.1.dist-info/METADATA,sha256=pMoajdELgA4fNQve-ADLYrKUTtM-Z_xLifHlWcoLjmY,4178
+cici_tools-0.18.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cici_tools-0.18.1.dist-info/entry_points.txt,sha256=CuBAwYG3z7qOKm4IYARjZzdX5fytMLKyr59HLLJx_Is,44
+cici_tools-0.18.1.dist-info/top_level.txt,sha256=sv8xIjFuuqtyBMoyzueczNvZo_--q12r64Zc0lGKKF8,5
+cici_tools-0.18.1.dist-info/RECORD,,