qontract-reconcile 0.10.2.dev310__py3-none-any.whl → 0.10.2.dev439__py3-none-any.whl

reconcile/utils/mr/promote_qontract.py

@@ -10,10 +10,14 @@ from reconcile.utils.ruamel import create_ruamel_instance
 class PromoteQontractSchemas(MergeRequestBase):
     name = "promote_qontract_schemas"
 
-    def __init__(self, version: str, author_email: str | None = None):
+    def __init__(
+        self, version: str, commit_sha: str, github_user_id: str | None = None
+    ):
         self.path = ".env"
         self.version = version
-        self.author_email = author_email
+        self.github_user_id = github_user_id
+        # This is currently unused, however, we keep it to conform with general SQS message format
+        self.commit_sha = commit_sha
 
         super().__init__()
 
@@ -22,19 +26,24 @@ class PromoteQontractSchemas(MergeRequestBase):
     @property
     def title(self) -> str:
         author = self.infer_author(
-            author_email=self.author_email, all_users=get_users()
+            github_user_id=self.github_user_id, all_users=get_users()
         )
         return f"[{self.name}] promote qontract-schemas to version {self.version}" + (
             f" by @{author}"
             if author
-            else f" by {self.author_email}"
-            if self.author_email
+            else f" by {self.github_user_id}"
+            if self.github_user_id
             else ""
         )
 
     @property
     def description(self) -> str:
-        return f"promote qontract-schemas to version {self.version}"
+        return f"""
+promote qontract-schemas to version {self.version}.
+
+At the time of creating this MR, the konflux RPA most likely didn't finish yet, so this MR will likely fail first.
+Please use `/retest` once the RPA finished (that should be the case after ~5min of creating this MR).
+        """
 
     def process(self, gitlab_cli: GitLabApi) -> None:
         raw_file = gitlab_cli.get_raw_file(
@@ -61,10 +70,12 @@ class PromoteQontractSchemas(MergeRequestBase):
 class PromoteQontractReconcileCommercial(MergeRequestBase):
     name = "promote_qontract_reconcile"
 
-    def __init__(self, version: str, commit_sha: str, author_email: str | None = None):
+    def __init__(
+        self, version: str, commit_sha: str, github_user_id: str | None = None
+    ):
         self.version = version
         self.commit_sha = commit_sha
-        self.author_email = author_email
+        self.github_user_id = github_user_id
 
         super().__init__()
 
@@ -73,19 +84,24 @@ class PromoteQontractReconcileCommercial(MergeRequestBase):
     @property
     def title(self) -> str:
         author = self.infer_author(
-            author_email=self.author_email, all_users=get_users()
+            github_user_id=self.github_user_id, all_users=get_users()
         )
         return f"[{self.name}] promote qontract-reconcile to version {self.version}" + (
             f" by @{author}"
             if author
-            else f" by {self.author_email}"
-            if self.author_email
+            else f" by {self.github_user_id}"
+            if self.github_user_id
             else ""
         )
 
     @property
     def description(self) -> str:
-        return f"promote qontract-reconcile to version {self.version}"
+        return f"""
+promote qontract-reconcile to version {self.version}.
+
+At the time of creating this MR, the konflux RPA most likely didn't finish yet, so this MR will likely fail first.
+Please use `/retest` once the RPA finished (that should be the case after ~5min of creating this MR).
+"""
 
     def _process_by_line_search(
         self, raw_file: bytes, search_text: str, replace_text: str

reconcile/utils/mr/update_access_report_base.py

@@ -1,14 +1,13 @@
 import logging
 from abc import abstractmethod
 from collections.abc import Sequence
-from datetime import UTC, date
-from datetime import datetime as dt
 from pathlib import Path
 from typing import TypeVar
 
 from jinja2 import Template
 from pydantic import BaseModel
 
+from reconcile.utils.datetime_util import utc_now
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.mr.base import MergeRequestBase
 from reconcile.utils.mr.labels import AUTO_MERGE
@@ -27,7 +26,7 @@ class UpdateAccessReportBase(MergeRequestBase):
         self.labels = [AUTO_MERGE]
         self._users = users
         self._workbook_file_name = str(workbook_path)
-        self._isodate = dt.now(tz=UTC).isoformat()
+        self._isodate = utc_now().isoformat()
         self._dry_run = dry_run
 
     @property
@@ -65,7 +64,7 @@ class UpdateAccessReportBase(MergeRequestBase):
 
     def _render_tracking_table_row(self, old_number_of_users: int) -> str:
         # | Date Reviewed | Number of Current Users | +/- Red Hat Users |
-        return f"| {date.today()} | {len(self._users)} | {len(self._users) - old_number_of_users} |\n"
+        return f"| {utc_now().date()} | {len(self._users)} | {len(self._users) - old_number_of_users} |\n"
 
     def _update_workbook(self, workbook_md: str) -> str:
         new_workbook_md = ""

reconcile/utils/mr/user_maintenance.py

@@ -2,7 +2,7 @@ from collections.abc import Iterable
 from enum import Enum
 from pathlib import Path
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 from ruamel import yaml
 
 from reconcile.utils.gitlab_api import GitLabApi
@@ -23,15 +23,16 @@ class PathSpec(BaseModel):
     type: PathTypes
     path: str
 
-    @validator("path")
-    def prepend_data_to_path(cls, v):
+    @field_validator("path")
+    @classmethod
+    def prepend_data_to_path(cls, v: str) -> str:
         return "data" + v
 
 
 class CreateDeleteUserAppInterface(MergeRequestBase):
     name = "create_delete_user_mr"
 
-    def __init__(self, username, paths: Iterable[PathSpec]):
+    def __init__(self, username: str, paths: Iterable[PathSpec]) -> None:
         self.username = username
         self.paths = paths
 
@@ -120,7 +121,7 @@ class CreateDeleteUserInfra(MergeRequestBase):
 
     name = "create_ssh_key_mr"
 
-    def __init__(self, usernames):
+    def __init__(self, usernames: Iterable[str]):
         self.usernames = usernames
 
         super().__init__()
@@ -135,7 +136,7 @@ class CreateDeleteUserInfra(MergeRequestBase):
     def description(self) -> str:
         return "delete user(s)"
 
-    def process(self, gitlab_cli):
+    def process(self, gitlab_cli: GitLabApi) -> None:
         raw_file = gitlab_cli.get_raw_file(
             project=gitlab_cli.project,
             path=self.PLAYBOOK,