c2cciutils 1.7.0.dev285__py3-none-any.whl → 1.7.0.dev289__py3-none-any.whl

c2cciutils/audit.py

@@ -2,8 +2,6 @@
 The auditing functions.
 """
 
-import datetime
-import json
 import os.path
 import subprocess  # nosec
 import sys
@@ -176,59 +174,3 @@ def snyk(
         )
 
     return install_success and test_success and not has_diff
-
-
-def outdated_versions(
-    config: None,
-    full_config: c2cciutils.configuration.Configuration,
-    args: Namespace,
-) -> bool:
-    """
-    Check that the versions from the SECURITY.md are not outdated.
-
-    Arguments:
-        config: The audit section config
-        full_config: All the CI config
-        args: The parsed command arguments
-    """
-    del config, full_config
-
-    repo = c2cciutils.get_repository().split("/")
-    json_response = c2cciutils.graphql(
-        "default_branch.graphql",
-        {"name": repo[1], "owner": repo[0]},
-    )
-
-    if "errors" in json_response:
-        raise RuntimeError(json.dumps(json_response["errors"], indent=2))
-    if json_response["repository"]["defaultBranchRef"]["name"] != c2cciutils.get_branch(args.branch):
-        return True
-
-    success = True
-
-    if not os.path.exists("SECURITY.md"):
-        return True
-
-    with open("SECURITY.md", encoding="utf-8") as security_file:
-        security = security_md.Security(security_file.read())
-
-    version_index = security.version_index
-    date_index = security.support_until_index
-
-    for row in security.data:
-        str_date = row[date_index]
-        if str_date not in (
-            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.error(
-                    "versions",
-                    f"The version '{row[version_index]}' is outdated, it can be set to "
-                    "'Unsupported', 'Best effort' or 'To be defined'",
-                    "SECURITY.md",
-                )
-                success = False
-    return success

c2cciutils/configuration.py

@@ -4,7 +4,7 @@ Automatically generated file from a JSON schema.
 
 from typing import Any, Literal, TypedDict, Union
 
-AUDIT_DEFAULT = {"snyk": True, "outdated_versions": True}
+AUDIT_DEFAULT = {"snyk": True}
 """ Default value of the field path 'configuration audit' """
 
 
@@ -43,17 +43,9 @@ class Audit(TypedDict, total=False):
     The audit configuration
 
     default:
-      outdated_versions: true
       snyk: true
     """
 
-    outdated_versions: "AuditOutdatedVersions"
-    """
-    Audit outdated versions.
-
-    Audit of outdated version
-    """
-
     snyk: "AuditWithSnyk"
     """
     Audit with Snyk.
@@ -65,14 +57,6 @@ class Audit(TypedDict, total=False):
     """
 
 
