c2cciutils 1.7.0.dev2__py3-none-any.whl → 1.7.0.dev6__py3-none-any.whl

c2cciutils/applications-versions.yaml

@@ -1,3 +1,4 @@
 # https://docs.renovatebot.com/modules/datasource/#github-releases-datasource
 k3d-io/k3d: v5.5.2 # github-releases
 postgresql: 12.8.5 # helm - https://charts.bitnami.com/bitnami
+helm/chart-releaser: v1.6.0 # github-releases

c2cciutils/applications.yaml

@@ -9,3 +9,14 @@ k3d-io/k3d:
       - k3d
     - - k3d
       - --version
+helm/chart-releaser:
+  get-file-name: chart-releaser_{short_version}_linux_amd64.tar.gz
+  type: tar
+  tar-file-name: cr
+  to-file-name: cr
+  finish-commands:
+    - - chmod
+      - +x
+      - cr
+    - - cr
+      - version

c2cciutils/publish.py

@@ -337,7 +337,6 @@ def docker(
     image_config: c2cciutils.configuration.PublishDockerImage,
     tag_src: str,
     tag_dst: str,
-    latest: bool,
     alt_tags: list[str],
     images_full: list[str],
 ) -> bool:
@@ -378,17 +377,6 @@ def docker(
                 check=True,
             )
             new_images_full.append(f"{config['server']}/{image_config['name']}:{tag_dst}")
