qontract-reconcile 0.10.2.dev49__py3-none-any.whl → 0.10.2.dev51__py3-none-any.whl

{qontract_reconcile-0.10.2.dev49.dist-info → qontract_reconcile-0.10.2.dev51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev49
+Version: 0.10.2.dev51
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev49.dist-info → qontract_reconcile-0.10.2.dev51.dist-info}/RECORD

@@ -599,7 +599,7 @@ reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSb
 reconcile/utils/instrumented_wrappers.py,sha256=aAO4q6LMpHjJIaFdrouwCEIEl5u3thCCBPSuoEloC60,1082
 reconcile/utils/jenkins_api.py,sha256=RaKuZmO7_lbI-hE6c_Pq2a6CQdmBVj7BcP2jR68cIbI,7081
 reconcile/utils/jira_client.py,sha256=oWi7rcAP1C59oIBTPg6kRntI25Zm4e7FyvdVYvZ9RZ8,7881
-reconcile/utils/jjb_client.py,sha256=T6G4n2K44nEFqnh-ASzrqiDkJDPnVJoyIyHwH-U9M40,14997
+reconcile/utils/jjb_client.py,sha256=4YqeXEkO4p6QtJE_fkaD1XuLKbe9l3g0W7AVpcjJ3yg,15187
 reconcile/utils/jsonpath.py,sha256=wdxOMqR-GMpQf5vRPWRMqAF7bCiXDBkkcFfY2U4j_tk,5536
 reconcile/utils/jump_host.py,sha256=gi8vGUDgdTVwJvROvRVauFxtL0YAramhbWvG70L7AY8,5137
 reconcile/utils/keycloak.py,sha256=YWSEUGrOVqFaJUk055dKUWpLDPdDRvhcmvR-lfbmxdE,3388
@@ -616,7 +616,7 @@ reconcile/utils/oc_map.py,sha256=ougQ-Wlsa8ymoE_lPQ7g2LlpsUOsHVeRCLYW_6fjeWU,897
 reconcile/utils/ocm_base_client.py,sha256=t5kxhklEqOpenXPkXiwQIk8d3D7hIUndBm5qGusS0bc,6681
 reconcile/utils/openshift_resource.py,sha256=DI-e04f4NqEUFJ_9HzjY-QMhFt7o2XVauM09mzMC5Vs,24716
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
-reconcile/utils/output.py,sha256=xh2Not-Xm97KeRx_J5nc2PP5tDwpDLZBeCrWI0S-al4,2034
+reconcile/utils/output.py,sha256=dj3tE_sj3x8ssnAV6hCGmsRI9ttqUUFsIH1r7RujNA8,2038
 reconcile/utils/pagerduty_api.py,sha256=_24i9S_4X7nlvHb-7clXRE0p1BG4ODjOzKxWO-F9WgI,7627
 reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv9s8ffbTSY,1840
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
@@ -746,18 +746,18 @@ reconcile/utils/unleash/client.py,sha256=YrJnauxjcy1ml7W2AHg7dzIH_fVK_GugoRu7IFm
 reconcile/utils/unleash/server.py,sha256=907gDh9Ee8UxLqusnfpzE-7LUnttB38D4xhVJ0vMf_M,4439
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/app_interface_metrics_exporter.py,sha256=f1qwTmQfEcs98uBVRyBa0k7GQXdiSwd7w1hDVjhdGcQ,2303
-tools/app_interface_reporter.py,sha256=gR2EgHmgSIxzK5xxDW1SduFU6OkPaf2LlAQjhV3NYIg,17623
+tools/app_interface_reporter.py,sha256=0_oq1-mL0UOh1x5G8CoKaEVJqK-XTKE7PX7IbRTovBc,17224
 tools/app_sre_tekton_access_reporter.py,sha256=o9prLUgQpwO3msRWc2as1xT1y9OB3znkpgvLr0Ys8_M,3146
 tools/app_sre_tekton_access_revalidation.py,sha256=66nHEaY-bIqxIhpcmwN8AvQZu6ZXenfkg4Fut0pVZRM,2726
 tools/glitchtip_access_reporter.py,sha256=o01A6b88t3Wie6tj_tJWWVo2J01LxQ_a9giGm4UzEaU,2901
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=157wUZMwEpCkLj68zCJX96AnhEDqoIiMEFK9BKFw5OU,148485
+tools/qontract_cli.py,sha256=j18Tm-jgWSFxjbZGAeuEqng_oJf6klKyugFapoITKDc,152214
 tools/sd_app_sre_alert_report.py,sha256=jQpJdXVID68bSNtJNOGDh0-ei1CfEUS4Itr4MAaBNFA,5062
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=8fG9XU-eEhJ7hKCdQzBcdPpvIJR-8WGkHOgFEulpfYQ,5213
 tools/cli_commands/erv2.py,sha256=VxUlNXllo947UwmtvS-42IeI9x_t_X3MHrrSI3K_GRo,23274
