qontract-reconcile 0.10.2.dev294__py3-none-any.whl → 0.10.2.dev296__py3-none-any.whl

reconcile/utils/ocm/ocm.py

@@ -403,7 +403,7 @@ class OCM:
         api = (
             f"{CS_API_BASE}/v1/clusters/{cluster_id}" + "/external_configuration/labels"
         )
-        items = self._get_json(api).get("items")
+        items = self._get_json(api).get("items", [])
         item = [item for item in items if label.items() <= item.items()]
         if not item:
             return
@@ -597,14 +597,14 @@ class OCM:
     def _init_addons(self):
         """Returns a list of Addons"""
         api = f"{CS_API_BASE}/v1/addons"
-        self.addons = self._get_json(api).get("items")
+        self.addons = self._get_json(api).get("items", [])
 
     def _init_version_gates(self):
         """Returns a list of version gates"""
         if self.version_gates:
             return
         api = f"{CS_API_BASE}/v1/version_gates"
-        self.version_gates = self._get_json(api).get("items")
+        self.version_gates = self._get_json(api).get("items", [])
 
     def get_addon(self, id):
         for addon in self.addons:

tools/app_interface_reporter.py

@@ -275,17 +275,17 @@ def get_apps_data(
                         cluster = sample.labels["cluster"]
                         if app_namespace["cluster"]["name"] != cluster:
                             continue
-                        namespace = sample.labels["namespace"]
-                        if app_namespace["name"] != namespace:
+                        sample_namespace = sample.labels["namespace"]
+                        if app_namespace["name"] != sample_namespace:
                             continue
                         severity = sample.labels["severity"]
                         if cluster not in vuln_mx:
                             vuln_mx[cluster] = {}
-                        if namespace not in vuln_mx[cluster]:
-                            vuln_mx[cluster][namespace] = {}
-                        if severity not in vuln_mx[cluster][namespace]:
+                        if sample_namespace not in vuln_mx[cluster]:
+                            vuln_mx[cluster][sample_namespace] = {}
+                        if severity not in vuln_mx[cluster][sample_namespace]:
                             value = int(sample.value)
-                            vuln_mx[cluster][namespace][severity] = value
+                            vuln_mx[cluster][sample_namespace][severity] = value
         for family in text_string_to_metric_families(validt_metrics):
             for sample in family.samples:
                 if sample.name == "deploymentvalidation_total":
@@ -293,8 +293,8 @@ def get_apps_data(
                         cluster = sample.labels["cluster"]
                         if app_namespace["cluster"]["name"] != cluster:
                             continue
-                        namespace = sample.labels["namespace"]
-                        if app_namespace["name"] != namespace:
+                        sample_namespace = sample.labels["namespace"]
+                        if app_namespace["name"] != sample_namespace:
                             continue
                         validation = sample.labels["validation"]
                         # dvo: fail == 1, pass == 0, py: true == 1, false == 0
@@ -302,14 +302,19 @@ def get_apps_data(
                         status = ("Passed", "Failed")[int(sample.labels["status"])]
                         if cluster not in validt_mx:
                             validt_mx[cluster] = {}
-                        if namespace not in validt_mx[cluster]:
-                            validt_mx[cluster][namespace] = {}
-                        if validation not in validt_mx[cluster][namespace]:
-                            validt_mx[cluster][namespace][validation] = {}
-                        if status not in validt_mx[cluster][namespace][validation]:
-                            validt_mx[cluster][namespace][validation][status] = {}
+                        if sample_namespace not in validt_mx[cluster]:
+                            validt_mx[cluster][sample_namespace] = {}
+                        if validation not in validt_mx[cluster][sample_namespace]:
+                            validt_mx[cluster][sample_namespace][validation] = {}
+                        if (
+                            status
+                            not in validt_mx[cluster][sample_namespace][validation]
+                        ):
+                            validt_mx[cluster][sample_namespace][validation][
+                                status
+                            ] = {}
                         value = int(sample.value)
-                        validt_mx[cluster][namespace][validation][status] = value
+                        validt_mx[cluster][sample_namespace][validation][status] = value
         for family in text_string_to_metric_families(slo_metrics):
             for sample in family.samples:
                 if sample.name == "serviceslometrics":
@@ -317,25 +322,28 @@ def get_apps_data(
                         cluster = sample.labels["cluster"]
                         if app_namespace["cluster"]["name"] != cluster:
                             continue
-                        namespace = sample.labels["namespace"]
-                        if app_namespace["name"] != namespace:
+                        sample_namespace = sample.labels["namespace"]
+                        if app_namespace["name"] != sample_namespace:
                             continue
                         slo_doc_name = sample.labels["slodoc"]
                         slo_name = sample.labels["name"]
                         if cluster not in slo_mx:
                             slo_mx[cluster] = {}
-                        if namespace not in slo_mx[cluster]:
-                            slo_mx[cluster][namespace] = {}
-                        if slo_doc_name not in slo_mx[cluster][namespace]:
-                            slo_mx[cluster][namespace][slo_doc_name] = {}
-                        if slo_name not in slo_mx[cluster][namespace][slo_doc_name]:
-                            slo_mx[cluster][namespace][slo_doc_name][slo_name] = {
-                                sample.labels["type"]: sample.value
-                            }
+                        if sample_namespace not in slo_mx[cluster]:
+                            slo_mx[cluster][sample_namespace] = {}
+                        if slo_doc_name not in slo_mx[cluster][sample_namespace]:
+                            slo_mx[cluster][sample_namespace][slo_doc_name] = {}
+                        if (
+                            slo_name
+                            not in slo_mx[cluster][sample_namespace][slo_doc_name]
+                        ):
+                            slo_mx[cluster][sample_namespace][slo_doc_name][
+                                slo_name
+                            ] = {sample.labels["type"]: sample.value}
                         else:
-                            slo_mx[cluster][namespace][slo_doc_name][slo_name].update({
-                                sample.labels["type"]: sample.value
-                            })
+                            slo_mx[cluster][sample_namespace][slo_doc_name][
+                                slo_name
+                            ].update({sample.labels["type"]: sample.value})
         app["container_vulnerabilities"] = vuln_mx
         app["deployment_validations"] = validt_mx
         app["service_slo"] = slo_mx

tools/qontract_cli.py

@@ -1715,7 +1715,10 @@ def add_resource(item: dict, resource: Mapping, columns: list[str]) -> None:
 @click.pass_context
 def cluster_openshift_resources(ctx: click.Context) -> None:
     gqlapi = gql.get_api()
-    namespaces = gqlapi.query(orb.NAMESPACES_QUERY)["namespaces"]
+    data = gqlapi.query(orb.NAMESPACES_QUERY)
+    if not data:
+        raise ValueError("no namespaces found")
+    namespaces = data.get("namespaces", [])
     columns = ["name", "total"]
     results: dict = {}
     for ns_info in namespaces:
@@ -1912,6 +1915,7 @@ def rds_recommendations(ctx: click.Context) -> None:
     print("[TOC]")
     for account in accounts:
         account_name = account.get("name")
+        assert account_name is not None  # make mypy happy
         account_deployment_regions = account.get("supportedDeploymentRegions")
         for region in account_deployment_regions or []:
             with AWSApi(1, [account], settings=settings, init_users=False) as aws:
@@ -1926,9 +1930,9 @@ def rds_recommendations(ctx: click.Context) -> None:
                 recommendations = [
                     {
                         **rec,
-                        "ResourceName": rec["ResourceArn"].split(":")[-1],
+                        "ResourceName": rec.get("ResourceArn", "").split(":")[-1],
                         # The Description field has \n that are causing issues with the markdown table
-                        "Description": rec["Description"].replace("\n", " "),
+                        "Description": rec.get("Description", "").replace("\n", " "),
                     }
                     for rec in db_recommendations
                     if rec.get("Status") not in ignored_statuses
@@ -2710,16 +2714,16 @@ def ec2_jenkins_workers(
                 )
                 continue
             instance = ec2.Instance(i["InstanceId"])
-            state = instance.state["Name"]
+            state = instance.state.get("Name")
             if state != "running":
                 continue
             os = ""
             url = ""
             for t in instance.tags:
                 if t.get("Key") == "os":
-                    os = t["Value"]
+                    os = t.get("Value", "")
                 if t.get("Key") == "jenkins_controller":
-                    url = f"https://{t['Value'].replace('-', '.')}.devshift.net/computer/{instance.id}"
+                    url = f"https://{t.get('Value', '').replace('-', '.')}.devshift.net/computer/{instance.id}"
             image = ec2.Image(instance.image_id)
             commit_url = ""
             for t in image.tags:
@@ -3633,7 +3637,10 @@ def template(
     secret_reader: str,
 ) -> None:
     gqlapi = gql.get_api()
-    namespaces = gqlapi.query(orb.NAMESPACES_QUERY)["namespaces"]
+    data = gqlapi.query(orb.NAMESPACES_QUERY)
+    if not data:
+        raise ValueError("no namespaces found")
+    namespaces = data.get("namespaces", [])
     namespaces_info = [
         n
         for n in namespaces
@@ -3725,7 +3732,7 @@ def run_prometheus_test(
     ptr.run_test(test=test, alerting_services=get_alerting_services())
 
     print(test.result)
-    if not test.result:
+    if test.result is None:
         sys.exit(1)
 
 
@@ -3804,7 +3811,10 @@ def alert_to_receiver(
         additional_labels[key] = value
 
     gqlapi = gql.get_api()
-    namespaces = gqlapi.query(orb.NAMESPACES_QUERY)["namespaces"]
+    data = gqlapi.query(orb.NAMESPACES_QUERY)
+    if not data:
+        raise ValueError("no namespaces found")
+    namespaces = data.get("namespaces", [])
     cluster_namespaces = [n for n in namespaces if n["cluster"]["name"] == cluster]
 
     if len(cluster_namespaces) == 0:
@@ -4027,15 +4037,16 @@ def query(output: str, query: str) -> None:
 def promquery(cluster: str, query: str) -> None:
     """Run a PromQL query"""
     config_data = config.get_config()
-    auth = {"path": config_data["promql-auth"]["secret_path"], "field": "token"}
+    prom_auth = {"path": config_data["promql-auth"]["secret_path"], "field": "token"}
     settings = queries.get_app_interface_settings()
     secret_reader = SecretReader(settings=settings)
-    prom_auth_creds = secret_reader.read(auth)
-    prom_auth = requests.auth.HTTPBasicAuth(*prom_auth_creds.split(":"))
+    prom_user, prom_pass = secret_reader.read(prom_auth).split(":")
 
     url = f"https://prometheus.{cluster}.devshift.net/api/v1/query"
 
-    response = requests.get(url, params={"query": query}, auth=prom_auth, timeout=60)
+    response = requests.get(
+        url, params={"query": query}, auth=(prom_user, prom_pass), timeout=60
+    )
     response.raise_for_status()
 
     print(json.dumps(response.json(), indent=4))
@@ -4092,11 +4103,12 @@ def sre_checkpoint_metadata(
         board_info = queries.get_simple_jira_boards(jiradef)
     else:
         board_info = app["escalationPolicy"]["channels"]["jiraBoard"]
-    board_info = board_info[0]
+    assert board_info  # make mypy happy
+    board = board_info[0]
     # Overrides for easier testing
     if jiraboard:
-        board_info["name"] = jiraboard
-    report_invalid_metadata(app, app_path, board_info, settings, parent_ticket, dry_run)
+        board["name"] = jiraboard
+    report_invalid_metadata(app, app_path, board, settings, parent_ticket, dry_run)
 
 
 @root.command()