qontract-reconcile 0.10.2.dev5__py3-none-any.whl → 0.10.2.dev7__py3-none-any.whl

{qontract_reconcile-0.10.2.dev5.dist-info → qontract_reconcile-0.10.2.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev5
+Version: 0.10.2.dev7
 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.dev5.dist-info → qontract_reconcile-0.10.2.dev7.dist-info}/RECORD

@@ -35,7 +35,7 @@ reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4
 reconcile/gitlab_members.py,sha256=MUIgYDLeJx2-_vMypyq2Pa17cpKdXATYhtVACS2ghpQ,8297
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
 reconcile/gitlab_owners.py,sha256=sn9njaKOtqcvnhi2qtm-faAfAR4zNqflbSuusA9RUuI,13456
-reconcile/gitlab_permissions.py,sha256=6ZBPnQci4-1LVJBvaUS-c0QwIJjITNKVflCeH-Y5Lbk,7507
+reconcile/gitlab_permissions.py,sha256=hJ1KNrWGD8dM5ozELxUqKKFvHFP1yfUZKO4e3dZ_NwM,8092
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
 reconcile/integrations_manager.py,sha256=gvOhVklJDeMPURxLjV30Q4hnLET3BZ-NeEEtQBoo_E0,9500
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
@@ -123,7 +123,7 @@ reconcile/vpc_peerings_validator.py,sha256=-upvNg3ggKCxcJ4kqZcqJVsiltlhQ8MyyLZiW
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=NF3UQ02MdUpVPup50EqnTbTn3dRHGoXoSfFLZxOjr8Q,23744
 reconcile/aus/aus_label_source.py,sha256=2Rktyvs7ZvCwsRwmbGUhddycTBTq0jHq8wpBaiDHAMA,4165
-reconcile/aus/base.py,sha256=r_w93PJVr3jlu7NXtPmLfaDujv42qpPiVMJNWA72fKg,48715
+reconcile/aus/base.py,sha256=qinJ95wI-KN548irs2jgUOMBAnvxuiX0Q6_QJ5_n8qU,48881
 reconcile/aus/cluster_version_data.py,sha256=VZWbUEIbrDKO-sroMpQtiWCTqDraTMd8tssKV0HyTQ0,7140
 reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY,2700
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
@@ -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.dev5.dist-info/METADATA,sha256=GDawMty4r2YOhwi7ZbR9xPIhXLixwAXpP8ZXqPSIHd8,24664
-qontract_reconcile-0.10.2.dev5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-qontract_reconcile-0.10.2.dev5.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
-qontract_reconcile-0.10.2.dev5.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev7.dist-info/METADATA,sha256=45V1tMRWAHSh5LIcjmF_QZwjk7uVQDqW-Zdz-JcVSNE,24664
+qontract_reconcile-0.10.2.dev7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev7.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
+qontract_reconcile-0.10.2.dev7.dist-info/RECORD,,

{qontract_reconcile-0.10.2.dev5.dist-info → qontract_reconcile-0.10.2.dev7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

reconcile/aus/base.py

@@ -17,6 +17,7 @@ from typing import (
 
 from croniter import croniter
 from pydantic import BaseModel, Extra
+from requests.exceptions import HTTPError
 from semver import VersionInfo
 
 from reconcile.aus.cluster_version_data import (
@@ -1164,7 +1165,10 @@ def act(
             and addon_id != policy.addon_id
         ):
             continue
-        diff.act(dry_run, ocm_api)
+        try:
+            diff.act(dry_run, ocm_api)
+        except HTTPError as e:
+            logging.error(f"{policy.cluster.name}: {e}: {e.response.text}")
 
 
 def soaking_days(

reconcile/gitlab_permissions.py

@@ -90,6 +90,13 @@ class GroupPermissionHandler:
         desired_state: dict[str, GroupSpec],
         current_state: dict[str, GroupSpec],
     ) -> None:
+        # gather list of app-interface managed repos
+        managed_repos: set[str] = set()
+        instance = queries.get_gitlab_instance()
+        for project_request in instance.get("projectRequests", []):
+            for r in project_request.get("projects", []):
+                managed_repos.add(f"{instance['url']}/{project_request['group']}/{r}")
+
         # get the diff data
         diff_data = diff_mappings(
             current=current_state,
@@ -100,6 +107,11 @@ class GroupPermissionHandler:
         errors: list[Exception] = []
         for repo in diff_data.add:
             project = self.gl.get_project(repo)
+            if not project and repo in managed_repos:
+                logging.info(
+                    f"New app-interface managed repository {repo} hasn't been created yet - skipping"
+                )
+                continue
             if not self.can_share_project(project):
                 errors.append(
                     GroupAccessLevelError(