-tools/cli_commands/gpg_encrypt.py,sha256=NhzwN49UN7P5_FJgTUN5A4BIwNbFokIE4lwDax2iP5k,4891
+tools/cli_commands/gpg_encrypt.py,sha256=JWwds_Qg7KhSJMIGUh8TfI5-Jf17iUtmaEi4kWJxfVE,4907
 tools/cli_commands/systems_and_tools.py,sha256=EMHOF1AtUDaoSk0bbjl6oUKYAz4rTZjIBaF-6E6GspM,16816
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/cost_report/aws.py,sha256=JtwDfhaYLfa4Uz1LR6OfSBh_3nBlb90kQq6i3MV_ims,4563
@@ -778,7 +778,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev49.dist-info/METADATA,sha256=wWmWGxP1x0eJkaoCP0dPkmUYEYYHnG3FFPvJxlE4gAs,24665
-qontract_reconcile-0.10.2.dev49.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev49.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev49.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev51.dist-info/METADATA,sha256=Ph2jCMJCtVblXRo35uNM-E14lmcVz4skONoYVLbn9i8,24665
+qontract_reconcile-0.10.2.dev51.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev51.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev51.dist-info/RECORD,,

reconcile/utils/jjb_client.py

@@ -186,7 +186,11 @@ class JJB:  # pylint: disable=too-many-public-methods
                 if equal:
                     continue
 
-            instance, item, _ = f.replace(replace_path + "/", "").split("/")
+            instance, *items, _ = f.replace(replace_path + "/", "").split("/")
+            if len(items) != 1:
+                name = "/".join(items)
+                raise ValueError(f"Invalid job name contains '/' in {instance}: {name}")
+            item = items[0]
             item_type = et.parse(f).getroot().tag
             item_type = item_type.replace("hudson.model.ListView", "view")
             item_type = item_type.replace("project", "job")

reconcile/utils/output.py

@@ -1,9 +1,6 @@
 import json
 import re
-from collections.abc import (
-    Iterable,
-    Mapping,
-)
+from collections.abc import Iterable, Mapping
 
 import yaml
 from tabulate import tabulate
@@ -11,11 +8,11 @@ from tabulate import tabulate
 
 def print_output(
     options: Mapping[str, str | bool],
-    content: list[dict],
+    content: Iterable[dict],
     columns: Iterable[str] = (),
 ) -> str | None:
     if options["sort"]:
-        content.sort(key=lambda c: tuple(c.values()))
+        content = sorted(content, key=lambda c: tuple(c.values()))
     if options.get("to_string"):
         for c in content:
             for k, v in c.items():

tools/app_interface_reporter.py

@@ -2,6 +2,7 @@ import contextlib
 import logging
 import os
 import textwrap