-            if latest:
-                subprocess.run(
-                    [
-                        "docker",
-                        "tag",
-                        f"{image_config['name']}:{tag_src}",
-                        f"{config['server']}/{image_config['name']}:{tag_src}",
-                    ],
-                    check=True,
-                )
-                new_images_full.append(f"{config['server']}/{image_config['name']}:{tag_src}")
             for alt_tag in alt_tags:
                 subprocess.run(
                     [
@@ -412,18 +400,17 @@ def docker(
                     check=True,
                 )
             new_images_full.append(f"{image_config['name']}:{tag_dst}")
-            if latest and tag_src != tag_dst:
-                new_images_full.append(f"{image_config['name']}:{tag_src}")
             for alt_tag in alt_tags:
-                subprocess.run(
-                    [
-                        "docker",
-                        "tag",
-                        f"{image_config['name']}:{tag_src}",
-                        f"{image_config['name']}:{alt_tag}",
-                    ],
-                    check=True,
-                )
+                if tag_src != alt_tag:
+                    subprocess.run(
+                        [
+                            "docker",
+                            "tag",
+                            f"{image_config['name']}:{tag_src}",
+                            f"{image_config['name']}:{alt_tag}",
+                        ],
+                        check=True,
+                    )
                 new_images_full.append(f"{image_config['name']}:{alt_tag}")
 
         for image in new_images_full:

c2cciutils/scripts/download_applications.py

@@ -7,7 +7,7 @@ import tarfile
 import urllib
 from glob import glob
 from io import BytesIO
-from typing import cast
+from typing import Optional, cast
 
 import requests
 import yaml
@@ -38,7 +38,7 @@ def main() -> None:
     download_applications(applications, versions)
 
 
-def download_c2cciutils_applications() -> None:
+def download_c2cciutils_applications(name: Optional[str] = None) -> None:
     """Download the applications defined in the c2cciutils package."""
     with open(
         os.path.join(os.path.dirname(os.path.dirname(__file__)), "applications-versions.yaml"),
@@ -51,6 +51,8 @@ def download_c2cciutils_applications() -> None:
         applications = cast(
             applications_definition.ApplicationsConfiguration, yaml.load(config_file, Loader=yaml.SafeLoader)
         )
+    if name is not None:
+        applications = {name: applications[name]}
     download_applications(applications, versions)
 
 

c2cciutils/scripts/k8s/install.py

@@ -22,7 +22,7 @@ def main() -> None:
     config = c2cciutils.get_config()
 
     _print("::group::Install")
-    c2cciutils.scripts.download_applications.download_c2cciutils_applications()
+    c2cciutils.scripts.download_applications.download_c2cciutils_applications("k3d-io/k3d")
     _print("::endgroup::")
 
     _print("::group::Create cluster")

c2cciutils/scripts/publish.py

@@ -9,7 +9,6 @@ import os
 import re
 import subprocess  # nosec
 import sys
-import tarfile
 from re import Match
 from typing import Optional, cast
 
@@ -193,7 +192,6 @@ def main() -> None:
         config.get("publish", {}).get("docker", {}) if config.get("publish", {}).get("docker", False) else {},
     )
     if docker_config:
-        latest = False
         full_repo = c2cciutils.get_repository()
         full_repo_split = full_repo.split("/")
         master_branch, _ = c2cciutils.get_master_branch(full_repo_split)
@@ -216,7 +214,6 @@ def main() -> None:
 
         security = c2cciutils.security.Security(security_text)
         version_index = security.headers.index("Version")
-        latest = security.data[-1][version_index] == version
 
         row_index = -1
         for index, row in enumerate(security.data):
@@ -224,10 +221,12 @@ def main() -> None:
                 row_index = index
                 break
 
-        alt_tags = []
+        alt_tags = set()
         if "Alternate Tag" in security.headers:
             tag_index = security.headers.index("Alternate Tag")
-            alt_tags = security.data[row_index][tag_index].split(",")
+            alt_tags = {t.strip() for t in security.data[row_index][tag_index].split(",")}
+        if security.data[-1][version_index] == version:
+            alt_tags.add("latest")
 
         images_src: set[str] = set()
         images_full: list[str] = []
@@ -285,22 +284,13 @@ def main() -> None:
 
                                 if args.dry_run:
                                     print(f"Publishing {image_dst} to {name}, skipping (dry run)")
-                                    if latest:
-                                        print(f"Publishing {image_source} to {name}, skipping (dry run)")
                                     for alt_tag in current_alt_tag:
                                         print(
                                             f"Publishing {image_conf['name']}:{alt_tag} to {name}, skipping (dry run)"
                                         )
                                 else:
                                     success &= c2cciutils.publish.docker(
-                                        conf,
-                                        name,
-                                        image_conf,
-                                        tag_src,
-                                        tag_dst,
-                                        latest,
-                                        current_alt_tag,
-                                        images_full,
+                                        conf, name, image_conf, tag_src, tag_dst, current_alt_tag, images_full
                                     )
 
                     if google_calendar_publish:
@@ -405,12 +395,7 @@ def main() -> None:
         config.get("publish", {}).get("helm", {}) if config.get("publish", {}).get("helm", False) else {},
     )
     if helm_config and helm_config["folders"] and version_type in helm_config.get("versions", []):
-        url = "https://github.com/helm/chart-releaser/releases/download/v1.2.1/chart-releaser_1.2.1_linux_amd64.tar.gz"
-        response = requests.get(url, stream=True, timeout=int(os.environ.get("C2CCIUTILS_TIMEOUT", "30")))
-        with tarfile.open(fileobj=response.raw, mode="r:gz") as file:
-            filename_re = re.compile(r"^[a-zA-Z0-9][a-zA-Z0-9._/-]*$")
-            members = [member for member in file.getmembers() if filename_re.match(member.name) is not None]
-            file.extractall(path=os.path.expanduser("~/.local/bin"), members=members)  # nosec
+        c2cciutils.scripts.download_applications.download_c2cciutils_applications("helm/chart-releaser")
 
         owner, repo = full_repo_split
         commit_sha = (

{c2cciutils-1.7.0.dev2.dist-info → c2cciutils-1.7.0.dev6.dist-info}/METADATA

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

{c2cciutils-1.7.0.dev2.dist-info → c2cciutils-1.7.0.dev6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 c2cciutils/__init__.py,sha256=7I1DBWTIacQmf-BWioEyY7Zwf8S-OK3hntXq2UNF_RM,18227
-c2cciutils/applications-versions.yaml,sha256=MgufOCdsIMRY7FMvAIqE0Oqvb8FJC1dBXCg9OrOTe5s,178
-c2cciutils/applications.yaml,sha256=4xryw7rIRz9ytT6xj71GEVlXQmuFuN8XjshJWsvsvNU,283
+c2cciutils/applications-versions.yaml,sha256=PxrLqMlg46X3VMfeas_dEfIEHgQhN_m5kNvPXRTXeSQ,224
+c2cciutils/applications.yaml,sha256=yn0XRi08cS29A_jXPofcBPxsGBv7PEBliztjRC3WtfM,504
 c2cciutils/applications_definition.py,sha256=MdQVc_yYCcYmGP2dpaaWjn7-MqU5CaiyncjoajWbaTQ,1220
 c2cciutils/audit.py,sha256=PHF_WWmNwEVXjWvlaz8aLGjnxmX6I-SmgJOWLvtTkJg,9028
 c2cciutils/branches.graphql,sha256=UZrj1RO-H527M1SKqWm1VnkWtNsuKTnPTf4BCU2YcOU,358
@@ -555,7 +555,7 @@ c2cciutils/node_modules/yallist/yallist.js,sha256=aaEPcm0m-NgEo96urInwEG3foD1XbR
 c2cciutils/package-lock.json,sha256=oo8vIQMt8di2MB8wVk76yQUXQ5mQXV7CcuWAmJivrZM,14545
 c2cciutils/package.json,sha256=zlbbc0gNAj7nNmW0VXydTuu9GPpSmqGg0-wdtubgcoY,134
 c2cciutils/pr_checks.py,sha256=AQxfojIja5RbGgixVWtfMQ4vyuAYjILpv2rLGGfDbkE,10100
-c2cciutils/publish.py,sha256=LLbbZGOjxogGdt7lzNUZtxzZWYxMb1I6XxUZHgT-cMQ,18670
+c2cciutils/publish.py,sha256=GB1UaJ0PmIcfRoTl5fQWOcK6RUDoo2woU96K_JgAPbI,18154
 c2cciutils/schema-applications.json,sha256=Uc-U2xER-FrR67ec-67K2C9kvHFO7hBlAEAQhrdUKoA,1548
 c2cciutils/schema.json,sha256=oeOy4cjyBgmGmd_h5FmVEELul8QvA1CuI0ORD1plVns,22561
 c2cciutils/scripts/__init__.py,sha256=N4tcdvUifXQrK9vEvFWrGvoyY9oZ0uRcjb-FoYe41cc,36
@@ -563,22 +563,22 @@ c2cciutils/scripts/audit.py,sha256=MUQqpA8CNkbSyK5e0HiSC5w-4GPKYEqFgV82lIwKkQk,1
 c2cciutils/scripts/clean.py,sha256=tpyipZjqK7om9_dNiLxvz6-l6le7N0L03inkrKe7Y_A,3039
 c2cciutils/scripts/docker_logs.py,sha256=OoTstW3oUVpICASgLTCYfjDtgcuYMJxWDcy2pXyr6tE,1712
 c2cciutils/scripts/docker_versions_gen.py,sha256=M_VzKlhqsmUwd9GgPIU9EW6eCmMmytkJQEhOFjYVZl4,1316
-c2cciutils/scripts/download_applications.py,sha256=GJL-NznDQXgYXkO3ofKpFhDPlx7AbVoWXaORlVD8Uas,4379
+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
 c2cciutils/scripts/k8s/db.py,sha256=GK1tzzyCqrCyIJzcBdIXjyNJUXrBPFNa-9fdtwxyrlU,3268
-c2cciutils/scripts/k8s/install.py,sha256=dP6uECuNp8eUAOb3lEtVYrD5IK8v_assEQloJBHnHc8,921
+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/pin_pipenv.py,sha256=jBTwlolcEL0MUyq6VYzO-adkcL1gqN7B3kBb3UjTo2k,2150
 c2cciutils/scripts/pr_checks.py,sha256=lhCt7COlqSm26ue1xNSx4zReTA-Nxj3wHA0a8GEU-MU,2182
-c2cciutils/scripts/publish.py,sha256=Q-s41yBTGOxUgGsTi8_8hCGXGgL21SYDwD4B6Utx1FQ,19679
+c2cciutils/scripts/publish.py,sha256=fJLlE2O7FN3tWC63es4VRxg0oHI-cAZrzS3ri6mA0F4,18786
 c2cciutils/scripts/trigger_image_update.py,sha256=UPCSgFcllewo1NOC7kUkJ2QMXU0dCA2QAq6LFQHr0Uw,2780
 c2cciutils/scripts/version.py,sha256=gqg4l5Lm3ttdIziB2GKPiXn5gDsQboRa_KyiF4lIWf0,7630
 c2cciutils/security.py,sha256=X4qI1xhKoeRVRSpHV5VHNgYpEYkLHiC7D3XFdtlDAVQ,1511
-c2cciutils-1.7.0.dev2.dist-info/entry_points.txt,sha256=jPDp7KeB0Fz_TpOwbOODeW2WEcdLNJZACPtKpRqtHs4,1030
-c2cciutils-1.7.0.dev2.dist-info/LICENSE,sha256=pK1gU5i1jYBv--vi5omcf6-86pYmAWk6ZGbdERjAgcw,1307
-c2cciutils-1.7.0.dev2.dist-info/WHEEL,sha256=gSF7fibx4crkLz_A-IKR6kcuq0jJ64KNCkG8_bcaEao,88
-c2cciutils-1.7.0.dev2.dist-info/METADATA,sha256=OMyIx1le42lV572oDi9o-lTNB4z-lmMROOkTC7zDVWk,19656
-c2cciutils-1.7.0.dev2.dist-info/RECORD,,
+c2cciutils-1.7.0.dev6.dist-info/entry_points.txt,sha256=jPDp7KeB0Fz_TpOwbOODeW2WEcdLNJZACPtKpRqtHs4,1030
+c2cciutils-1.7.0.dev6.dist-info/LICENSE,sha256=pK1gU5i1jYBv--vi5omcf6-86pYmAWk6ZGbdERjAgcw,1307
+c2cciutils-1.7.0.dev6.dist-info/WHEEL,sha256=gSF7fibx4crkLz_A-IKR6kcuq0jJ64KNCkG8_bcaEao,88
+c2cciutils-1.7.0.dev6.dist-info/METADATA,sha256=uLiJTOu3TC5ZEOhz6BBEQGCAQ_9nz_qKAlYsS8jM4F4,19656
+c2cciutils-1.7.0.dev6.dist-info/RECORD,,