cici-tools 0.18.0__tar.gz → 0.18.2__tar.gz

{cici_tools-0.18.0 → cici_tools-0.18.2}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.18.0
+Version: 0.18.2
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0
 Project-URL: Home, https://gitlab.com/saferatday0/cici
 Project-URL: Issues, https://gitlab.com/saferatday0/cici/-/issues
-Keywords: ci,pipeline,python
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
@@ -28,6 +27,12 @@ Requires-Dist: msgspec
 Requires-Dist: python-decouple
 Requires-Dist: ruamel.yaml
 Requires-Dist: termcolor
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Provides-Extra: keywords
+Requires-Dist: ci; extra == "keywords"
+Requires-Dist: pipeline; extra == "keywords"
+Requires-Dist: python; extra == "keywords"
 Dynamic: license-file
 
 # saferatday0 cici

{cici_tools-0.18.0 → cici_tools-0.18.2}/cici/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.18.0'
-__version_tuple__ = version_tuple = (0, 18, 0)
+__version__ = version = '0.18.2'
+__version_tuple__ = version_tuple = (0, 18, 2)
 
-__commit_id__ = commit_id = 'g36384f791'
+__commit_id__ = commit_id = 'g683345939'

{cici_tools-0.18.0 → cici_tools-0.18.2}/cici/providers/gitlab/yaml_style.py

@@ -46,13 +46,21 @@ 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
 
     # 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 ")):

{cici_tools-0.18.0 → cici_tools-0.18.2}/cici_tools.egg-info/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.18.0
+Version: 0.18.2
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0
 Project-URL: Home, https://gitlab.com/saferatday0/cici
 Project-URL: Issues, https://gitlab.com/saferatday0/cici/-/issues
-Keywords: ci,pipeline,python
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
@@ -28,6 +27,12 @@ Requires-Dist: msgspec
 Requires-Dist: python-decouple
 Requires-Dist: ruamel.yaml
 Requires-Dist: termcolor
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Provides-Extra: keywords
+Requires-Dist: ci; extra == "keywords"
+Requires-Dist: pipeline; extra == "keywords"
+Requires-Dist: python; extra == "keywords"
 Dynamic: license-file
 
 # saferatday0 cici

{cici_tools-0.18.0 → cici_tools-0.18.2}/cici_tools.egg-info/requires.txt

@@ -6,3 +6,11 @@ msgspec
 python-decouple
 ruamel.yaml
 termcolor
+
+[keywords]
+ci
+pipeline
+python
+
+[test]
+pytest

{cici_tools-0.18.0 → cici_tools-0.18.2}/makefile

@@ -10,13 +10,13 @@ MANAGE ?= $(PYTHON) ./manage.py
 all: setup
 
 .PHONY: setup
-setup: $(VENV)/requirements.txt
+setup: $(VENV)/requirements.txt editable
 
 requirements.txt: pyproject.toml | $(VENV)
-	uv pip compile --python-version $(PYTHON_VERSION) --upgrade -o requirements.txt pyproject.toml
+	uv pip compile --python-version $(PYTHON_VERSION) --extra test --upgrade -o requirements.txt pyproject.toml
 
 $(VENV)/requirements.txt: requirements.txt | $(VENV)
-	VIRTUAL_ENV=$(VENV) uv pip install -r requirements.txt
+	uv pip install --python $(PYTHON) -r requirements.txt
 	cp -f requirements.txt $(VENV)/requirements.txt
 
 $(VENV):
@@ -33,7 +33,7 @@ distclean:
 
 .PHONY: editable
 editable:
-	VIRTUAL_ENV=$(VENV) uv pip install -e .
+	uv pip install --python $(PYTHON) -e .
 
 .PHONY: schema
 schema:

{cici_tools-0.18.0 → cici_tools-0.18.2}/pyproject.toml

@@ -40,20 +40,23 @@ dependencies = [
     "termcolor",
 ]
 
+license = { text = "Apache-2.0"}
+readme = "README.md"
+requires-python = ">=3.9"
+
 dynamic = ["version"]
 
+[project.optional-dependencies]
+test = [
+    "pytest",
+]
+
 keywords = [
     "ci",
     "pipeline",
     "python",
 ]
 
-license = {"text" = "Apache-2.0"}
-
-readme = "README.md"
-
-requires-python = ">=3.9"
-
 [project.scripts]
 cici = "cici.__main__:main"
 

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker-multiarch-amd64.yml

@@ -91,13 +91,14 @@ container-docker-multiarch-amd64:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - _CONTAINER_OPTS="$CONTAINER_BUILD_OPTS"
     - _CONTAINER_OPTS="$_CONTAINER_OPTS --tag ${CONTAINER_IMAGE}-${CONTAINER_COMMIT_SHORT_SHA}-${CONTAINER_DOCKER_ARCH}"

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker-multiarch-arm32v6.yml

@@ -91,13 +91,14 @@ container-docker-multiarch-arm32v6:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - _CONTAINER_OPTS="$CONTAINER_BUILD_OPTS"
     - _CONTAINER_OPTS="$_CONTAINER_OPTS --tag ${CONTAINER_IMAGE}-${CONTAINER_COMMIT_SHORT_SHA}-${CONTAINER_DOCKER_ARCH}"

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker-multiarch-arm32v7.yml

