qontract-reconcile 0.10.1rc1030__py3-none-any.whl → 0.10.1rc1032__py3-none-any.whl

reconcile/utils/unleash/__init__.py

@@ -5,7 +5,7 @@ from .client import (
 )
 
 __all__ = [
-    "get_feature_toggles",
-    "get_feature_toggle_state",
     "get_feature_toggle_default",
+    "get_feature_toggle_state",
+    "get_feature_toggles",
 ]

reconcile/utils/vcs.py

@@ -129,7 +129,7 @@ class VCS:
         gitlab_instances: Iterable[GitlabInstanceV1],
     ) -> GitLabApi:
         return GitLabApi(
-            list(gitlab_instances)[0].dict(by_alias=True),
+            next(iter(gitlab_instances)).dict(by_alias=True),
             secret_reader=self._secret_reader,
         )
 
@@ -139,7 +139,7 @@ class VCS:
         app_interface_repo_url: str,
     ) -> GitLabApi:
         return GitLabApi(
-            list(gitlab_instances)[0].dict(by_alias=True),
+            next(iter(gitlab_instances)).dict(by_alias=True),
             secret_reader=self._secret_reader,
             project_url=app_interface_repo_url,
         )

tools/app_interface_reporter.py

@@ -338,10 +338,10 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
                             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]:  # noqa: E501
-                            validt_mx[cluster][namespace][validation][status] = {}  # noqa: E501
+                        if status not in validt_mx[cluster][namespace][validation]:
+                            validt_mx[cluster][namespace][validation][status] = {}
                         value = int(sample.value)
-                        validt_mx[cluster][namespace][validation][status] = value  # noqa: E501
+                        validt_mx[cluster][namespace][validation][status] = value
         for family in text_string_to_metric_families(slo_metrics):
             for sample in family.samples:
                 if sample.name == "serviceslometrics":
@@ -358,14 +358,14 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
                             slo_mx[cluster] = {}
                         if namespace not in slo_mx[cluster]:
                             slo_mx[cluster][namespace] = {}
-                        if slo_doc_name not in slo_mx[cluster][namespace]:  # pylint: disable=line-too-long # noqa: E501
+                        if slo_doc_name not in slo_mx[cluster][namespace]:  # pylint: disable=line-too-long
                             slo_mx[cluster][namespace][slo_doc_name] = {}
-                        if slo_name not in slo_mx[cluster][namespace][slo_doc_name]:  # noqa: E501
-                            slo_mx[cluster][namespace][slo_doc_name][slo_name] = {  # noqa: E501
+                        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
                             }
                         else:
-                            slo_mx[cluster][namespace][slo_doc_name][slo_name].update({  # pylint: disable=line-too-long # noqa: E501
+                            slo_mx[cluster][namespace][slo_doc_name][slo_name].update({  # pylint: disable=line-too-long
                                 sample.labels["type"]: sample.value
                             })
         app["container_vulnerabilities"] = vuln_mx

tools/qontract_cli.py

@@ -1124,14 +1124,14 @@ def cidr_blocks(ctx, for_cluster: int, mask: int) -> None:
 
         avail_addr = ipaddress.ip_address(latest_cluster_cidr["to"]) + 1
 
-        print(f"INFO: Latest available network address: {str(avail_addr)}")
+        print(f"INFO: Latest available network address: {avail_addr!s}")
         try:
             result_cidr_block = str(ipaddress.ip_network((avail_addr, mask)))
         except ValueError:
             print(f"ERROR: Invalid CIDR Mask {mask} Provided.")
             sys.exit(1)
-        print(f"INFO: You are reserving {str(2 ** (32 - mask))} network addresses.")
-        print(f"\nYou can use: {str(result_cidr_block)}")
+        print(f"INFO: You are reserving {2 ** (32 - mask)!s} network addresses.")
+        print(f"\nYou can use: {result_cidr_block!s}")
     else:
         ctx.obj["options"]["sort"] = False
         print_output(ctx.obj["options"], cidrs, columns)
@@ -1744,17 +1744,8 @@ def roles(ctx, org_username):
 
     user = users[0]
 
-    roles = []
-
-    def add(d):
-        for i, r in enumerate(roles):
-            if all(d[k] == r[k] for k in ("type", "name", "resource")):
-                roles.insert(
-                    i + 1, {"type": "", "name": "", "resource": "", "ref": d["ref"]}
-                )
-                return
-
-        roles.append(d)
+    # type, name, resource, [ref]
+    roles: dict[(str, str, str), set] = defaultdict(set)
 
     for role in user["roles"]:
         role_name = role["path"]
@@ -1771,53 +1762,38 @@ def roles(ctx, org_username):
             if "team" in p:
                 r_name += "/" + p["team"]
 
-            add({
-                "type": "permission",
-                "name": p["name"],
-                "resource": r_name,
-                "ref": role_name,
-            })
+            roles[("permission", p["name"], r_name)].add(role_name)
 
         for aws in role.get("aws_groups") or []:
             for policy in aws["policies"]:
-                add({
-                    "type": "aws",
-                    "name": policy,
-                    "resource": aws["account"]["name"],
-                    "ref": aws["path"],
-                })
+                roles[("aws", policy, aws["account"]["name"])].add(aws["path"])
 
         for a in role.get("access") or []:
             if a["cluster"]:
                 cluster_name = a["cluster"]["name"]
-                add({
-                    "type": "cluster",
-                    "name": a["clusterRole"],
-                    "resource": cluster_name,
-                    "ref": role_name,
-                })
+                roles[("cluster", a["clusterRole"], cluster_name)].add(role_name)
             elif a["namespace"]:
                 ns_name = a["namespace"]["name"]
-                add({
-                    "type": "namespace",
-                    "name": a["role"],
-                    "resource": ns_name,
-                    "ref": role_name,
-                })
+                roles[("namespace", a["role"], ns_name)].add(role_name)
 
         for s in role.get("self_service") or []:
             for d in s.get("datafiles") or []:
                 name = d.get("name")
                 if name:
-                    add({
-                        "type": "saas_file",
-                        "name": "owner",
-                        "resource": name,
-                        "ref": role_name,
-                    })
+                    roles[("saas_file", "owner", name)].add(role_name)
 
     columns = ["type", "name", "resource", "ref"]
-    print_output(ctx.obj["options"], roles, columns)
+    rows = [
+        {
+            "type": k[0],
+            "name": k[1],
+            "resource": k[2],
+            "ref": ref,
+        }
+        for k, v in roles.items()
+        for ref in v
+    ]
+    print_output(ctx.obj["options"], rows, columns)
 
 
 @get.command()