qontract-reconcile 0.10.2.dev6__py3-none-any.whl → 0.10.2.dev8__py3-none-any.whl

{qontract_reconcile-0.10.2.dev6.dist-info → qontract_reconcile-0.10.2.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev6
+Version: 0.10.2.dev8
 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.dev6.dist-info → qontract_reconcile-0.10.2.dev8.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
@@ -199,9 +199,9 @@ reconcile/external_resources/aws.py,sha256=NSaOeHqFEcMaMxNjJwuQZosolgsJ8XRVvwkEE
 reconcile/external_resources/factories.py,sha256=TyJMaijDfPIFYks9i6dhKN7nSR1BoCkoBs1iPExKpcE,5493
 reconcile/external_resources/integration.py,sha256=gBVO5dE8JyZ3xYcYik-MTIp_18oU7_hpYc_oztyfElQ,6753
 reconcile/external_resources/integration_secrets_sync.py,sha256=dX09O3r6KURziUYYfiki10orNjOGVma-XojhVqd0ww4,1667
-reconcile/external_resources/manager.py,sha256=T3z-IEjjr8DpNbnqyzJnnXrdkBksCFcepL6py2U9t-c,15909
+reconcile/external_resources/manager.py,sha256=eVaaGCaKDkc897xt5cA5-B4yYuS9VWR-Z7Uom0uSsG0,15971
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
-reconcile/external_resources/metrics.py,sha256=8MZgNtNZzIRSYTX97KEUIUTETZBhitULzWxbShGyMO8,3193
+reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMcVdISlxhzXE,3898
 reconcile/external_resources/model.py,sha256=YJylbAhetN9szpLUFd9jFqxCRMvSWXVxSC9OMQNV-wg,11316
 reconcile/external_resources/reconciler.py,sha256=K9QvbQCIOCuOHnPIxQE_P_jFtrkF3dGo8d_cCCh08Ys,8973
 reconcile/external_resources/secrets_sync.py,sha256=H8JfI3JW1XEau1jqv15AhYg49mCZeHwZmqMzMv_6tFc,16344
@@ -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.dev6.dist-info/METADATA,sha256=XH6LW3B3BM4fyIy9urLw7UrTe-exQ-INWXszkQNnXhk,24664
-qontract_reconcile-0.10.2.dev6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev6.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
-qontract_reconcile-0.10.2.dev6.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev8.dist-info/METADATA,sha256=Q7bA9-IZt-P1nmshnv22D4iHqrAq7N03KD5__iEgMyA,24664
+qontract_reconcile-0.10.2.dev8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev8.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
+qontract_reconcile-0.10.2.dev8.dist-info/RECORD,,

reconcile/external_resources/manager.py

@@ -357,12 +357,14 @@ class ExternalResourcesManager:
             if reconciliation_status.resource_status.needs_secret_sync:
                 to_sync_keys.add(r.key)
 
-            if self._resource_needs_reconciliation(reconciliation=r, state=state):
+            if is_reconciled := self._resource_needs_reconciliation(
+                reconciliation=r, state=state
+            ):
                 self.reconciler.reconcile_resource(reconciliation=r)
                 self._set_resource_reconciliation_in_progress(r, state)
 
             if spec := self.er_inventory.get(r.key):
-                publish_metrics(r, spec, reconciliation_status)
+                publish_metrics(r, spec, reconciliation_status, is_reconciled)
 
         pending_sync_keys = self.state_mgr.get_keys_by_status(
             ResourceStatus.PENDING_SECRET_SYNC

reconcile/external_resources/metrics.py

@@ -23,6 +23,14 @@ class ExternalResourcesBaseMetric(BaseModel):
     job_name: str
 
 
+class ExternalResourcesReconciliationsCounter(
+    ExternalResourcesBaseMetric, CounterMetric
+):
+    @classmethod
+    def name(cls) -> str:
+        return "external_resources_reconciliations"
+
+
 class ExternalResourcesReconcileErrorsCounter(
     ExternalResourcesBaseMetric, CounterMetric
 ):
@@ -49,6 +57,7 @@ def publish_metrics(
     r: Reconciliation,
     spec: ExternalResourceSpec,
     reconciliation_status: ReconciliationStatus,
+    is_reconciled: bool,
 ) -> None:
     job_name = ReconciliationK8sJob(reconciliation=r).name()
 
@@ -93,3 +102,16 @@ def publish_metrics(
                 job_name=job_name,
             )
         )
+
+    if is_reconciled:
+        metrics.inc_counter(
+            ExternalResourcesReconciliationsCounter(
+                app=spec.namespace["app"]["name"],
+                environment=spec.namespace["environment"]["name"],
+                provision_provider=r.key.provision_provider,
+                provisioner_name=r.key.provisioner_name,
+                provider=r.key.provider,
+                identifier=r.key.identifier,
+                job_name=job_name,
+            )
+        )

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(