qontract-reconcile 0.10.2.dev215__py3-none-any.whl → 0.10.2.dev217__py3-none-any.whl

reconcile/gitlab_housekeeping.py

@@ -243,7 +243,7 @@ def close_item(
     enable_closing: bool,
     item_type: str,
     item: ProjectIssue | ProjectMergeRequest,
-):
+) -> None:
     if enable_closing:
         logging.info([
             "close_item",
@@ -263,32 +263,31 @@ def close_item(
 
 
 def handle_stale_items(
-    dry_run,
-    gl,
-    days_interval,
-    enable_closing,
-    items,
-    item_type,
-):
+    dry_run: bool,
+    gl: GitLabApi,
+    days_interval: int,
+    enable_closing: bool,
+    items: Iterable[ProjectIssue | ProjectMergeRequest],
+    item_type: str,
+) -> None:
     LABEL = "stale"
 
     now = datetime.utcnow()
     for item in items:
-        item_iid = item.attributes.get("iid")
         if AUTO_MERGE in item.labels:
             if item.merge_status == MRStatus.UNCHECKED:
                 # this call triggers a status recheck
-                item = gl.get_merge_request(item_iid)
+                item = gl.get_merge_request(item.iid)
             if item.merge_status == MRStatus.CANNOT_BE_MERGED:
                 close_item(dry_run, gl, enable_closing, item_type, item)
-        update_date = datetime.strptime(item.attributes.get("updated_at"), DATE_FORMAT)
+        update_date = datetime.strptime(item.updated_at, DATE_FORMAT)
 
         # if item is over days_interval
         current_interval = now.date() - update_date.date()
         if current_interval > timedelta(days=days_interval):
             # if item does not have 'stale' label - add it
             if LABEL not in item.labels:
-                logging.info(["add_label", gl.project.name, item_type, item_iid, LABEL])
+                logging.info(["add_label", gl.project.name, item_type, item.iid, LABEL])
                 if not dry_run:
                     gl.add_label_with_note(item, LABEL)
             # if item has 'stale' label - close it
@@ -310,8 +309,7 @@ def handle_stale_items(
                 continue
 
             cancel_notes_dates = [
-                datetime.strptime(note.attributes.get("updated_at"), DATE_FORMAT)
-                for note in cancel_notes
+                datetime.strptime(item.updated_at, DATE_FORMAT) for note in cancel_notes
             ]
             latest_cancel_note_date = max(d for d in cancel_notes_dates)
             # if the latest cancel note is under
@@ -322,20 +320,20 @@ def handle_stale_items(
                     "remove_label",
                     gl.project.name,
                     item_type,
-                    item_iid,
+                    item.iid,
                     LABEL,
                 ])
                 if not dry_run:
                     gl.remove_label(item, LABEL)
 
 
-def is_good_to_merge(labels):
+def is_good_to_merge(labels: Iterable[str]) -> bool:
     return any(m in MERGE_LABELS_PRIORITY for m in labels) and not any(
         b in HOLD_LABELS for b in labels
     )
 
 
-def is_rebased(mr, gl: GitLabApi) -> bool:
+def is_rebased(mr: ProjectMergeRequest, gl: GitLabApi) -> bool:
     target_branch = mr.target_branch
     head = cast(
         list[ProjectCommit],
@@ -471,14 +469,14 @@ def preprocess_merge_requests(
 
 
 def rebase_merge_requests(
-    dry_run,
-    gl,
-    rebase_limit,
-    pipeline_timeout=None,
-    wait_for_pipeline=False,
-    users_allowed_to_label=None,
-    state=None,
-):
+    dry_run: bool,
+    gl: GitLabApi,
+    rebase_limit: int,
+    state: State,
+    pipeline_timeout: int | None = None,
+    wait_for_pipeline: bool = False,
+    users_allowed_to_label: Iterable[str] | None = None,
+) -> None:
     rebases = 0
     merge_requests = [
         item["mr"]
@@ -542,20 +540,20 @@ def rebase_merge_requests(
 
 @retry(max_attempts=10, hook=_log_exception)
 def merge_merge_requests(
-    dry_run,
+    dry_run: bool,
     gl: GitLabApi,
     project_merge_requests: list[ProjectMergeRequest],
     reload_toggle: ReloadToggle,
-    merge_limit,
-    rebase,
+    merge_limit: int,
+    rebase: bool,
     app_sre_usernames: Set[str],
-    pipeline_timeout=None,
-    insist=False,
-    wait_for_pipeline=False,
-    users_allowed_to_label=None,
-    must_pass=None,
-    state=None,
-):
+    state: State,
+    pipeline_timeout: int | None = None,
+    insist: bool = False,
+    wait_for_pipeline: bool = False,
+    users_allowed_to_label: Iterable[str] | None = None,
+    must_pass: Iterable[str] | None = None,
+) -> None:
     merges = 0
     if reload_toggle.reload:
         project_merge_requests = gl.get_merge_requests(state=MRState.OPENED)
@@ -654,7 +652,7 @@ def publish_access_token_expiration_metrics(gl: GitLabApi) -> None:
                 gitlab_token_expiration.remove(pat.name)
 
 
-def run(dry_run, wait_for_pipeline):
+def run(dry_run: bool, wait_for_pipeline: bool) -> None:
     default_days_interval = 15
     default_limit = 8
     default_enable_closing = False
@@ -711,45 +709,46 @@ def run(dry_run, wait_for_pipeline):
             must_pass = hk.get("must_pass")
             try:
                 merge_merge_requests(
-                    dry_run,
-                    gl,
-                    project_merge_requests,
-                    reload_toggle,
-                    limit,
-                    rebase,
-                    app_sre_usernames,
-                    pipeline_timeout,
+                    dry_run=dry_run,
+                    gl=gl,
+                    project_merge_requests=project_merge_requests,
+                    reload_toggle=reload_toggle,
+                    merge_limit=limit,
+                    rebase=rebase,
+                    app_sre_usernames=app_sre_usernames,
+                    state=state,
+                    pipeline_timeout=pipeline_timeout,
                     insist=True,
                     wait_for_pipeline=wait_for_pipeline,
                     users_allowed_to_label=users_allowed_to_label,
                     must_pass=must_pass,
-                    state=state,
                 )
             except Exception:
                 logging.error(
                     "All retries failed, trying to rerun merge_merge_requests() again."
                 )
                 merge_merge_requests(
-                    dry_run,
-                    gl,
-                    project_merge_requests,
-                    reload_toggle,
-                    limit,
-                    rebase,
-                    app_sre_usernames,
-                    pipeline_timeout,
+                    dry_run=dry_run,
+                    gl=gl,
+                    project_merge_requests=project_merge_requests,
+                    reload_toggle=reload_toggle,
+                    merge_limit=limit,
+                    rebase=rebase,
+                    app_sre_usernames=app_sre_usernames,
+                    state=state,
+                    pipeline_timeout=pipeline_timeout,
+                    insist=False,
                     wait_for_pipeline=wait_for_pipeline,
                     users_allowed_to_label=users_allowed_to_label,
                     must_pass=must_pass,
-                    state=state,
                 )
             if rebase:
                 rebase_merge_requests(
-                    dry_run,
-                    gl,
-                    limit,
+                    dry_run=dry_run,
+                    gl=gl,
+                    rebase_limit=limit,
+                    state=state,
                     pipeline_timeout=pipeline_timeout,
                     wait_for_pipeline=wait_for_pipeline,
                     users_allowed_to_label=users_allowed_to_label,
-                    state=state,
                 )

reconcile/gitlab_permissions.py

@@ -1,10 +1,12 @@
 import itertools
 import logging
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from typing import Any, cast
 
 from gitlab.exceptions import GitlabGetError
 from gitlab.v4.objects import (
+    GroupMember,
     Project,
     SharedProject,
 )
@@ -159,7 +161,9 @@ class GroupPermissionHandler:
             raise ExceptionGroup("Reconcile errors occurred", errors)
 
 
-def get_members_to_add(repo, gl, app_sre):
+def get_members_to_add(
+    repo: str, gl: GitLabApi, app_sre: list[GroupMember]
+) -> list[dict[str, Any]]:
     maintainers = get_all_app_sre_maintainers(repo, gl, app_sre)
     if maintainers is None:
         return []
@@ -172,7 +176,9 @@ def get_members_to_add(repo, gl, app_sre):
     return members_to_add
 
 
-def get_all_app_sre_maintainers(repo, gl, app_sre):
+def get_all_app_sre_maintainers(
+    repo: str, gl: GitLabApi, app_sre: list[GroupMember]
+) -> list[str]:
     app_sre_user_ids = [user.id for user in app_sre]
     chunks = batches.batched(app_sre_user_ids, PAGE_SIZE)
     app_sre_maintainers = (
@@ -182,12 +188,14 @@ def get_all_app_sre_maintainers(repo, gl, app_sre):
     return list(itertools.chain.from_iterable(app_sre_maintainers))
 
 
-def create_user_ids_query(ids):
+def create_user_ids_query(ids: Iterable[str]) -> dict[str, str]:
     return {"user_ids": ",".join(str(id) for id in ids)}
 
 
 @defer
-def run(dry_run, thread_pool_size=10, defer=None):
+def run(
+    dry_run: bool, thread_pool_size: int = 10, defer: Callable | None = None
+) -> None:
     instance = queries.get_gitlab_instance()
     settings = queries.get_app_interface_settings()
     gl = GitLabApi(instance, settings=settings)
@@ -221,7 +229,7 @@ def share_project_with_group_members(
             gl.add_project_member(m["repo"], m["user"])
 
 
-def early_exit_desired_state(*args, **kwargs) -> dict[str, Any]:
+def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
     instance = queries.get_gitlab_instance()
     return {
         "instance": instance,

reconcile/gitlab_projects.py

@@ -1,5 +1,6 @@
 import logging
 import sys
+from collections.abc import Callable
 from typing import Any
 
 from reconcile import queries
@@ -10,14 +11,15 @@ QONTRACT_INTEGRATION = "gitlab-projects"
 
 
 @defer
-def run(dry_run, defer=None):
+def run(dry_run: bool, defer: Callable | None = None) -> None:
     instance = queries.get_gitlab_instance()
     settings = queries.get_app_interface_settings()
     code_components = queries.get_code_components()
     app_int_repos = [c["url"] for c in code_components]
     saas_bundle_repos = [c["url"] for c in code_components if c["resource"] == "bundle"]
     gl = GitLabApi(instance, settings=settings)
-    defer(gl.cleanup)
+    if defer:
+        defer(gl.cleanup)
 
     project_requests = instance["projectRequests"] or []
     error = False
@@ -45,7 +47,7 @@ def run(dry_run, defer=None):
     sys.exit(error)
 
 
-def early_exit_desired_state(*args, **kwargs) -> dict[str, Any]:
+def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
     instance = queries.get_gitlab_instance()
     return {
         "instance": instance,

reconcile/gql_definitions/automated_actions/instance.py

@@ -90,6 +90,20 @@ query AutomatedActionsInstances {
           max_age_minutes
         }
       }
+      ... on AutomatedActionExternalResourceFlushElastiCache_v1 {
+        external_resource_flush_elasticache_arguments: arguments {
+          namespace {
+            externalResources {
+              provisioner {
+                ... on AWSAccount_v1 {
+                  name
+                }
+              }
+            }
+          }
+          identifier
+        }
+      }
       ... on AutomatedActionExternalResourceRdsReboot_v1 {
         external_resource_rds_reboot_arguments: arguments {
           namespace {
@@ -194,8 +208,33 @@ class AutomatedActionExternalResourceArgumentV1(ConfiguredBaseModel):
     identifier: str = Field(..., alias="identifier")
 
 
+class AutomatedActionExternalResourceFlushElastiCacheV1(AutomatedActionV1):
+    external_resource_flush_elasticache_arguments: list[AutomatedActionExternalResourceArgumentV1] = Field(..., alias="external_resource_flush_elasticache_arguments")
+
+
+class AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1(ConfiguredBaseModel):
+    ...
+
+
+class AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1_AWSAccountV1(AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1):
+    name: str = Field(..., alias="name")
+
+
+class AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1(ConfiguredBaseModel):
+    provisioner: Union[AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1_AWSAccountV1, AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1] = Field(..., alias="provisioner")
+
+
+class AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1(ConfiguredBaseModel):
+    external_resources: Optional[list[AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1]] = Field(..., alias="externalResources")
+
+
+class AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1(ConfiguredBaseModel):
+    namespace: AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1 = Field(..., alias="namespace")
+    identifier: str = Field(..., alias="identifier")
+
+
 class AutomatedActionExternalResourceRdsRebootV1(AutomatedActionV1):
-    external_resource_rds_reboot_arguments: list[AutomatedActionExternalResourceArgumentV1] = Field(..., alias="external_resource_rds_reboot_arguments")
+    external_resource_rds_reboot_arguments: list[AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1] = Field(..., alias="external_resource_rds_reboot_arguments")
 
 
 class DisableClusterAutomationsV1(ConfiguredBaseModel):
@@ -226,7 +265,7 @@ class AutomatedActionOpenshiftWorkloadRestartV1(AutomatedActionV1):
 class AutomatedActionsInstanceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     deployment: NamespaceV1 = Field(..., alias="deployment")
-    actions: Optional[list[Union[AutomatedActionActionListV1, AutomatedActionExternalResourceRdsRebootV1, AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionV1]]] = Field(..., alias="actions")
+    actions: Optional[list[Union[AutomatedActionActionListV1, AutomatedActionExternalResourceFlushElastiCacheV1, AutomatedActionExternalResourceRdsRebootV1, AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionV1]]] = Field(..., alias="actions")
 
 
 class AutomatedActionsInstancesQueryData(ConfiguredBaseModel):

reconcile/gql_definitions/introspection.json

@@ -5737,6 +5737,11 @@
                             "name": "AutomatedActionCreateToken_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "AutomatedActionExternalResourceFlushElastiCache_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "AutomatedActionExternalResourceRdsReboot_v1",
@@ -27344,6 +27349,11 @@
                             "name": "AutomatedActionCreateToken_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "AutomatedActionExternalResourceFlushElastiCache_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "AutomatedActionExternalResourceRdsReboot_v1",
@@ -53512,7 +53522,7 @@
                 },
                 {
                     "kind": "OBJECT",
-                    "name": "AutomatedActionExternalResourceRdsReboot_v1",
+                    "name": "AutomatedActionExternalResourceFlushElastiCache_v1",
                     "description": null,
                     "fields": [
                         {
@@ -53719,6 +53729,172 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "AutomatedActionExternalResourceRdsReboot_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "schema",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "type",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "description",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "maxOps",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "Int",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "instances",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "AutomatedActionsInstance_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "permissions",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "PermissionAutomatedActions_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "arguments",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "AutomatedActionExternalResourceArgument_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [
+                        {
+                            "kind": "INTERFACE",
+                            "name": "AutomatedAction_v1",
+                            "ofType": null
+                        },
+                        {
+                            "kind": "INTERFACE",
+                            "name": "DatafileObject_v1",
+                            "ofType": null
+                        }
+                    ],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "AutomatedActionNoOp_v1",