qontract-reconcile 0.10.2.dev185__py3-none-any.whl → 0.10.2.dev187__py3-none-any.whl

{qontract_reconcile-0.10.2.dev185.dist-info → qontract_reconcile-0.10.2.dev187.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev185
+Version: 0.10.2.dev187
 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
@@ -99,7 +99,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
 `qontract-reconcile` includes the following integrations:
 
 ```text
-  acs-notifiers                   Manages RHACS notifier configurations
   acs-policies                    Manages RHACS security policy configurations
   acs-rbac                        Manages RHACS rbac configuration
   advanced-upgrade-scheduler      Manage Cluster Upgrade Policy schedules in

{qontract_reconcile-0.10.2.dev185.dist-info → qontract_reconcile-0.10.2.dev187.dist-info}/RECORD

@@ -1,6 +1,5 @@
 reconcile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/acs_notifiers.py,sha256=YIV9TrgWjBD8nFbrBvvU8-9s-AdezY4X5t90bFROCtM,4451
-reconcile/acs_policies.py,sha256=xNbhIlwE1u2URbEQcX-3C-pTu--XjrKAqGj0-Wd85dY,9152
+reconcile/acs_policies.py,sha256=pwFKP3afmRbpRq-7FRAosI-A60yfufE2vvXBjOMgsCU,8653
 reconcile/acs_rbac.py,sha256=15vNfNzdG_DeXaJ-f5m8DSaJh__LUK766_xAECqyTsg,22657
 reconcile/aws_ami_share.py,sha256=M_gT7y3cSAyT_Pm90PBCNDSmbZtqREqe2jNETh0i9Qs,3808
 reconcile/aws_ecr_image_pull_secrets.py,sha256=F58PtX1GlB9XHqj8hGy9ItiTznXLAAKTNlWD9iT2MWI,2593
@@ -10,7 +9,7 @@ reconcile/aws_iam_password_reset.py,sha256=O0JX2N5kNRKs3u2xzu4NNrI6p0ag5JWy3MTsv
 reconcile/aws_support_cases_sos.py,sha256=PDhilxQ4TBxVnxUPIUdTbKEaNUI0wzPiEsB91oHT2fY,3384
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=xyVnxNyq3IPISWwFlB9j4HAFjowXYv3EdsEGIMFhTy0,108438
+reconcile/cli.py,sha256=-WTtuEtxDuHdZ-GIGtklu4p6r8YdR7QfRqdK6rHl2gY,108163
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=al7m8EgnnYx90rY1REryW3byN_ItfJfAzEeLtjbCfi0,4921
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=83ZWIf5JJk3P_D69y2TmXRcQr6ELJGlv10OM0h7fJVs,4767
@@ -27,7 +26,7 @@ reconcile/github_org.py,sha256=Wc5cZamatuWsW2ZJT2ib5ps8l3iY3RXHwNUxVJerqz0,14173
 reconcile/github_owners.py,sha256=viE1KJ-zaTxuZ5yItg2C263J0brn-Q-3hR_DkYDMbhY,3122
 reconcile/github_repo_invites.py,sha256=U9UCzNVwrZ7MqODtFah8ogH0NNY-XjBin7G9gqHtCUY,2690
 reconcile/github_repo_permissions_validator.py,sha256=PNqL4dqa2OaNBy-NmLVN-t1HZa6eS6HgSYmfOunYqtA,1798
-reconcile/github_users.py,sha256=QdX164LZrm8sqggMj-0beCzWofpS6OEBfzKNrWPrfj0,3934
+reconcile/github_users.py,sha256=ZeYNMyvZPVMx6mh5TiKEUQy4W1uw3VmUZOHiXus5I0Y,5073
 reconcile/github_validator.py,sha256=-j17tn3csFVjPMSPL3te48iWVkPZCncRXdeKeLdGjjQ,931
 reconcile/gitlab_fork_compliance.py,sha256=RbHckzLnE9zkOFHJANzoejEMMbMAivmqJVs3Suvp9lU,4591
 reconcile/gitlab_housekeeping.py,sha256=c31Jtw5t8bnOzUO9jMWF_0DHitPzol93AA7YWBxM5L0,25416
@@ -48,7 +47,7 @@ reconcile/jenkins_webhooks_cleaner.py,sha256=JsN_NVPfZJwv1JtSzZXDIHUqGiefL-DRffF
 reconcile/jenkins_worker_fleets.py,sha256=L2wEXpd4xuEHrXGss4iH788nG8UlLSYduZe1EY2IVw4,5377
 reconcile/jira_permissions_validator.py,sha256=5rc4Q2mXGL3HCZmYpZaJkjzBrpCRnlLeCY0Yl2fDOs4,14672
 reconcile/jira_watcher.py,sha256=L_UL2MKm2SoIGNsCLThm28pnqCkoFc154JWsD6bURug,3593
-reconcile/ldap_users.py,sha256=7hdO5CAPl-VNBvDRmKHg13LoblHXXPt7YEKNGomAoGg,3158
+reconcile/ldap_users.py,sha256=oP1CAxmgSi3zDJ3vKTPySjap6WmEX1U469FmFrov5l4,4599
 reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQg,1885
 reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLKoV8cdg,3306
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
@@ -230,7 +229,7 @@ reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 reconcile/gql_definitions/introspection.json,sha256=MT1HCR90ZahZxjrgaBEp34JNhjaEiDRblQK-qfSrfF0,2316277
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
-reconcile/gql_definitions/acs/acs_policies.py,sha256=9IFpGAcrZ8nTFC05q3-12nwkNOEkquHB2-XbVq5_jy4,7219
+reconcile/gql_definitions/acs/acs_policies.py,sha256=Ygpfl2-VkYLSlJvHgp_dJBfb66K_Rwfdfpsa18w1v1s,4338
 reconcile/gql_definitions/acs/acs_rbac.py,sha256=cZsIlCWliPQdQHgmBsIMx54fJNOtkdRXLzmOKZmJNHk,3009
 reconcile/gql_definitions/advanced_upgrade_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=230uwBoBaaVz686d_WNZT9eAw6BX2VpoQX0mKhf5UcM,4390
@@ -285,6 +284,7 @@ reconcile/gql_definitions/common/clusters_with_peering.py,sha256=B1Hi3u6rZZsl4bD
 reconcile/gql_definitions/common/github_orgs.py,sha256=rZ0pDAA2_9hF9N-ykRZIxPtEmczTSjuA_k3nkp0k1W0,2039
 reconcile/gql_definitions/common/jira_settings.py,sha256=Fmjxhlhr69kc4jkG_0k17fuYlQVucbNex0jXYu83wbY,1990
 reconcile/gql_definitions/common/jiralert_settings.py,sha256=H96nMg_r2YcOvioj3aIkwqtFrALGSLt7uhbx9jGSUTo,1984
+reconcile/gql_definitions/common/ldap_settings.py,sha256=qkKm3BusR4FreHcI9VSwPg-hrhBKtiQIjGsTAGvHDG4,1885
 reconcile/gql_definitions/common/namespaces.py,sha256=FUgyoDAKWSetfDumfqHRVT6lOGp9hoj1-8rC0khVJI4,11071
 reconcile/gql_definitions/common/namespaces_minimal.py,sha256=XVt8LFe-bGYbjN3ysX3b9sFGmLX4snQ_A9ZouQGaaAI,3429
 reconcile/gql_definitions/common/ocm_env_telemeter.py,sha256=jW0Q9WazDQVOxh4u0LMFG69rupBioJ8HGGjvR9bVK9Y,2424
@@ -302,6 +302,7 @@ reconcile/gql_definitions/common/slack_workspaces.py,sha256=2o0kgi4QiaRuNmZJnc_B
 reconcile/gql_definitions/common/smtp_client_settings.py,sha256=JU6t6D-Qj-z1gLlgUiHKe0W7AxWQdty9jlv-ig_43tM,2248
 reconcile/gql_definitions/common/state_aws_account.py,sha256=LAdpCG2-ykVpWBPO0Zu1WvG-hwKXyDC0fJQxJRpbqCk,2198
 reconcile/gql_definitions/common/users.py,sha256=ahY3d185LbTekCGYBLJwZJljn54RJI_P5CVefdqyoZA,1705
+reconcile/gql_definitions/common/users_with_paths.py,sha256=kOYzIXKG11JI0afgRMA5WLlEwJlvElAKytE8RAeuSco,2726
 reconcile/gql_definitions/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/cost_report/app_names.py,sha256=fzqYXyiTSll359J1F1o7qapco0MSxgs3sr_Ssb2Kbns,1786
 reconcile/gql_definitions/cost_report/cost_namespaces.py,sha256=URRozAgSa9OnkqOCZf3MGH21_wcnsqYl0n-olXdjQH0,2286
@@ -466,7 +467,7 @@ reconcile/oum/base.py,sha256=WCFdHOHXLPrJcvxVqw6HjaJthT7olC5BQqqXlD4DM6c,13552
 reconcile/oum/labelset.py,sha256=f5kDndbaIT4iNYxTRPSELTUgj_aMlzEJDPzooAkG2mE,2154
 reconcile/oum/metrics.py,sha256=S_0C-hIW4jHVl9Lltgis9q-p33fdBjADWBouQ9Emeao,1575
 reconcile/oum/models.py,sha256=teH0bJTCMTzbdbYD9CU4yXDuMr34ceLcM0KuoIPU8gI,1712
-reconcile/oum/providers.py,sha256=3kEjXvsTPzXc7gzrdO7hWqgzcMmMZMpk2S0X7wQUTWU,1767
+reconcile/oum/providers.py,sha256=lfG6d7YV-A4Lte45EMv1Gx4A346piJ_jAkrU5AHJZ_g,1834
 reconcile/oum/standalone.py,sha256=EN5y1S-3DwUZYzSRqRMtf63mI2slvBHKiU9zOTjYvWM,7334
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/prometheus_rules_tester/integration.py,sha256=8lXZSaNqZAemulVNDxanrxwl7ZGfUxtwfptJlMPX8ac,9308
@@ -562,6 +563,7 @@ reconcile/typed_queries/jenkins.py,sha256=Pus8Rhsb04F92Iqh31xe-rW1TLiEziIWd0UAth
 reconcile/typed_queries/jira.py,sha256=jq6-ERCr_Fh96_3i9A9UKfpAAstoc4Iz6Irl-_0IUkw,235
 reconcile/typed_queries/jira_settings.py,sha256=i0ddx5xxHrM1v-9mtL_6OB-jBFLw7-HS6xenpIDjrkw,570
 reconcile/typed_queries/jiralert_settings.py,sha256=y59S5xvYmuaGxszzfKhVLjbCyDwKiaSIlajocbK5MDE,793
+reconcile/typed_queries/ldap_settings.py,sha256=k8LWM11wPHn6_x2TMP7xkiwQTOPBgzuYdjzygG1WVT4,664
 reconcile/typed_queries/namespaces.py,sha256=vItPrn7sfcHOix-VvkzQkf54_ljzI_ymyxh5esdBJ5Y,262
 reconcile/typed_queries/namespaces_minimal.py,sha256=rUtqNQ0ORXXUTQfnpsMURymAJ4gYtE77V-Lb3LiJFEY,278
 reconcile/typed_queries/ocm.py,sha256=aTXW9NaMpMq-90sBUAUQmGPtk6Hnsk2rzSbXv3pD8dY,312
@@ -578,6 +580,7 @@ reconcile/typed_queries/tekton_pipeline_providers.py,sha256=LtoSnSRkuckYsXIU64L1
 reconcile/typed_queries/terraform_namespaces.py,sha256=4H9WE90jN_BVYBAt1DxJITS4vkL-vykbXZIS1H4EKNM,413
 reconcile/typed_queries/unleash.py,sha256=7HDc4owF044xM9Thx4WsXV7DZgETxJjy4lbpwmqz1vU,282
 reconcile/typed_queries/users.py,sha256=UXlaxeZAoNIugMEndfcjbkHYowUURE72aWcdmxfb3yk,377
+reconcile/typed_queries/users_with_paths.py,sha256=lvW0QzTJtKkLS2O_Jm9_0mFXJFKvGlZE809LI-5ddvc,342
 reconcile/typed_queries/vault.py,sha256=lkRsmobykorof3fcrIPLz-NgvAiSOWSOZc_jXBlnl1w,274
 reconcile/typed_queries/app_interface_metrics_exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/typed_queries/app_interface_metrics_exporter/onboarding_status.py,sha256=X-N1WJGOL6OR9940P0_K4-YJzkL5Vg4favhYrBxXD9A,327
@@ -630,7 +633,7 @@ reconcile/utils/jjb_client.py,sha256=e5cDeNAeJMGz3sZMJ1KUIMFyLdRet0YnC0Qgj1vTPHc
 reconcile/utils/jsonpath.py,sha256=wdxOMqR-GMpQf5vRPWRMqAF7bCiXDBkkcFfY2U4j_tk,5536
 reconcile/utils/jump_host.py,sha256=gi8vGUDgdTVwJvROvRVauFxtL0YAramhbWvG70L7AY8,5137
 reconcile/utils/keycloak.py,sha256=YWSEUGrOVqFaJUk055dKUWpLDPdDRvhcmvR-lfbmxdE,3388
-reconcile/utils/ldap_client.py,sha256=sxvvSEwuswDexrTlLSz9GKQ4ym9OJr-yk2dnCM5cmxs,2463
+reconcile/utils/ldap_client.py,sha256=HxOxpqyLRbXxOARZyBNbccceWIk6gF8PQjNQmBvjF2o,2148
 reconcile/utils/lean_terraform_client.py,sha256=X9358loxzkhwRExTeDv_NC8Q6HNr2tJK6Lx897YtJUc,4004
 reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=kiOoWO0b0mO-MDZWxyClYz9SeohQ0QU-xji0p-cSiLo,18462
@@ -675,7 +678,6 @@ reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5
 reconcile/utils/vcs.py,sha256=AK35vIjx9bXYclKmvNekpaG_OETt-ZybibwV-m123xc,10186
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2532
-reconcile/utils/acs/notifiers.py,sha256=DlzTDM9arWQlBSiDy70y5Mf38OKVs9V0FzFe2LfOKXA,5046
 reconcile/utils/acs/policies.py,sha256=jpbi3qpGkBD_X6MfzsX12dPajUbmACmhIOz_0rDvYzs,5489
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -729,7 +731,7 @@ reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnY
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=5EncHGr4QRnZgHedRfCwMYZ9CaijYzHGj7-M6lhtQRo,3004
 reconcile/utils/mr/promote_qontract.py,sha256=wgvX2CBlcZaihKJSXJ0zcEK8NGaEP2_DUQDz0STzGes,7158
 reconcile/utils/mr/update_access_report_base.py,sha256=4Grohtp44v1sSHZyIAYOwClxH8SLj_nnOrCcHPKp9p0,4361
-reconcile/utils/mr/user_maintenance.py,sha256=ZlR1Id_r2BUXsoerJW-0Ioh5bcbwlnQxBBhSs-ri9Dk,5099
+reconcile/utils/mr/user_maintenance.py,sha256=KSfl4i0k1CqCa9mj93bvFxHeBHPRMn3sBWdGS1nNzYY,5371
 reconcile/utils/ocm/__init__.py,sha256=Y-bp8GomMpyCo0tFW6kJ78-ZG1UIupYRtBzbMWU0kwM,798
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
 reconcile/utils/ocm/base.py,sha256=8rZ8WilNeAfq7HRNI8kNOLB4VcYzQpqQ5gvWbS54MuM,14576
@@ -807,7 +809,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 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.dev185.dist-info/METADATA,sha256=-GBtujthD8qi9Bdj1oIRUOc5iAeTf-Xa5Lp5jpTyTPE,24627
-qontract_reconcile-0.10.2.dev185.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev185.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev185.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev187.dist-info/METADATA,sha256=-iInkgy_ICSk6OCktOC27DWeGBEvZpYlsXpPFJ640IU,24555
+qontract_reconcile-0.10.2.dev187.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev187.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev187.dist-info/RECORD,,

reconcile/acs_policies.py

@@ -8,7 +8,6 @@ from reconcile.gql_definitions.acs.acs_policies import (
     AcsPolicyV1,
 )
 from reconcile.utils import gql
-from reconcile.utils.acs.notifiers import JiraNotifier
 from reconcile.utils.acs.policies import AcsPolicyApi, Policy, PolicyCondition, Scope
 from reconcile.utils.differ import diff_iterables
 from reconcile.utils.runtime.integration import (
@@ -63,21 +62,10 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
         conditions = [
             pc for c in gql_policy.conditions if (pc := self._build_policy_condition(c))
         ]
-        jira_notifier = (
-            notifier_name_to_id.get(
-                JiraNotifier.from_escalation_policy(
-                    gql_policy.integrations.notifiers.jira.escalation_policy
-                ).name
-            )
-            if gql_policy.integrations
-            and gql_policy.integrations.notifiers
-            and gql_policy.integrations.notifiers.jira
-            else None
-        )
         return Policy(
             name=gql_policy.name,
             description=gql_policy.description,
-            notifiers=[jira_notifier] if jira_notifier else [],
+            notifiers=[],
             severity=f"{gql_policy.severity.upper()}_SEVERITY",  # align with acs api severity value format
             scope=sorted(
                 [

reconcile/cli.py

@@ -3719,17 +3719,6 @@ def acs_policies(ctx):
     )
 
 
-@integration.command(short_help="Manages RHACS notifier configurations")
-@click.pass_context
-def acs_notifiers(ctx):
-    from reconcile import acs_notifiers
-
-    run_class_integration(
-        integration=acs_notifiers.AcsNotifiersIntegration(),
-        ctx=ctx.obj,
-    )
-
-
 @integration.command(short_help="Manage Unleash feature toggles.")
 @click.option("--instance", help="Reconcile just this Unlash instance.", default=None)
 @click.pass_context

reconcile/github_users.py

@@ -1,6 +1,7 @@
 import logging
 import os
 import re
+from collections import defaultdict
 from collections.abc import Callable
 
 from github import Github
@@ -17,9 +18,9 @@ from reconcile import (
     typed_queries,
 )
 from reconcile.github_org import get_default_config
-from reconcile.ldap_users import init_users as init_users_and_paths
 from reconcile.utils.defer import defer
 from reconcile.utils.mr import CreateDeleteUserAppInterface
+from reconcile.utils.mr.user_maintenance import PathSpec, PathTypes
 from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.smtp_client import (
     DEFAULT_SMTP_TIMEOUT,
@@ -39,6 +40,33 @@ def init_github() -> Github:
     return Github(token, base_url=GH_BASE_URL)
 
 
+def init_users_and_paths() -> list[dict[str, list]]:
+    app_int_users = queries.get_users(refs=True)
+
+    users = defaultdict(list)
+    for user in app_int_users:
+        u = user["org_username"]
+        item = PathSpec(type=PathTypes.USER, path=user["path"])
+        users[u].append(item)
+        for r in user.get("requests"):
+            item = PathSpec(type=PathTypes.REQUEST, path=r["path"])
+            users[u].append(item)
+        for q in user.get("queries"):
+            item = PathSpec(type=PathTypes.QUERY, path=q["path"])
+            users[u].append(item)
+        for g in user.get("gabi_instances"):
+            item = PathSpec(type=PathTypes.GABI, path=g["path"])
+            users[u].append(item)
+        for a in user.get("aws_accounts", []):
+            item = PathSpec(type=PathTypes.AWS_ACCOUNTS, path=a["path"])
+            users[u].append(item)
+        for s in user.get("schedules"):
+            item = PathSpec(type=PathTypes.SCHEDULE, path=s["path"])
+            users[u].append(item)
+
+    return [{"username": username, "paths": paths} for username, paths in users.items()]
+
+
 @retry(exceptions=(GithubException, ReadTimeout))
 def get_user_company(user: dict, github: Github) -> UserAndCompany:
     gh_user = github.get_user(login=user["github_username"])

reconcile/gql_definitions/acs/acs_policies.py

@@ -24,40 +24,6 @@ query AcsPolicy {
     name
     description
     severity
-    integrations {
-      notifiers {
-        jira {
-          escalationPolicy {
-            name
-            channels {
-              jiraBoard {
-                name
-                server {
-                  serverUrl
-                }
-                severityPriorityMappings {
-                  name
-                  mappings {
-                    severity
-                    priority
-                  }
-                }
-                issueType
-                issueFields {
-                  name
-                  value
-                }
-                disable {
-                  integrations
-                }
-              }
-              jiraComponent
-              jiraLabels
-            }
-          }
-        }
-      }
-    }
     categories
     scope {
       level
@@ -107,61 +73,6 @@ class ConfiguredBaseModel(BaseModel):
         extra=Extra.forbid
 
 
-class JiraServerV1(ConfiguredBaseModel):
-    server_url: str = Field(..., alias="serverUrl")
-
-
-class SeverityPriorityMappingV1(ConfiguredBaseModel):
-    severity: str = Field(..., alias="severity")
-    priority: str = Field(..., alias="priority")
-
-
-class JiraSeverityPriorityMappingsV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    mappings: list[SeverityPriorityMappingV1] = Field(..., alias="mappings")
-
-
-class JiraBoardIssueFieldV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    value: str = Field(..., alias="value")
-
-
-class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
-    integrations: Optional[list[str]] = Field(..., alias="integrations")
-
-
-class JiraBoardV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    server: JiraServerV1 = Field(..., alias="server")
-    severity_priority_mappings: JiraSeverityPriorityMappingsV1 = Field(..., alias="severityPriorityMappings")
-    issue_type: Optional[str] = Field(..., alias="issueType")
-    issue_fields: Optional[list[JiraBoardIssueFieldV1]] = Field(..., alias="issueFields")
-    disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")
-
-
-class AppEscalationPolicyChannelsV1(ConfiguredBaseModel):
-    jira_board: list[JiraBoardV1] = Field(..., alias="jiraBoard")
-    jira_component: Optional[str] = Field(..., alias="jiraComponent")
-    jira_labels: Optional[list[str]] = Field(..., alias="jiraLabels")
-
-
-class AppEscalationPolicyV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    channels: AppEscalationPolicyChannelsV1 = Field(..., alias="channels")
-
-
-class AcsPolicyIntegrationNotifierJiraV1(ConfiguredBaseModel):
-    escalation_policy: AppEscalationPolicyV1 = Field(..., alias="escalationPolicy")
-
-
-class AcsPolicyIntegrationNotifiersV1(ConfiguredBaseModel):
-    jira: Optional[AcsPolicyIntegrationNotifierJiraV1] = Field(..., alias="jira")
-
-
-class AcsPolicyIntegrationsV1(ConfiguredBaseModel):
-    notifiers: Optional[AcsPolicyIntegrationNotifiersV1] = Field(..., alias="notifiers")
-
-
 class AcsPolicyScopeV1(ConfiguredBaseModel):
     level: str = Field(..., alias="level")
 
@@ -218,7 +129,6 @@ class AcsPolicyV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     description: Optional[str] = Field(..., alias="description")
     severity: str = Field(..., alias="severity")
-    integrations: Optional[AcsPolicyIntegrationsV1] = Field(..., alias="integrations")
     categories: list[str] = Field(..., alias="categories")
     scope: Union[AcsPolicyScopeClusterV1, AcsPolicyScopeNamespaceV1, AcsPolicyScopeV1] = Field(..., alias="scope")
     conditions: list[Union[AcsPolicyConditionsCvssV1, AcsPolicyConditionsSeverityV1, AcsPolicyConditionsImageTagV1, AcsPolicyConditionsCveV1, AcsPolicyConditionsImageAgeV1, AcsPolicyConditionsV1]] = Field(..., alias="conditions")

reconcile/gql_definitions/common/ldap_settings.py

@@ -0,0 +1,68 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+
+DEFINITION = """
+query LdapSettings {
+  settings: app_interface_settings_v1 {
+    ldap {
+      serverUrl
+      baseDn
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class LdapSettingsV1(ConfiguredBaseModel):
+    server_url: str = Field(..., alias="serverUrl")
+    base_dn: str = Field(..., alias="baseDn")
+
+
+class AppInterfaceSettingsV1(ConfiguredBaseModel):
+    ldap: Optional[LdapSettingsV1] = Field(..., alias="ldap")
+
+
+class LdapSettingsQueryData(ConfiguredBaseModel):
+    settings: Optional[list[AppInterfaceSettingsV1]] = Field(..., alias="settings")
+
+
+def query(query_func: Callable, **kwargs: Any) -> LdapSettingsQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        LdapSettingsQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return LdapSettingsQueryData(**raw_data)

reconcile/gql_definitions/common/users_with_paths.py

@@ -0,0 +1,102 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+
+DEFINITION = """
+query UsersWithPaths {
+  users: users_v1 {
+    path
+    org_username
+    aws_accounts {
+      path
+    }
+    requests {
+      path
+    }
+    queries {
+      path
+    }
+    gabi_instances {
+      path
+    }
+    schedules {
+      path
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class AWSAccountV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+
+
+class CredentialsRequestV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+
+
+class AppInterfaceSqlQueryV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+
+
+class GabiInstanceV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+
+
+class ScheduleV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+
+
+class UserV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
+    org_username: str = Field(..., alias="org_username")
+    aws_accounts: Optional[list[AWSAccountV1]] = Field(..., alias="aws_accounts")
+    requests: Optional[list[CredentialsRequestV1]] = Field(..., alias="requests")
+    queries: Optional[list[AppInterfaceSqlQueryV1]] = Field(..., alias="queries")
+    gabi_instances: Optional[list[GabiInstanceV1]] = Field(..., alias="gabi_instances")
+    schedules: Optional[list[ScheduleV1]] = Field(..., alias="schedules")
+
+
+class UsersWithPathsQueryData(ConfiguredBaseModel):
+    users: Optional[list[UserV1]] = Field(..., alias="users")
+
+
+def query(query_func: Callable, **kwargs: Any) -> UsersWithPathsQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        UsersWithPathsQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return UsersWithPathsQueryData(**raw_data)

reconcile/ldap_users.py

@@ -1,99 +1,126 @@
 import logging
-from collections import defaultdict
+from collections.abc import Callable
+
+from pydantic import BaseModel, Field
 
 from reconcile import (
     mr_client_gateway,
-    queries,
 )
-from reconcile.utils import gql
+from reconcile.gql_definitions.common.ldap_settings import LdapSettingsV1
+from reconcile.gql_definitions.common.users_with_paths import UserV1
+from reconcile.typed_queries.ldap_settings import get_ldap_settings
+from reconcile.typed_queries.users_with_paths import get_users_with_paths
 from reconcile.utils.defer import defer
 from reconcile.utils.ldap_client import LdapClient
 from reconcile.utils.mr import (
     CreateDeleteUserAppInterface,
     CreateDeleteUserInfra,
 )
-from reconcile.utils.mr.user_maintenance import PathTypes
+from reconcile.utils.mr.user_maintenance import PathSpec, PathTypes
 
 QONTRACT_INTEGRATION = "ldap-users"
 
 
-def init_users() -> list[dict[str, list]]:
-    app_int_users = queries.get_users(refs=True)
-
-    users = defaultdict(list)
-    for user in app_int_users:
-        u = user["org_username"]
-        item = {"type": PathTypes.USER, "path": "data" + user["path"]}
-        users[u].append(item)
-        for r in user.get("requests"):
-            item = {"type": PathTypes.REQUEST, "path": "data" + r["path"]}
-            users[u].append(item)
-        for q in user.get("queries"):
-            item = {"type": PathTypes.QUERY, "path": "data" + q["path"]}
-            users[u].append(item)
-        for g in user.get("gabi_instances"):
-            item = {"type": PathTypes.GABI, "path": "data" + g["path"]}
-            users[u].append(item)
-        for a in user.get("aws_accounts", []):
-            item = {"type": PathTypes.AWS_ACCOUNTS, "path": "data" + a["path"]}
-            users[u].append(item)
-        for s in user.get("schedules"):
-            item = {"type": PathTypes.SCHEDULE, "path": "data" + s["path"]}
-            users[u].append(item)
-
-    return [{"username": username, "paths": paths} for username, paths in users.items()]
-
-
-LDAP_SETTINGS_QUERY = """
-{
-  settings: app_interface_settings_v1 {
-    ldap {
-      serverUrl
-      baseDn
-    }
-  }
-}
-"""
-
-
-def get_ldap_settings() -> dict:
-    """Returns LDAP settings"""
-    gqlapi = gql.get_api()
-    settings = gqlapi.query(LDAP_SETTINGS_QUERY)["settings"]
-    if settings:
-        # assuming a single settings file for now
-        return settings[0]
-    raise ValueError("no app-interface-settings settings found")
+class UserPaths(BaseModel):
+    username: str
+    paths: list[PathSpec] = Field(default_factory=list)
 
 
-@defer
-def run(dry_run, app_interface_project_id, infra_project_id, defer=None):
-    users = init_users()
-    with LdapClient.from_settings(get_ldap_settings()) as ldap_client:
-        ldap_users = ldap_client.get_users([u["username"] for u in users])
+def transform_users_with_paths(users_with_paths: list[UserV1]) -> list[UserPaths]:
+    """Converts UserV1 objects into UserPaths, consolidating all associated resource paths by type."""
+
+    users_paths = []
+    for user in users_with_paths:
+        up = UserPaths(username=user.org_username)
+        up.paths.append(PathSpec(type=PathTypes.USER, path=user.path))
+        for r in user.requests or []:
+            up.paths.append(PathSpec(type=PathTypes.REQUEST, path=r.path))
+        for q in user.queries or []:
+            up.paths.append(PathSpec(type=PathTypes.QUERY, path=q.path))
+        for g in user.gabi_instances or []:
+            up.paths.append(PathSpec(type=PathTypes.GABI, path=g.path))
+        for a in user.aws_accounts or []:
+            up.paths.append(PathSpec(type=PathTypes.AWS_ACCOUNTS, path=a.path))
+        for s in user.schedules or []:
+            up.paths.append(PathSpec(type=PathTypes.SCHEDULE, path=s.path))
+
+        users_paths.append(up)
+
+    return users_paths
+
+
+def get_usernames(users_paths: list[UserPaths]) -> list[str]:
+    """Extracts a list of usernames from a list of UserPaths objects."""
+    return [u.username for u in users_paths]
+
+
+def filter_users_not_exists(
+    users_paths: list[UserPaths], ldap_users: set[str]
+) -> list[UserPaths]:
+    """Filters out UserPaths objects whose usernames are not present in the given set of LDAP users."""
+
+    return [u for u in users_paths if u.username not in ldap_users]
+
 
-    users_to_delete = [u for u in users if u["username"] not in ldap_users]
+def get_ldap_users(ldap_settings: LdapSettingsV1, usernames: list[str]) -> set[str]:
+    """Retrieves existing usernames from LDAP based on the provided list and connection settings."""
+    with LdapClient.from_params(
+        server_url=ldap_settings.server_url,
+        user=None,
+        password=None,
+        base_dn=ldap_settings.base_dn,
+    ) as ldap_client:
+        return ldap_client.get_users(usernames)
 
+
+@defer
+def delete_user_from_app_interface(
+    dry_run: bool,
+    app_interface_project_id: str | int | None,
+    users: list[UserPaths],
+    defer: Callable | None = None,
+) -> None:
+    """Delete user data stored in the repository app-interface related with the given users."""
     if not dry_run:
         mr_cli_app_interface = mr_client_gateway.init(
             gitlab_project_id=app_interface_project_id, sqs_or_gitlab="gitlab"
         )
-        defer(mr_cli_app_interface.cleanup)
-        mr_cli_infra = mr_client_gateway.init(
-            gitlab_project_id=infra_project_id, sqs_or_gitlab="gitlab"
-        )
-        defer(mr_cli_infra.cleanup)
+        if defer:
+            defer(mr_cli_app_interface.cleanup)
 
-    for u in users_to_delete:
-        username = u["username"]
-        paths = u["paths"]
-        logging.info(["delete_user", username])
+    for user in users:
+        logging.info(["delete_user", user.username])
 
         if not dry_run:
-            mr = CreateDeleteUserAppInterface(username, paths)
+            mr = CreateDeleteUserAppInterface(user.username, user.paths)
             mr.submit(cli=mr_cli_app_interface)
 
+
+def delete_user_from_infra(
+    dry_run: bool,
+    infra_project_id: str | int | None,
+    usernames: list[str],
+) -> None:
+    """Delete user data stored in the repository infra related with the given usernames."""
     if not dry_run:
-        usernames = [u["username"] for u in users_to_delete]
-        mr_infra = CreateDeleteUserInfra(usernames)
-        mr_infra.submit(cli=mr_cli_infra)
+        with mr_client_gateway.init(
+            gitlab_project_id=infra_project_id, sqs_or_gitlab="gitlab"
+        ) as mr_cli_infra:
+            mr_infra = CreateDeleteUserInfra(usernames)
+            mr_infra.submit(cli=mr_cli_infra)
+
+
+def run(dry_run: bool, app_interface_project_id: str, infra_project_id: str) -> None:
+    """
+    Synchronizes user data stored in the repositories app_interface and infra
+    associated with users that are no longer found in the LDAP.
+    """
+    users_paths = transform_users_with_paths(get_users_with_paths())
+
+    ldap_users = get_ldap_users(get_ldap_settings(), get_usernames(users_paths))
+
+    users_to_delete = filter_users_not_exists(users_paths, ldap_users)
+    usernames_to_delete = get_usernames(users_to_delete)
+
+    delete_user_from_app_interface(dry_run, app_interface_project_id, users_to_delete)
+    delete_user_from_infra(dry_run, infra_project_id, usernames_to_delete)

reconcile/oum/providers.py

@@ -3,7 +3,7 @@ from abc import (
     abstractmethod,
 )
 
-from reconcile.ldap_users import get_ldap_settings
+from reconcile.typed_queries.ldap_settings import get_ldap_settings
 from reconcile.utils.ldap_client import LdapClient
 
 
@@ -53,7 +53,10 @@ def init_ldap_group_member_provider(group_base_dn: str) -> LdapGroupMemberProvid
     settings = get_ldap_settings()
     return LdapGroupMemberProvider(
         LdapClient.from_params(
-            settings["ldap"]["serverUrl"], None, None, settings["ldap"]["baseDn"]
+            server_url=settings.server_url,
+            user=None,
+            password=None,
+            base_dn=settings.base_dn,
         ),
         group_base_dn,
     )

reconcile/typed_queries/ldap_settings.py

@@ -0,0 +1,20 @@
+from collections.abc import Callable
+
+from reconcile.gql_definitions.common.ldap_settings import (
+    LdapSettingsV1,
+    query,
+)
+from reconcile.utils import gql
+from reconcile.utils.exceptions import AppInterfaceSettingsError
+
+
+def get_ldap_settings(
+    query_func: Callable | None = None,
+) -> LdapSettingsV1:
+    """Returns App Interface Settings and raises err if none are found"""
+    if not query_func:
+        query_func = gql.get_api().query
+    data = query(query_func)
+    if data.settings and len(data.settings) == 1 and data.settings[0].ldap:
+        return data.settings[0].ldap
+    raise AppInterfaceSettingsError("Ldap settings is not defined.")

reconcile/typed_queries/users_with_paths.py

@@ -0,0 +1,10 @@
+from collections.abc import Callable
+
+from reconcile.gql_definitions.common.users_with_paths import UserV1, query
+from reconcile.utils import gql
+
+
+def get_users_with_paths(query_func: Callable | None = None) -> list[UserV1]:
+    if not query_func:
+        query_func = gql.get_api().query
+    return query(query_func=query_func).users or []

reconcile/utils/ldap_client.py

@@ -56,13 +56,6 @@ class LdapClient:
 
         return dict(groups_and_members)
 
-    @classmethod
-    def from_settings(cls, settings: dict) -> "LdapClient":
-        """Requires a nested dictionary with key 'ldap' in addition sub keys 'serverUrl' and 'baseDn'."""
-        return LdapClient.from_params(
-            settings["ldap"]["serverUrl"], None, None, settings["ldap"]["baseDn"]
-        )
-
     @classmethod
     def from_params(
         cls, server_url: str, user: str | None, password: str | None, base_dn: str

reconcile/utils/mr/user_maintenance.py

@@ -1,5 +1,8 @@
+from collections.abc import Iterable
+from enum import Enum
 from pathlib import Path
 
+from pydantic import BaseModel, validator
 from ruamel import yaml
 
 from reconcile.utils.gitlab_api import GitLabApi
@@ -7,7 +10,7 @@ from reconcile.utils.mr.base import MergeRequestBase
 from reconcile.utils.mr.labels import AUTO_MERGE
 
 
-class PathTypes:
+class PathTypes(Enum):
     USER = 0
     REQUEST = 1
     QUERY = 2
@@ -16,10 +19,19 @@ class PathTypes:
     SCHEDULE = 5
 
 
+class PathSpec(BaseModel):
+    type: PathTypes
+    path: str
+
+    @validator("path")
+    def prepend_data_to_path(cls, v):
+        return "data" + v
+
+
 class CreateDeleteUserAppInterface(MergeRequestBase):
     name = "create_delete_user_mr"
 
-    def __init__(self, username, paths):
+    def __init__(self, username, paths: Iterable[PathSpec]):
         self.username = username
         self.paths = paths
 
@@ -37,8 +49,8 @@ class CreateDeleteUserAppInterface(MergeRequestBase):
 
     def process(self, gitlab_cli: GitLabApi) -> None:
         for path_spec in self.paths:
-            path_type = path_spec["type"]
-            path = path_spec["path"]
+            path_type = path_spec.type
+            path = path_spec.path
             if path_type in {PathTypes.USER, PathTypes.REQUEST, PathTypes.QUERY}:
                 gitlab_cli.delete_file(
                     branch_name=self.branch, file_path=path, commit_message=self.title

reconcile/acs_notifiers.py

@@ -1,126 +0,0 @@
-import logging
-
-import reconcile.gql_definitions.acs.acs_policies as gql_acs_policies
-from reconcile.gql_definitions.jira.jira_servers import (
-    JiraServerV1,
-)
-from reconcile.gql_definitions.jira.jira_servers import (
-    query as query_jira_servers,
-)
-from reconcile.utils import gql
-from reconcile.utils.acs.notifiers import (
-    AcsNotifiersApi,
-    JiraCredentials,
-    JiraNotifier,
-)
-from reconcile.utils.differ import diff_iterables
-from reconcile.utils.disabled_integrations import integration_is_enabled
-from reconcile.utils.runtime.integration import (
-    NoParams,
-    QontractReconcileIntegration,
-)
-from reconcile.utils.semver_helper import make_semver
-
-
-class AcsNotifiersIntegration(QontractReconcileIntegration[NoParams]):
-    def __init__(self) -> None:
-        super().__init__(NoParams())
-        self.qontract_integration = "acs-notifiers"
-        self.qontract_integration_version = make_semver(0, 1, 0)
-
-    @property
-    def name(self) -> str:
-        return self.qontract_integration
-
-    def _get_escalation_policies(
-        self, acs_policies: list[gql_acs_policies.AcsPolicyV1]
-    ) -> list[gql_acs_policies.AppEscalationPolicyV1]:
-        return list(
-            {
-                p.integrations.notifiers.jira.escalation_policy.name: p.integrations.notifiers.jira.escalation_policy
-                for p in acs_policies
-                if p.integrations
-                and p.integrations.notifiers
-                and p.integrations.notifiers.jira
-                and integration_is_enabled(
-                    self.qontract_integration,
-                    p.integrations.notifiers.jira.escalation_policy.channels.jira_board[
-                        0
-                    ],
-                )
-            }.values()
-        )
-
-    def get_desired_state(
-        self, acs_policies: list[gql_acs_policies.AcsPolicyV1]
-    ) -> list[JiraNotifier]:
-        return [
-            JiraNotifier.from_escalation_policy(ep)
-            for ep in self._get_escalation_policies(acs_policies)
-        ]
-
-    def get_jira_credentials(
-        self, jira_servers: list[JiraServerV1]
-    ) -> dict[str, JiraCredentials]:
-        return {
-            server.server_url: JiraCredentials(
-                url=server.server_url,
-                username=server.username,
-                token=self.secret_reader.read_secret(server.token),
-            )
-            for server in jira_servers
-        }
-
-    def reconcile(
-        self,
-        current_state: list[JiraNotifier],
-        desired_state: list[JiraNotifier],
-        acs_api: AcsNotifiersApi,
-        jira_credentials: dict[str, JiraCredentials],
-        dry_run: bool,
-    ) -> None:
-        diff = diff_iterables(
-            current=current_state, desired=desired_state, key=lambda x: x.name
-        )
-        for a in diff.add.values():
-            logging.info(f"Create Jira notifier: {a.name}")
-            if not dry_run:
-                acs_api.create_jira_notifier(
-                    a,
-                    jira_credentials=jira_credentials[a.url],
-                )
-        for c in diff.change.values():
-            logging.info(f"Update Jira notifier: {c.desired.name}")
-            if not dry_run:
-                acs_api.update_jira_notifier(
-                    c.desired,
-                    jira_credentials=jira_credentials[c.desired.url],
-                )
-        for d in diff.delete.values():
-            logging.info(f"Delete Jira notifier: {d.name}")
-            if not dry_run:
-                acs_api.delete_jira_notifier(d)
-
-    def run(
-        self,
-        dry_run: bool,
-    ) -> None:
-        gql_api_query = gql.get_api().query
-        jira_credentials = self.get_jira_credentials(
-            query_jira_servers(query_func=gql_api_query).jira_servers or []
-        )
-        desired_state = self.get_desired_state(
-            gql_acs_policies.query(query_func=gql_api_query).acs_policies or []
-        )
-        instance = AcsNotifiersApi.get_acs_instance(query_func=gql_api_query)
-        with AcsNotifiersApi(
-            url=instance.url, token=self.secret_reader.read_secret(instance.credentials)
-        ) as acs_api:
-            current_state = acs_api.get_jira_notifiers()
-            self.reconcile(
-                current_state=current_state,
-                desired_state=desired_state,
-                acs_api=acs_api,
-                jira_credentials=jira_credentials,
-                dry_run=dry_run,
-            )

reconcile/utils/acs/notifiers.py

@@ -1,145 +0,0 @@
-import json
-from typing import Any
-
-from pydantic import BaseModel
-
-from reconcile.gql_definitions.acs.acs_policies import AppEscalationPolicyV1
-from reconcile.utils.acs.base import AcsBaseApi
-
-
-class JiraCredentials(BaseModel):
-    url: str
-    username: str
-    token: str
-
-
-class SeverityPriorityMapping(BaseModel):
-    severity: str
-    priority: str
-
-    @staticmethod
-    def from_api(mapping: dict[str, str]) -> "SeverityPriorityMapping":
-        return SeverityPriorityMapping(
-            severity=mapping["severity"].replace("_SEVERITY", "").lower(),
-            priority=mapping["priorityName"],
-        )
-
-    def to_api(self) -> Any:
-        return {
-            "severity": f"{self.severity.upper()}_SEVERITY",
-            "priorityName": self.priority,
-        }
-
-
-class JiraNotifier(BaseModel):
-    name: str
-    board: str
-    url: str
-    issue_type: str | None
-    severity_priority_mappings: list[SeverityPriorityMapping]
-    custom_fields: dict[str, Any] | None
-
-    @staticmethod
-    def from_api(notifier: dict[str, Any]) -> "JiraNotifier":
-        notifier_jira = notifier["jira"]
-        return JiraNotifier(
-            name=notifier["name"],
-            board=notifier["labelDefault"],
-            url=notifier_jira["url"],
-            issue_type=notifier_jira["issueType"],
-            severity_priority_mappings=sorted(
-                [
-                    SeverityPriorityMapping.from_api(mapping)
-                    for mapping in notifier_jira["priorityMappings"]
-                ],
-                key=lambda m: m.severity,
-            ),
-            custom_fields=json.loads(notifier_jira.get("defaultFieldsJson") or "{}"),
-        )
-
-    def to_api(self, ui_endpoint: str, jira_credentials: JiraCredentials) -> Any:
-        return {
-            "name": self.name,
-            "type": "jira",
-            "uiEndpoint": ui_endpoint,
-            "labelDefault": self.board,
-            "jira": {
-                "url": jira_credentials.url,
-                "username": jira_credentials.username,
-                "password": jira_credentials.token,
-                "issueType": self.issue_type or "Task",
-                "priorityMappings": [
-                    mapping.to_api() for mapping in self.severity_priority_mappings
-                ],
-                "defaultFieldsJson": json.dumps(self.custom_fields or {}),
-            },
-        }
-
-    @staticmethod
-    def from_escalation_policy(
-        escalation_policy: AppEscalationPolicyV1,
-    ) -> "JiraNotifier":
-        jira_board = escalation_policy.channels.jira_board[0]
-
-        custom_fields: dict[str, Any] = {}
-        for field in jira_board.issue_fields or []:
-            if field.name == "Security Level":
-                custom_fields["security"] = {"name": field.value}
-
-        if escalation_policy.channels.jira_component:
-            custom_fields["components"] = [
-                {"name": escalation_policy.channels.jira_component}
-            ]
-        if escalation_policy.channels.jira_labels:
-            custom_fields["labels"] = escalation_policy.channels.jira_labels
-
-        return JiraNotifier(
-            name=f"jira-{escalation_policy.name}",
-            board=jira_board.name,
-            url=jira_board.server.server_url,
-            issue_type=jira_board.issue_type or "Task",
-            severity_priority_mappings=sorted(
-                [
-                    SeverityPriorityMapping(**vars(sp))
-                    for sp in jira_board.severity_priority_mappings.mappings
-                ],
-                key=lambda m: m.severity,
-            ),
-            custom_fields=custom_fields,
-        )
-
-
-class AcsNotifiersApi(AcsBaseApi):
-    """
-    Implements methods to support reconcile operations against the ACS NotifiersService api
-    """
-
-    def get_notifiers(self) -> list[Any]:
-        return self.generic_request_json("/v1/notifiers", "GET")["notifiers"]
-
-    def get_jira_notifiers(self) -> list[JiraNotifier]:
-        return [
-            JiraNotifier.from_api(notifier)
-            for notifier in self.get_notifiers()
-            if notifier["type"] == "jira"
-        ]
-
-    def get_notifier_id_by_name(self, name: str) -> str:
-        return next(n["id"] for n in self.get_notifiers() if n["name"] == name)
-
-    def update_jira_notifier(
-        self, jira_notifier: JiraNotifier, jira_credentials: JiraCredentials
-    ) -> None:
-        notifier_id = self.get_notifier_id_by_name(jira_notifier.name)
-        body = jira_notifier.to_api(self.url, jira_credentials)
-        self.generic_request(f"/v1/notifiers/{notifier_id}", "PUT", body)
-
-    def create_jira_notifier(
-        self, jira_notifier: JiraNotifier, jira_credentials: JiraCredentials
-    ) -> None:
-        body = jira_notifier.to_api(self.url, jira_credentials)
-        self.generic_request("/v1/notifiers", "POST", body)
-
-    def delete_jira_notifier(self, jira_notifier: JiraNotifier) -> None:
-        notifier_id = self.get_notifier_id_by_name(jira_notifier.name)
-        self.generic_request(f"/v1/notifiers/{notifier_id}", "DELETE")