c2cciutils 1.7.0.dev277__py3-none-any.whl → 1.7.0.dev281__py3-none-any.whl

c2cciutils/audit.py

@@ -9,9 +9,10 @@ import subprocess  # nosec
 import sys
 from argparse import Namespace
 
+import security_md
+
 import c2cciutils
 import c2cciutils.configuration
-import c2cciutils.security
 
 
 def print_versions(
@@ -209,7 +210,7 @@ def outdated_versions(
         return True
 
     with open("SECURITY.md", encoding="utf-8") as security_file:
-        security = c2cciutils.security.Security(security_file.read())
+        security = security_md.Security(security_file.read())
 
     version_index = security.version_index
     date_index = security.support_until_index
@@ -217,9 +218,9 @@ def outdated_versions(
     for row in security.data:
         str_date = row[date_index]
         if str_date not in (
-            c2cciutils.security.SUPPORT_TO_BE_DEFINED,
-            c2cciutils.security.SUPPORT_BEST_EFFORT,
-            c2cciutils.security.SUPPORT_UNSUPPORTED,
+            security_md.SUPPORT_TO_BE_DEFINED,
+            security_md.SUPPORT_BEST_EFFORT,
+            security_md.SUPPORT_UNSUPPORTED,
         ):
             date = datetime.datetime.strptime(row[date_index], "%d/%m/%Y")
             if date < datetime.datetime.now():

c2cciutils/configuration.py

@@ -456,18 +456,15 @@ K8S_DB_CHART_OPTIONS_DEFAULT = {
 
 
 PRINT_VERSIONS_VERSIONS_DEFAULT = [
-    {"name": "c2cciutils", "cmd": ["c2cciutils", "--version"]},
     {"name": "python", "cmd": ["python3", "--version"]},
     {"name": "pip", "cmd": ["python3", "-m", "pip", "--version"]},
-    {"name": "twine", "cmd": ["twine", "--version"]},
     {"name": "node", "prefix": "node ", "cmd": ["node", "--version"]},
     {"name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"]},
-    {"name": "make", "cmd": ["make", "--version"], "prefix": "make "},
+    {"name": "make", "cmd": ["make", "--version"]},
     {"name": "docker", "cmd": ["docker", "--version"]},
     {"name": "docker compose", "cmd": ["docker", "compose", "version"]},
     {"name": "java", "cmd": ["java", "-version"]},
-    {"name": "kubectl", "cmd": ["kubectl", "version"]},
-    {"name": "helm", "cmd": ["helm", "version"]},
+    {"name": "helm", "cmd": ["helm", "version"], "prefix": "HELM: "},
 ]
 """ Default value of the field path 'Print versions versions' """
 
@@ -582,10 +579,6 @@ class PrintVersions(TypedDict, total=False):
     Print versions versions.
 
     default:
-      - cmd:
-        - c2cciutils
-        - --version
-        name: c2cciutils
       - cmd:
         - python3
         - --version
@@ -596,10 +589,6 @@ class PrintVersions(TypedDict, total=False):
         - pip
         - --version
         name: pip
-      - cmd:
-        - twine
-        - --version
-        name: twine
       - cmd:
         - node
         - --version
@@ -614,7 +603,6 @@ class PrintVersions(TypedDict, total=False):
         - make
         - --version
         name: make
-        prefix: 'make '
       - cmd:
         - docker
         - --version
@@ -628,14 +616,11 @@ class PrintVersions(TypedDict, total=False):
         - java
         - -version
         name: java
-      - cmd:
-        - kubectl
-        - version
-        name: kubectl
       - cmd:
         - helm
         - version
         name: helm
+        prefix: 'HELM: '
     """
 
 

c2cciutils/schema.json

@@ -451,18 +451,15 @@
           "title": "Print versions versions",
           "type": "array",
           "default": [
-            { "name": "c2cciutils", "cmd": ["c2cciutils", "--version"] },
             { "name": "python", "cmd": ["python3", "--version"] },
             { "name": "pip", "cmd": ["python3", "-m", "pip", "--version"] },
-            { "name": "twine", "cmd": ["twine", "--version"] },
             { "name": "node", "prefix": "node ", "cmd": ["node", "--version"] },
             { "name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"] },
-            { "name": "make", "cmd": ["make", "--version"], "prefix": "make " },
+            { "name": "make", "cmd": ["make", "--version"] },
             { "name": "docker", "cmd": ["docker", "--version"] },
             { "name": "docker compose", "cmd": ["docker", "compose", "version"] },
             { "name": "java", "cmd": ["java", "-version"] },
-            { "name": "kubectl", "cmd": ["kubectl", "version"] },
-            { "name": "helm", "cmd": ["helm", "version"] }
+            { "name": "helm", "cmd": ["helm", "version"], "prefix": "HELM: " }
           ],
           "items": {
             "type": "object",

c2cciutils/scripts/main.py

@@ -27,11 +27,8 @@ def main() -> None:
         print(yaml.dump(c2cciutils.get_config(), default_flow_style=False, Dumper=yaml.SafeDumper))
 
     if args.version:
-        for pkg in ("c2cciutils", "black", "isort"):
-            try:
-                print(f"{pkg} {pkg_resources.get_distribution(pkg).version}")
-            except pkg_resources.DistributionNotFound:
-                print(f"{pkg} missing")
+        version = pkg_resources.get_distribution("c2cciutils").version
+        print(f"c2cciutils {version}")
 
     if args.ls_files_mime:
         for file_name in c2cciutils.get_git_files_mime(args.ls_files_mime):

c2cciutils/scripts/publish.py

@@ -13,6 +13,7 @@ from re import Match
 from typing import Optional, cast
 
 import requests
+import security_md
 import yaml
 
 import c2cciutils
@@ -21,7 +22,6 @@ import c2cciutils.env
 import c2cciutils.lib.docker
 import c2cciutils.publish
 import c2cciutils.scripts.download_applications
-import c2cciutils.security
 from c2cciutils.publish import GoogleCalendar
 from c2cciutils.scripts.trigger_image_update import dispatch
 
@@ -213,7 +213,7 @@ def main() -> None:
                 print(f"::error:: {security_response.status_code} {security_response.text}")
                 sys.exit(1)
 
-        security = c2cciutils.security.Security(security_text)
+        security = security_md.Security(security_text)
         version_index = security.version_index
         alternate_tag_index = security.alternate_tag_index
 

{c2cciutils-1.7.0.dev277.dist-info → c2cciutils-1.7.0.dev281.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cciutils
-Version: 1.7.0.dev277
+Version: 1.7.0.dev281
 Summary: Common utilities for Camptocamp CI
 Home-page: https://github.com/camptocamp/c2cciutils
 License: FreeBSD
@@ -39,6 +39,7 @@ Requires-Dist: multi-repo-automation (>=1.0.0,<2.0.0) ; extra == "version"
 Requires-Dist: python-magic (>=0.0.0,<1.0.0)
 Requires-Dist: requests (>=2.0.0,<3.0.0)
 Requires-Dist: ruamel.yaml (>=0.0.0,<1.0.0)
+Requires-Dist: security-md (>=0.0.0,<1.0.0)
 Requires-Dist: toml (>=0.0.0,<1.0.0)
 Requires-Dist: tomlkit (>=0.0.0,<1.0.0) ; extra == "publish"
 Requires-Dist: twine (>=5.0.0,<6.0.0) ; extra == "publish"

{c2cciutils-1.7.0.dev277.dist-info → c2cciutils-1.7.0.dev281.dist-info}/RECORD

@@ -2,10 +2,10 @@ c2cciutils/__init__.py,sha256=M6hqae9Eai2yB2dD4igKHktBJ5ZRqh6Cpv18fLP9Kzo,20992
 c2cciutils/applications-versions.yaml,sha256=6zZVsRCsCVvHGXPS-PgnRGGOoUBTksnhlleWDzPCj98,225
 c2cciutils/applications.yaml,sha256=yn0XRi08cS29A_jXPofcBPxsGBv7PEBliztjRC3WtfM,504
 c2cciutils/applications_definition.py,sha256=rOEZ3ISl5fUNDrow6H58Immy3KWJtWwGshicVDpnyNA,1321
-c2cciutils/audit.py,sha256=V7PEn1EchANFpGoNy_91wWpxJBQ13IhrFZnGUEKqnUg,7423
+c2cciutils/audit.py,sha256=T2pNVumr-N5qZOsDvAP48SarNUvQP7OdAnbeZuEYwwQ,7384
 c2cciutils/branches.graphql,sha256=UZrj1RO-H527M1SKqWm1VnkWtNsuKTnPTf4BCU2YcOU,358
 c2cciutils/commits.graphql,sha256=3HAuIEig5V7j1L-6mqBaOkiTD3Fb8_gl1ilpZjPJf74,308
-c2cciutils/configuration.py,sha256=fktdX1tcAxt8UxpRzscNeKRvpT5K-Hc-ykDJg0jIVmk,28558
+c2cciutils/configuration.py,sha256=-jX3R2tkIy0vSNjbX_iNL3DwRAqPJgSNAJoItI2JXRM,28167
 c2cciutils/default_branch.graphql,sha256=CaP3rRsNiyg_7RvqbMk0tOJr0aqWd8cOeSV-ZKgvKY4,131
 c2cciutils/env.py,sha256=J-lC7GdOkdFVIrWFZEkAxHmIuTYwhDJiE30BICj2UoM,3425
 c2cciutils/lib/docker.py,sha256=lwvCarwSSUWK1Y4O7qcTILPdpkTf2Ujhl_fCwZ6dBUY,5677
@@ -14,7 +14,7 @@ c2cciutils/package.json,sha256=eVSEaP7N8qu5EyPpkBpefKtnjlKLlfCHTfBXgbOoHDY,134
 c2cciutils/pr_checks.py,sha256=tBwDHxThcu6648pE2cqpLNsaU711lwwgRc7sB4qR6fU,10109
 c2cciutils/publish.py,sha256=KOEtPe-y1uw0-DWfKnF5jmYfQb5c0_URKBxakthcrBI,17259
 c2cciutils/schema-applications.json,sha256=Tus-s9NB7uwKhTrQwhWQM4_oJygF_yHUqShtZhN1IxE,1551
-c2cciutils/schema.json,sha256=npgHxKD_Wj93JdwzT7bvY5MJyx7MFfyB8fHPWY5iIcc,23317
+c2cciutils/schema.json,sha256=UjKdtlMj7gIcKhkkOPm7zRkyT4Q5eYSPjqXjm9wx6GY,23114
 c2cciutils/scripts/__init__.py,sha256=N4tcdvUifXQrK9vEvFWrGvoyY9oZ0uRcjb-FoYe41cc,36
 c2cciutils/scripts/audit.py,sha256=MUQqpA8CNkbSyK5e0HiSC5w-4GPKYEqFgV82lIwKkQk,1104
 c2cciutils/scripts/clean.py,sha256=tpyipZjqK7om9_dNiLxvz6-l6le7N0L03inkrKe7Y_A,3039
@@ -28,15 +28,14 @@ c2cciutils/scripts/k8s/db.py,sha256=GK1tzzyCqrCyIJzcBdIXjyNJUXrBPFNa-9fdtwxyrlU,
 c2cciutils/scripts/k8s/install.py,sha256=OIQ8KHA3Pst2pjO2E-J5FYNaBHW-i-fqCXlAUcG1tw0,933
 c2cciutils/scripts/k8s/logs.py,sha256=-xJYu8BBUmSmMrPEwiTBKZjJBRyIlMp1depCB04_NWs,2655
 c2cciutils/scripts/k8s/wait.py,sha256=qzQn6hbB9p1CX4bUxrkukPnbu_p6oRNem29WiMtplNk,5661
-c2cciutils/scripts/main.py,sha256=pj9gPIrmDUctVPEtaQQGZo-7k7mMeIs14sKQ7w6Sw1Y,1162
+c2cciutils/scripts/main.py,sha256=ZksoYEDRJD0igEU6i0PnuOFtch4OzsxyHZQxbrjd5AY,1029
 c2cciutils/scripts/pin_pipenv.py,sha256=jBTwlolcEL0MUyq6VYzO-adkcL1gqN7B3kBb3UjTo2k,2150
 c2cciutils/scripts/pr_checks.py,sha256=PA9z9QB81H2JhGSr4T02eoxyeWDjQZ4XoIKFzS5o5A0,2190
-c2cciutils/scripts/publish.py,sha256=i38MT9pfHs4Nf8h_5OekCEpe7jjVe01vnYmHyv5TFww,19938
+c2cciutils/scripts/publish.py,sha256=D-J-GwkJ5sxVCANSGBolcoZ7cVyU5aqwixD1T1sqaZw,19922
 c2cciutils/scripts/trigger_image_update.py,sha256=UPCSgFcllewo1NOC7kUkJ2QMXU0dCA2QAq6LFQHr0Uw,2780
 c2cciutils/scripts/version.py,sha256=BU6I3nG3ofgUXCLrUBNOql45Dz9Loox4gt4ebHRM3iQ,8912
-c2cciutils/security.py,sha256=lsZzejJuuHwWTyyaLRlelI39JBJtBzNMaRtHdES7GG8,3463
-c2cciutils-1.7.0.dev277.dist-info/LICENSE,sha256=pK1gU5i1jYBv--vi5omcf6-86pYmAWk6ZGbdERjAgcw,1307
-c2cciutils-1.7.0.dev277.dist-info/METADATA,sha256=NSiWxf9wQ8lKMh1PgMSp6LklLyptodfwsWnk6rOPa9g,18480
-c2cciutils-1.7.0.dev277.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-c2cciutils-1.7.0.dev277.dist-info/entry_points.txt,sha256=Sr-v-X7Ri-vY7zX4yqZ9gOMFo8kZQyaiixiGYaIqOZQ,1170
-c2cciutils-1.7.0.dev277.dist-info/RECORD,,
+c2cciutils-1.7.0.dev281.dist-info/LICENSE,sha256=pK1gU5i1jYBv--vi5omcf6-86pYmAWk6ZGbdERjAgcw,1307
+c2cciutils-1.7.0.dev281.dist-info/METADATA,sha256=oZ1f-gAY3QDGzWYUQyhCxJAuDSb-ej-fzxRTs0cAf9k,18524
+c2cciutils-1.7.0.dev281.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+c2cciutils-1.7.0.dev281.dist-info/entry_points.txt,sha256=qB_mezKHsYy5j11RAhsEB_gPVZC2BebEvfT5Giu_D7s,1111
+c2cciutils-1.7.0.dev281.dist-info/RECORD,,

{c2cciutils-1.7.0.dev277.dist-info → c2cciutils-1.7.0.dev281.dist-info}/entry_points.txt

@@ -16,7 +16,6 @@ c2cciutils-k8s-wait=c2cciutils.scripts.k8s.wait:main
 c2cciutils-pin-pipenv=c2cciutils.scripts.pin_pipenv:main
 c2cciutils-publish=c2cciutils.scripts.publish:main
 c2cciutils-pull-request-checks=c2cciutils.scripts.pr_checks:main
-c2cciutils-security-md=c2cciutils.scripts.security_md:main
 c2cciutils-trigger-image-update=c2cciutils.scripts.trigger_image_update:main
 c2cciutils-version=c2cciutils.scripts.version:main
 

c2cciutils/security.py

@@ -1,112 +0,0 @@
-"""
-Read the table of versions from SECURITY.md.
-"""
-
-import xml.etree.ElementTree  # nosec
-from typing import Optional
-
-import markdown
-from markdown.extensions.tables import TableExtension
-
-HEADER_VERSION = "Version"
-HEADER_ALTERNATE_TAG = "Alternate Tag"
-HEADER_SUPPORTED_UNTIL = "Supported Until"
-SUPPORT_TO_BE_DEFINED = "To be defined"
-SUPPORT_BEST_EFFORT = "Best effort"
-SUPPORT_UNSUPPORTED = "Unsupported"
-
-
-class Security:
-    """
-    Read the table of versions from SECURITY.md.
-    """
-
-    headers: list[str]
-    data: list[list[str]]
-    _row: Optional[list[str]] = None
-
-    def __init__(self, status: str, check: bool = True):
-        """
-        Initialize.
-
-        Arguments:
-            status: the content of the SECURITY.md file.
-            check: Set to `False` to skip the check.
-        """
-
-        self.headers = []
-        self.data = []
-
-        markdown_instance = markdown.Markdown(extensions=[TableExtension()])
-
-        elem = markdown_instance.parser.parseDocument(
-            [s for s in status.split("\n") if s != "" and s[0] == "|"]
-        )
-        self._pe(elem.getroot())
-
-        self.data = [r for r in self.data if len([c for c in r if c is not None]) > 0]
-
-        self.version_index = self.headers.index(HEADER_VERSION) if HEADER_VERSION in self.headers else -1
-        self.alternate_tag_index = (
-            self.headers.index(HEADER_ALTERNATE_TAG) if HEADER_ALTERNATE_TAG in self.headers else -1
-        )
-        self.support_until_index = (
-            self.headers.index(HEADER_SUPPORTED_UNTIL) if HEADER_SUPPORTED_UNTIL in self.headers else -1
-        )
-
-        # Check the content if the content isn't empty
-        if check and status:
-            if not self.check(verbose=0):
-                raise ValueError("SECURITY.md file is not valid.")
-
-    def check(self, verbose: int = -1) -> bool:
-        """
-        Check the content.
-
-        Arguments:
-            verbose: the verbosity level, `-1` for no output, `0` for errors only, `1` for all.
-
-        Return:
-            `True` if the content is valid, `False` otherwise.
-        """
-
-        success = True
-        if self.version_index == -1:
-            if verbose >= 0:
-                print("`Version` column not found.")
-            success = False
-        elif verbose >= 1:
-            print(f"`Version` column found at index {self.version_index}.")
-
-        if self.alternate_tag_index == -1:
-            if verbose >= 1:
-                print("Optional `Alternate Tag` column not found.")
-        elif verbose >= 1:
-            print(f"`Alternate Tag` column found at index {self.alternate_tag_index}.")
-
-        if self.support_until_index == -1:
-            if verbose >= 0:
-                print("`Supported Until` column not found.")
-            success = False
-        elif verbose >= 1:
-            print(f"`Supported Until` column found at index {self.support_until_index}.")
-
-        return success
-
-    def _pe(self, elem: xml.etree.ElementTree.Element) -> None:
-        """
-        Parse the HTML table.
-
-        Arguments:
-            elem: The XML element
-        """
-        if elem.tag == "th":
-            assert elem.text is not None
-            self.headers.append(elem.text)
-        if elem.tag == "tr":
-            self._row = []
-            self.data.append(self._row)
-        if elem.tag == "td":
-            self._row.append(elem.text)  # type: ignore
-        for element in list(elem):
-            self._pe(element)