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

tools/qontract_cli.py

@@ -20,7 +20,7 @@ from operator import itemgetter
 from pathlib import Path
 from statistics import median
 from textwrap import dedent
-from typing import Any
+from typing import TYPE_CHECKING, Any, cast
 
 import boto3
 import click
@@ -186,6 +186,11 @@ from tools.sre_checkpoints import (
     get_latest_sre_checkpoints,
 )
 
+if TYPE_CHECKING:
+    from mypy_boto3_s3.type_defs import CopySourceTypeDef
+else:
+    CopySourceTypeDef = object
+
 
 def output(function: Callable) -> Callable:
     function = click.option(
@@ -1011,6 +1016,7 @@ def clusters_network(ctx: click.Context, name: str) -> None:
             ]
         with AWSApi(1, [account], settings=settings, init_users=False) as aws_api:
             vpc_id, _, _, _ = aws_api.get_cluster_vpc_details(account)
+            assert vpc_id
             cluster["vpc_id"] = vpc_id
             egress_ips = aws_api.get_cluster_nat_gateways_egress_ips(account, vpc_id)
             cluster["egress_ips"] = ", ".join(sorted(egress_ips))
@@ -1459,10 +1465,13 @@ def copy_tfstate(
     with AWSApi(1, accounts, settings, secret_reader) as aws:
         session = aws.get_session(account["name"])
         s3_client = aws.get_session_client(session, "s3", region)
-        copy_source = {
-            "Bucket": source_bucket,
-            "Key": source_object_path,
-        }
+        copy_source = cast(
+            CopySourceTypeDef,
+            {
+                "Bucket": source_bucket,
+                "Key": source_object_path,
+            },
+        )
 
         dest_pretty_path = f"s3://{dest_bucket}/{dest_key}"
         # check if dest already exists
@@ -1881,23 +1890,23 @@ def rds_recommendations(ctx: click.Context) -> None:
             with AWSApi(1, [account], settings=settings, init_users=False) as aws:
                 try:
                     data = aws.describe_rds_recommendations(account_name, region)
-                    recommendations = data.get("DBRecommendations", [])
+                    db_recommendations = data.get("DBRecommendations", [])
                 except Exception as e:
                     logging.error(f"Error describing RDS recommendations: {e}")
                     continue
 
                 # Add field ResourceName infered from ResourceArn
                 recommendations = [
-                    {**rec, "ResourceName": rec["ResourceArn"].split(":")[-1]}
-                    for rec in recommendations
+                    {
+                        **rec,
+                        "ResourceName": rec["ResourceArn"].split(":")[-1],
+                        # The Description field has \n that are causing issues with the markdown table
+                        "Description": rec["Description"].replace("\n", " "),
+                    }
+                    for rec in db_recommendations
                     if rec.get("Status") not in IGNORED_STATUSES
                     and rec.get("Severity") not in IGNORED_SEVERITIES
                 ]
-                # The Description field has \n that are causing issues with the markdown table
-                recommendations = [
-                    {**rec, "Description": rec["Description"].replace("\n", " ")}
-                    for rec in recommendations
-                ]
                 # If we have no recommendations to show, skip
                 if not recommendations:
                     continue
@@ -2263,7 +2272,7 @@ def app_interface_review_queue(ctx: click.Context) -> None:
             }:
                 continue
 
-            labels = mr.attributes.get("labels")
+            labels = mr.attributes.get("labels") or []
             if glhk.is_good_to_merge(labels):
                 continue
             if "stale" in labels:
@@ -2358,7 +2367,7 @@ def app_interface_open_selfserviceable_mr_queue(ctx: click.Context) -> None:
             continue
 
         # skip stale or non self serviceable MRs
-        labels = mr.attributes.get("labels")
+        labels = mr.attributes.get("labels", [])
         if "stale" in labels:
             continue
         if SELF_SERVICEABLE not in labels and SAAS_FILE_UPDATE not in labels:
@@ -2447,7 +2456,7 @@ def app_interface_merge_history(ctx: click.Context) -> None:
             "id": f"[{mr.iid}]({mr.web_url})",
             "title": mr.title,
             "merged_at": mr.merged_at,
-            "labels": ", ".join(mr.attributes.get("labels")),
+            "labels": ", ".join(mr.attributes.get("labels", [])),
         }
         merge_queue_data.append(item)
 
@@ -4587,7 +4596,7 @@ def log_group_usage(ctx: click.Context, aws_account: str) -> None:
     settings = queries.get_app_interface_settings()
     secret_reader = SecretReader(settings=settings)
     columns = ["log_group", "stored_bytes", "retention_days"]
-    results: list[dict[str, str]] = []
+    results: list[dict[str, str | int]] = []
 
     with AWSApi(1, [account], settings, secret_reader) as aws:
         session = aws.get_session(account["name"])

reconcile/utils/data_structures.py

@@ -1,13 +0,0 @@
-def get_or_init(d, k, v):
-    """Gets (or initiates) a value in a dictionary key
-
-    Args:
-        d (dict): dictionary to work
-        k (hashable): key to use
-        v (value): value to initiate if key doesn't exist
-
-    Returns:
-        [type]: [description]
-    """
-    d.setdefault(k, v)
-    return d[k]