qontract-reconcile 0.10.2.dev11__py3-none-any.whl → 0.10.2.dev12__py3-none-any.whl

{qontract_reconcile-0.10.2.dev11.dist-info → qontract_reconcile-0.10.2.dev12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev11
+Version: 0.10.2.dev12
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev11.dist-info → qontract_reconcile-0.10.2.dev12.dist-info}/RECORD

@@ -105,7 +105,7 @@ reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9
 reconcile/service_dependencies.py,sha256=PMKP9vc6oL-78rzyF_RE8DzLSQMSqN8vCqt9sWpBLAM,4470
 reconcile/signalfx_endpoint_monitoring.py,sha256=Nqgsg1cflSd2nNnm89y_e8c--7xLUqTrKOHkDs-qADE,2868
 reconcile/slack_base.py,sha256=8FqwMJ5SkoRyDJ9iPfZogWkC9QRoTouMCnGUevV_GME,3447
-reconcile/slack_usergroups.py,sha256=ebCMtgpap6i_IUFFTuXU52MdkAXxSRG1bAcDPj64OIg,30083
+reconcile/slack_usergroups.py,sha256=vMifpbnrQDLeckGtUmpIg7sVvlhpaJz8HZH_loA7fpY,30221
 reconcile/sql_query.py,sha256=pH-EHkXiDknn8ZNXVqRZeqFc3sKhu2nhsaykgSytbS8,25895
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=YeoE7kLf1YKpOdN32u3vqhuSI46ep5N_qcVWC1CBCf8,8635
@@ -580,8 +580,8 @@ reconcile/utils/external_resource_spec.py,sha256=bhH_xneFwATdFumTPkiQmcVKYI0gcaW
 reconcile/utils/external_resources.py,sha256=y7Wz32cOAmCsUhQ6T-1N6lktnLikGkaHQ0SdDpMse1w,7585
 reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
 reconcile/utils/git.py,sha256=wzVIYAeKlMGW538U1mkJWUI6h_mFRUY4lawh2AR8hw4,2345
-reconcile/utils/github_api.py,sha256=R8OvqyPdnRqvP-Efnv9RvIcbBlb4M0KC4RlbnJMD0Tg,2426
-reconcile/utils/gitlab_api.py,sha256=YokTr77DJVWl7nALjCJdJnPKgBJfUBETkE8FtrT7ckg,28455
+reconcile/utils/github_api.py,sha256=oMInVIga9OITL7l5EWzs4lGXK0xAYhUznhjgXKjmmA0,2492
+reconcile/utils/gitlab_api.py,sha256=3QKe2g7ZJ1vFai4f65C-0eySTgIJhmqg-o1ehX249cc,28515
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
@@ -617,7 +617,7 @@ reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_Rb
 reconcile/utils/promtool.py,sha256=UmBfTHgW9Ys7fZ9BfhIVJEFGLkbge9y1AgL5PNHp7iA,2831
 reconcile/utils/quay_api.py,sha256=wyPD9F1do0FsAcmIr7RejUOs4zaKs8-OUylxI3MLk8A,7860
 reconcile/utils/raw_github_api.py,sha256=O6Q4vq7bi5ZWcfquPutc9rJ4Ef8_sFqd_RLgzpIoj0w,2920
-reconcile/utils/repo_owners.py,sha256=gQhynzJtsmJ2b-uCfg_IFtZgHLAac-fUa1LRvWiSBs4,6523
+reconcile/utils/repo_owners.py,sha256=BpzvfmhC6deO3jf3uLD73ANK6oZbdhjYNyZmAZrcfak,6586
 reconcile/utils/rest_api_base.py,sha256=jezb2MfIxf83HNSGbNNBStuEmVuVUuwFQnRmZsQaq6w,4297
 reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=6qzDja0Mkm1MrEdn5cTCWzQo7-aTCOLy9BqqNSPvqL4,10214