+from collections.abc import Mapping, MutableMapping
 from datetime import (
     UTC,
     datetime,
@@ -38,50 +39,14 @@ DASHDOTDB_SECRET = os.environ.get(
 )
 
 
-def promql(url, query, auth=None):
-    """
-    Run an instant-query on the prometheus instance.
-
-    The returned structure is documented here:
-    https://prometheus.io/docs/prometheus/latest/querying/api/#instant-queries
-
-    :param url: base prometheus url (not the API endpoint).
-    :type url: string
-    :param query: this is a second value
-    :type query: string
-    :param auth: auth object
-    :type auth: requests.auth
-    :return: structure with the metrics
-    :rtype: dictionary
-    """
-
-    url = os.path.join(url, "api/v1/query")
-
-    if auth is None:
-        auth = {}
-
-    params = {"query": query}
-
-    response = requests.get(url, params=params, auth=auth, timeout=60)
-
-    response.raise_for_status()
-    response = response.json()
-
-    # TODO ensure len response == 1
-    return response["data"]["result"]
-
-
 class Report:
-    def __init__(self, app, date):
+    def __init__(self, app: Mapping, date: datetime) -> None:
         settings = queries.get_app_interface_settings()
         self.secret_reader = SecretReader(settings=settings)
-        # standard date format
-        if hasattr(date, "strftime"):
-            date = date.strftime("%Y-%m-%d")
-
         self.app = app
-        self.date = date
-        self.report_sections = {}
+        # standard date format
+        self.date = date.strftime("%Y-%m-%d")
+        self.report_sections: dict = {}
 
         # promotions
         self.add_report_section("promotions", self.app.get("promotions"))
@@ -108,10 +73,10 @@ class Report:
         )
 
     @property
-    def path(self):
-        return "data/reports/{}/{}.yml".format(self.app["name"], self.date)
+    def path(self) -> str:
+        return f"data/reports/{self.app['name']}/{self.date}.yml"
 
-    def content(self):
+    def content(self) -> dict:
         return {
             "$schema": "/app-sre/report-1.yml",
             "labels": {"app": self.app["name"]},
@@ -122,21 +87,20 @@ class Report:
             "content": yaml.safe_dump(self.report_sections, sort_keys=False),
         }
 
-    def to_yaml(self):
+    def to_yaml(self) -> str:
         return yaml.safe_dump(self.content(), sort_keys=False)
 
-    def to_message(self):
+    def to_message(self) -> dict:
         return {"file_path": self.path, "content": self.to_yaml()}
 
-    def add_report_section(self, header, content):
-        if not content:
-            content = None
-
-        self.report_sections[header] = content
+    def add_report_section(self, header: str, content: list[dict] | None) -> None:
+        self.report_sections[header] = content or None
 
     @staticmethod
-    def get_vulnerability_content(container_vulnerabilities):
-        parsed_metrics = []
+    def get_vulnerability_content(
+        container_vulnerabilities: Mapping | None,
+    ) -> list[dict]:
+        parsed_metrics: list[dict] = []
         if not container_vulnerabilities:
             return parsed_metrics
 
@@ -150,8 +114,8 @@ class Report:
         return parsed_metrics
 
     @staticmethod
-    def get_post_deploy_jobs_content(post_deploy_jobs):
-        results = []
+    def get_post_deploy_jobs_content(post_deploy_jobs: Mapping | None) -> list[dict]:
+        results: list[dict] = []
         if not post_deploy_jobs:
             return results
 
@@ -165,8 +129,8 @@ class Report:
         return results
 
     @staticmethod
-    def get_validations_content(deployment_validations):
-        parsed_metrics = []
+    def get_validations_content(deployment_validations: Mapping | None) -> list[dict]:
+        parsed_metrics: list[dict] = []
         if not deployment_validations:
             return parsed_metrics
 
@@ -180,8 +144,8 @@ class Report:
         return parsed_metrics
 
     @staticmethod
-    def get_slo_content(service_slo):
-        parsed_metrics = []
+    def get_slo_content(service_slo: Mapping | None) -> list[dict]:
+        parsed_metrics: list[dict] = []
         if not service_slo:
             return parsed_metrics
 