@@ -91,13 +91,14 @@ container-docker-multiarch-arm32v7:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - _CONTAINER_OPTS="$CONTAINER_BUILD_OPTS"
     - _CONTAINER_OPTS="$_CONTAINER_OPTS --tag ${CONTAINER_IMAGE}-${CONTAINER_COMMIT_SHORT_SHA}-${CONTAINER_DOCKER_ARCH}"

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker-multiarch-arm64v8.yml

@@ -91,13 +91,14 @@ container-docker-multiarch-arm64v8:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - _CONTAINER_OPTS="$CONTAINER_BUILD_OPTS"
     - _CONTAINER_OPTS="$_CONTAINER_OPTS --tag ${CONTAINER_IMAGE}-${CONTAINER_COMMIT_SHORT_SHA}-${CONTAINER_DOCKER_ARCH}"

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker-multiarch-i386.yml

@@ -91,13 +91,14 @@ container-docker-multiarch-i386:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - _CONTAINER_OPTS="$CONTAINER_BUILD_OPTS"
     - _CONTAINER_OPTS="$_CONTAINER_OPTS --tag ${CONTAINER_IMAGE}-${CONTAINER_COMMIT_SHORT_SHA}-${CONTAINER_DOCKER_ARCH}"

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker-multiarch-manifest.yml

@@ -88,13 +88,14 @@ container-docker-multiarch-manifest:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - amend_list=""
     - |-

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker-multiarch.yml

@@ -88,13 +88,14 @@ container-docker-multiarch:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - _CONTAINER_OPTS="$CONTAINER_BUILD_OPTS"
     - _CONTAINER_OPTS="$_CONTAINER_OPTS --tag ${CONTAINER_IMAGE}-${CONTAINER_COMMIT_SHORT_SHA}-${CONTAINER_DOCKER_ARCH}"

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-docker.yml

@@ -88,13 +88,14 @@ container-docker:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache cosign
     - _CONTAINER_OPTS="$CONTAINER_BUILD_OPTS"
     - _CONTAINER_OPTS="$_CONTAINER_OPTS --tag ${CONTAINER_IMAGE}-${CONTAINER_COMMIT_SHORT_SHA}"

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/fixtures/gitlab/service-key/container-trivy.yml

@@ -88,13 +88,14 @@ container-trivy:
     - >-
       docker --version
     - >-
-      echo "$CONTAINER_REGISTRY_PASSWORD" | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
+      echo "$CONTAINER_REGISTRY_PASSWORD"
+      | docker login "$CONTAINER_REGISTRY" -u "$CONTAINER_REGISTRY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER"
-
-      --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_DEPENDENCY_PROXY_SERVER" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - >-
-      echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
+      echo "$CI_DEPENDENCY_PROXY_PASSWORD"
+      | docker login "$CI_SERVER_HOST" -u "$CI_DEPENDENCY_PROXY_USER" --password-stdin
     - apk add --no-cache curl
     - >-
       curl -sSL https://github.com/aquasecurity/trivy/releases/download/v0.49.1/trivy_0.49.1_Linux-64bit.tar.gz

{cici_tools-0.18.0 → cici_tools-0.18.2}/tests/test_yaml_style.py

@@ -94,3 +94,54 @@ def test_yaml_dump_has_no_blank_line_in_folded_scalar(command_text):
     assert not any(line.strip() == "" for line in folded_block[1:]), "\n".join(
         folded_block
     )
+
+
+@pytest.mark.parametrize(
+    "command",
+    [
+        # generic echo | docker login case
+        'echo "password" | docker login "registry" -u "user" --password-stdin',
+        # generic long piped command
+        'echo "token" | some-tool login --flag-a --flag-b --flag-c --flag-d',
+        # generic curl | tar example
+        "curl https://example.com/archive.tar.gz | tar -C /usr/local/bin -xzf -",
+    ],
+    ids=[
+        "echo-pipe-docker-login",
+        "echo-pipe-generic-tool",
+        "curl-pipe-tar",
+    ],
+)
+def test_folded_scalar_does_not_insert_blank_lines(command):
+    """
+    Folded scalars should:
+    - contain no semantic newlines
+    - fold visually using >-
+    - not introduce blank lines in YAML output
+    """
+
+    scalar = make_scalar_string(command)
+
+    # 1. Value must not contain semantic newlines
+    assert isinstance(scalar, FoldedScalarString)
+    assert "\n" not in str(scalar)
+
+    # 2. Dump YAML
+    yaml = ruamel.yaml.YAML()
+    yaml.width = 120
+
+    data = {"script": [scalar]}
+    stream = io.StringIO()
+    yaml.dump(data, stream)
+    output = stream.getvalue()
+
+    # 3. Must be folded
+    assert ">-" in output
+
+    # 4. Must not contain blank line inside folded block
+    # (blank line would show up as double newline)
+    assert "\n\n" not in output
+
+    # 5. The command must still appear intact
+    for part in command.split():
+        assert part in output