@@ -766,7 +766,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=5LJ9rygZ304vxfsIuRfuxueoYRb72EZNKKITEcJ4Mtk,3908
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev11.dist-info/METADATA,sha256=GaV4BaNXIgDFCvDRq8wSKzXKj0P2Sj-RxYIEQJIprds,24665
-qontract_reconcile-0.10.2.dev11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev11.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
-qontract_reconcile-0.10.2.dev11.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev12.dist-info/METADATA,sha256=sppoHRsRgQprrh1l3piarq4tIw_UScdBX1hgO3O8n3A,24665
+qontract_reconcile-0.10.2.dev12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev12.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
+qontract_reconcile-0.10.2.dev12.dist-info/RECORD,,

reconcile/slack_usergroups.py

@@ -314,7 +314,12 @@ def get_slack_usernames_from_owners(
             else:
                 raise TypeError(f"{type(repo_cli)} not supported")
 
-            repo_owners = repo_owner_class(git_cli=repo_cli, ref=ref)
+            repo_owners = repo_owner_class(
+                git_cli=repo_cli,
+                ref=ref,
+                # we just need the root level OWNERS file
+                recursive=False,
+            )
 
             try:
                 owners = repo_owners.get_root_owners()

reconcile/utils/github_api.py

@@ -50,6 +50,9 @@ class GithubRepositoryApi:
     ) -> None:
         self.cleanup()
 
+    def __str__(self) -> str:
+        return self._repo.html_url
+
     def cleanup(self) -> None:
         """
         Align with GitLabApi

reconcile/utils/gitlab_api.py

@@ -146,6 +146,9 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
     def __exit__(self, *exc):
         self.cleanup()
 
+    def __str__(self):
+        return self.project.web_url
+
     def cleanup(self):
         """
         Close gl session.

reconcile/utils/repo_owners.py

@@ -12,10 +12,11 @@ class RepoOwners:
     Abstracts the owners of a repository with per-path granularity.
     """
 
-    def __init__(self, git_cli, ref="master"):
+    def __init__(self, git_cli, ref="master", recursive=True):
         self._git_cli = git_cli
         self._ref = ref
         self._owners_map = None
+        self._recursive = recursive
 
     @property
     def owners_map(self):
@@ -116,33 +117,31 @@ class RepoOwners:
         :rtype: dict
         """
         owners_map = {}
+        aliases = self._get_aliases()
 
-        repo_tree = self._git_cli.get_repository_tree(ref=self._ref)
-
-        aliases = None
-        owner_files = []
-        for item in repo_tree:
-            if item["path"] == "OWNERS_ALIASES":
-                aliases = self._get_aliases()
-            elif item["name"] == "OWNERS":
-                owner_files.append(item)
+        if self._recursive:
+            repo_tree = self._git_cli.get_repository_tree(ref=self._ref)
+            owner_files = [item for item in repo_tree if item["name"] == "OWNERS"]
+        else:
+            owner_files = [{"path": "OWNERS"}]
 
         for owner_file in owner_files:
             raw_owners = self._git_cli.get_file(path=owner_file["path"], ref=self._ref)
+            if not raw_owners:
+                _LOG.warning(f"{self._git_cli!s}:{owner_file['path']} not found")
+                continue
             try:
                 owners = yaml.safe_load(raw_owners.decode())
             except yaml.parser.ParserError:
                 owners = None
             if owners is None:
                 _LOG.warning(
-                    "Non-parsable OWNERS file "
-                    f"{self._git_cli.project.web_url}:{owner_file.get('path')}"
+                    f"Non-parsable OWNERS file {self._git_cli!s}:{owner_file['path']}"
                 )
                 continue
             if not isinstance(owners, dict):
                 _LOG.warning(
-                    f"owner file {self._git_cli.project.web_url}:{owner_file.get('path')} "
-                    "content is not a dictionary"
+                    f"owner file {self._git_cli!s}:{owner_file['path']} content is not a dictionary"
                 )
                 continue