@@ -200,7 +164,7 @@ class Report:
         return parsed_metrics
 
     @staticmethod
-    def get_activity_content(activity):
+    def get_activity_content(activity: Mapping) -> list[dict]:
         if not activity:
             return []
 
@@ -214,7 +178,9 @@ class Report:
         ]
 
 
-def get_apps_data(date, month_delta=1, thread_pool_size=10):
+def get_apps_data(
+    date: datetime, month_delta: int = 1, thread_pool_size: int = 10
+) -> list[dict]:
     settings = queries.get_app_interface_settings()
     secret_reader = SecretReader(settings)
 
@@ -297,9 +263,9 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
             if namespace["app"]["name"] != app["name"]:
                 continue
             app_namespaces.append(namespace)
-        vuln_mx = {}
-        validt_mx = {}
-        slo_mx = {}
+        vuln_mx: dict = {}
+        validt_mx: dict = {}
+        slo_mx: dict = {}
         for family in text_string_to_metric_families(vuln_metrics):
             for sample in family.samples:
                 if sample.name == "imagemanifestvuln_total":
@@ -375,7 +341,7 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
     return apps
 
 
-def get_build_history(job):
+def get_build_history(job: MutableMapping) -> MutableMapping:
     try:
         logging.info(f"getting build history for {job['name']}")
         job["build_history"] = job["jenkins"].get_build_history(
@@ -386,7 +352,9 @@ def get_build_history(job):
     return job
 
 
-def get_build_history_pool(jenkins_map, jobs, timestamp_limit, thread_pool_size):
+def get_build_history_pool(
+    jenkins_map: Mapping, jobs: Mapping, timestamp_limit: int, thread_pool_size: int
+) -> dict:
     history_to_get = []
     for instance, _jobs in jobs.items():
         jenkins = jenkins_map[instance]
@@ -411,7 +379,7 @@ def get_build_history_pool(jenkins_map, jobs, timestamp_limit, thread_pool_size)
     return history
 
 
-def get_repo_url(job):
+def get_repo_url(job: Mapping) -> str:
     repo_url_raw = job["properties"][0]["github"]["url"]
     return repo_url_raw.strip("/").replace(".git", "")
 
@@ -424,8 +392,13 @@ def get_repo_url(job):
 @gitlab_project_id
 @click.option("--reports-path", help="path to write reports")
 def main(
-    configfile, dry_run, log_level, gitlab_project_id, reports_path, thread_pool_size
-):
+    configfile: str,
+    dry_run: bool,
+    log_level: str,
+    gitlab_project_id: str,
+    reports_path: str,
+    thread_pool_size: int,
+) -> None:
     init_env(log_level=log_level, config_file=configfile)
 
     now = datetime.now()
@@ -476,8 +449,9 @@ def main(
             gitlab_project_id=gitlab_project_id, sqs_or_gitlab="gitlab"
         ) as mr_cli:
             result = mr.submit(cli=mr_cli)
-        logging.info(["created_mr", result.web_url])
+        if result:
+            logging.info(["created_mr", result.web_url])
 
 
 if __name__ == "__main__":
-    main()  # pylint: disable=no-value-for-parameter
+    main()

tools/cli_commands/gpg_encrypt.py

@@ -132,7 +132,7 @@ class GPGEncryptCommand:
 
         return user["public_gpg_key"]
 
-    def _output(self, content: str):
+    def _output(self, content: str) -> None:
         output = self._command_data.output
         if not output:
             print(content)
@@ -140,7 +140,7 @@ class GPGEncryptCommand:
         with open(output, "w", encoding="locale") as f:
             f.write(content)
 
-    def execute(self):
+    def execute(self) -> None:
         secret = self._fetch_secret()
         gpg_key = self._get_gpg_key()
         encrypted_content = gpg.gpg_encrypt(