-AuditOutdatedVersions = bool
-"""
-Audit outdated versions.
-
-Audit of outdated version
-"""
-
-
 class AuditSnykConfig(TypedDict, total=False):
     """
     Audit Snyk config.
@@ -242,7 +226,6 @@ Configuration = TypedDict(
         # | The audit configuration
         # |
         # | default:
-        # |   outdated_versions: true
         # |   snyk: true
         "audit": "Audit",
         # | Pull request checks.

c2cciutils/schema.json

@@ -6,11 +6,6 @@
   "description": "C2C CI utils configuration file",
   "additionalProperties": false,
   "definitions": {
-    "audit_outdated_versions": {
-      "title": "Audit outdated versions",
-      "description": "Audit of outdated version",
-      "type": "boolean"
-    },
     "audit_snyk": {
       "title": "Audit with Snyk",
       "description": "The audit Snyk configuration",
@@ -509,11 +504,9 @@
       "description": "The audit configuration",
       "type": "object",
       "default": {
-        "snyk": true,
-        "outdated_versions": true
+        "snyk": true
       },
       "properties": {
-        "outdated_versions": { "$ref": "#/definitions/audit_outdated_versions" },
         "snyk": { "$ref": "#/definitions/audit_snyk" }
       }
     },

c2cciutils/scripts/publish.py

@@ -390,13 +390,18 @@ def main() -> None:
             dpkg_success &= c2cciutils.lib.docker.check_versions(versions_config.get(image, {}), image)
 
         if not dpkg_success:
-            current_versions_in_images = {}
+            current_versions_in_images: dict[str, dict[str, str]] = {}
             if dpkg_config_found:
                 with open("ci/dpkg-versions.yaml", encoding="utf-8") as dpkg_versions_file:
                     current_versions_in_images = yaml.load(dpkg_versions_file, Loader=yaml.SafeLoader)
             for image in images_src:
                 _, versions_image = c2cciutils.lib.docker.get_dpkg_packages_versions(image)
-                current_versions_in_images[image] = {k: str(v) for k, v in versions_image.items()}
+                for dpkg_package, package_version in versions_image.items():
+                    if dpkg_package not in current_versions_in_images[image]:
+                        current_versions_in_images[image][dpkg_package] = str(package_version)
+                for dpkg_package in current_versions_in_images[image].keys():
+                    if dpkg_package not in versions_image:
+                        del current_versions_in_images[image][dpkg_package]
             if dpkg_config_found:
                 print(
                     "::error::Some packages are have a greater version in the config raster then in the image."

{c2cciutils-1.7.0.dev285.dist-info → c2cciutils-1.7.0.dev289.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cciutils
-Version: 1.7.0.dev285
+Version: 1.7.0.dev289
 Summary: Common utilities for Camptocamp CI
 Home-page: https://github.com/camptocamp/c2cciutils
 License: FreeBSD

{c2cciutils-1.7.0.dev285.dist-info → c2cciutils-1.7.0.dev289.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=T2pNVumr-N5qZOsDvAP48SarNUvQP7OdAnbeZuEYwwQ,7384
+c2cciutils/audit.py,sha256=-WIinz3U6u3-JBQ2ltyuU95UWczLiwUyMuqHYczFKas,5571
 c2cciutils/branches.graphql,sha256=UZrj1RO-H527M1SKqWm1VnkWtNsuKTnPTf4BCU2YcOU,358
 c2cciutils/commits.graphql,sha256=3HAuIEig5V7j1L-6mqBaOkiTD3Fb8_gl1ilpZjPJf74,308
-c2cciutils/configuration.py,sha256=-jX3R2tkIy0vSNjbX_iNL3DwRAqPJgSNAJoItI2JXRM,28167
+c2cciutils/configuration.py,sha256=yGv9L9OVAMb1Rnxt4NKf92pLNl7zHnbXeyUgKnhE2Vs,27857
 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,13 +14,12 @@ 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=UjKdtlMj7gIcKhkkOPm7zRkyT4Q5eYSPjqXjm9wx6GY,23114
+c2cciutils/schema.json,sha256=zKRqIjpNg6H2kvuixP64CK5CAJFhyu-_aUEub0_rAqc,22841
 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
 c2cciutils/scripts/docker_logs.py,sha256=lcOLJzme0NpFQSqoz0cKL8Hqcr_7a3POh0hp8TKAh6A,1715
 c2cciutils/scripts/docker_versions_gen.py,sha256=M_VzKlhqsmUwd9GgPIU9EW6eCmMmytkJQEhOFjYVZl4,1316
-c2cciutils/scripts/docker_versions_update.py,sha256=6AwBXoMqWzocF5yas09VCOWACA3JtIo-_Q3KBFaO3Qs,3511
 c2cciutils/scripts/download_applications.py,sha256=Lxnm2XJSfDtZc47xUtJQx52N2tIARYioTvPEXKOMMJ0,4490
 c2cciutils/scripts/env.py,sha256=4AmCZa2NPF1TaPrzpk5DnrCrMO_cWbFjKK3IM3XSg8s,375
 c2cciutils/scripts/k8s/__init__.py,sha256=ESPfnAzxPBK-TXColaFlz0OxAouX_fHV8MDamhVEsYw,69
@@ -31,11 +30,11 @@ c2cciutils/scripts/k8s/wait.py,sha256=qzQn6hbB9p1CX4bUxrkukPnbu_p6oRNem29WiMtplN
 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=D-J-GwkJ5sxVCANSGBolcoZ7cVyU5aqwixD1T1sqaZw,19922
+c2cciutils/scripts/publish.py,sha256=4bFgsaUssKrP_N7lG9FILalQ2oexyxCCcC1ofqcxqTU,20313
 c2cciutils/scripts/trigger_image_update.py,sha256=UPCSgFcllewo1NOC7kUkJ2QMXU0dCA2QAq6LFQHr0Uw,2780
 c2cciutils/scripts/version.py,sha256=BU6I3nG3ofgUXCLrUBNOql45Dz9Loox4gt4ebHRM3iQ,8912
-c2cciutils-1.7.0.dev285.dist-info/LICENSE,sha256=pK1gU5i1jYBv--vi5omcf6-86pYmAWk6ZGbdERjAgcw,1307
-c2cciutils-1.7.0.dev285.dist-info/METADATA,sha256=NnSJy3UjEHH9o5JeN7qDgInK2AMM_k72HdaPzNck1uM,18524
-c2cciutils-1.7.0.dev285.dist-info/entry_points.txt,sha256=qB_mezKHsYy5j11RAhsEB_gPVZC2BebEvfT5Giu_D7s,1111
-c2cciutils-1.7.0.dev285.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-c2cciutils-1.7.0.dev285.dist-info/RECORD,,
+c2cciutils-1.7.0.dev289.dist-info/LICENSE,sha256=pK1gU5i1jYBv--vi5omcf6-86pYmAWk6ZGbdERjAgcw,1307
+c2cciutils-1.7.0.dev289.dist-info/METADATA,sha256=mQwHNY7jSPbvdDeEIbPEVeXLmMb4aknYd0-8kQGW5F8,18524
+c2cciutils-1.7.0.dev289.dist-info/entry_points.txt,sha256=jPDp7KeB0Fz_TpOwbOODeW2WEcdLNJZACPtKpRqtHs4,1030
+c2cciutils-1.7.0.dev289.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+c2cciutils-1.7.0.dev289.dist-info/RECORD,,

{c2cciutils-1.7.0.dev285.dist-info → c2cciutils-1.7.0.dev289.dist-info}/entry_points.txt

@@ -5,7 +5,6 @@ c2cciutils-checks=c2cciutils.scripts.env:main
 c2cciutils-clean=c2cciutils.scripts.clean:main
 c2cciutils-docker-logs=c2cciutils.scripts.docker_logs:main
 c2cciutils-docker-versions-gen=c2cciutils.scripts.docker_versions_gen:main
-c2cciutils-docker-versions-update=c2cciutils.scripts.docker_versions_update:main
 c2cciutils-download-applications=c2cciutils.scripts.download_applications:main
 c2cciutils-env=c2cciutils.scripts.env:main
 c2cciutils-google-calendar=c2cciutils.publish:main_calendar

c2cciutils/scripts/docker_versions_update.py

@@ -1,85 +0,0 @@
-import argparse
-import re
-import subprocess  # nosec
-import sys
-
-import yaml
-
-import c2cciutils
-
-
-def main() -> None:
-    """Update the version of packages in the file ci/dpkg-versions.yaml."""
-
-    argparser = argparse.ArgumentParser(
-        description="Update the version of packages in the file ci/dpkg-versions.yaml."
-    )
-    argparser.add_argument("--branch", help="The branch to audit, not defined means autodetect")
-    args = argparser.parse_args()
-
-    cache: dict[str, dict[str, str]] = {}
-    with open("ci/dpkg-versions.yaml", encoding="utf-8") as versions_file:
-        versions_config = yaml.load(versions_file, Loader=yaml.SafeLoader)
-        for versions in versions_config.values():
-            for package_full in versions.keys():
-                dist, package = package_full.split("/")
-                if dist not in cache:
-                    correspondence = {
-                        "ubuntu_22_04": ("ubuntu", "22.04"),
-                        "debian_11": ("debian", "11"),
-                        "debian_12": ("debian", "12"),
-                    }
-                    if dist in correspondence:
-                        images, tag = correspondence[dist]
-                        subprocess.run(
-                            ["docker", "rm", "--force", "apt"], stderr=subprocess.DEVNULL, check=False
-                        )
-                        subprocess.run(
-                            [
-                                "docker",
-                                "run",
-                                "--tty",
-                                "--interactive",
-                                "--detach",
-                                "--name=apt",
-                                "--entrypoint=",
-                                f"{images}:{tag}",
-                                "tail",
-                                "--follow",
-                                "/dev/null",
-                            ],
-                            check=True,
-                        )
-
-                        subprocess.run(["docker", "exec", "apt", "apt-get", "update"], check=True)
-
-                        package_re = re.compile(r"^([^ /]+)/[a-z-,]+ ([^ ]+) (all|amd64)( .*)?$")
-                        proc = subprocess.run(
-                            ["docker", "exec", "apt", "apt", "list"], check=True, stdout=subprocess.PIPE
-                        )
-                        for proc_line in proc.stdout.decode("utf-8").split("\n"):
-                            package_match = package_re.match(proc_line)
-                            if package_match is None:
-                                print(f"not matching: {proc_line}")
-                                continue
-                            cache.setdefault(dist, {})[package_match.group(1)] = package_match.group(2)
-
-                        subprocess.run(["docker", "rm", "--force", "apt"], check=True)
-
-                if package in cache[dist]:
-                    versions[package_full] = cache[dist][package]
-
-    with open("ci/dpkg-versions.yaml", "w", encoding="utf-8") as versions_file:
-        yaml.dump(versions_config, versions_file, Dumper=yaml.SafeDumper)
-
-    current_branch = c2cciutils.get_branch(args.branch)
-    has_diff = c2cciutils.create_pull_request_if_needed(
-        current_branch, f"dpkg-update/{current_branch}", "Update dpkg package versions"
-    )
-    if has_diff:
-        print("There is a diff, please check the pull request")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()