qontract-reconcile 0.10.1rc623__py3-none-any.whl → 0.10.1rc625__py3-none-any.whl

{qontract_reconcile-0.10.1rc623.dist-info → qontract_reconcile-0.10.1rc625.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc623
+Version: 0.10.1rc625
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc623.dist-info → qontract_reconcile-0.10.1rc625.dist-info}/RECORD

@@ -102,7 +102,7 @@ reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9
 reconcile/service_dependencies.py,sha256=PMKP9vc6oL-78rzyF_RE8DzLSQMSqN8vCqt9sWpBLAM,4470
 reconcile/signalfx_endpoint_monitoring.py,sha256=D1m8iq0EAKie0OD59FOcVCtpWWZ7xlo6lwBS9urwMIk,2894
 reconcile/slack_base.py,sha256=K3fSYx46G1djoPb07_C9j6ChhMCt5LgV5l6v2TFkNZk,3479
-reconcile/slack_usergroups.py,sha256=4Xikz_zKPHE5Q_hf2vOOs9vlItxgCqZPn7YJgn1Brik,27294
+reconcile/slack_usergroups.py,sha256=XC7bYHP322EFWrEaR4Orw_sOoMFmuV3o08OC0UE4xLQ,27592
 reconcile/sql_query.py,sha256=qLTUU2Hc0BmJoSl9cCUsIfdEaEaOQp7y__E4KLjjcaA,25732
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=nA74_133jukxVShjPKJpkXOA3vggDTTEhYTegoXbN1M,8632
@@ -457,7 +457,7 @@ reconcile/test/test_saasherder.py,sha256=1_GyiXxxNqKSKE7PrtFJL7tUFg77d1oQPZzNBZW
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=5NHQwNJO66at6HiyMZ5sVRTQDwxdvlOQo0KmkBWCw5Q,4853
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=gpbWOLNxMMX6fyAbs1JakhLTnwfedb3f7WpUae4tQZE,5060
-reconcile/test/test_slack_usergroups.py,sha256=VOIxxPgB5aIkDem4ZcvffHrrJzZvcReuKzFKjdnor1c,23533
+reconcile/test/test_slack_usergroups.py,sha256=UO-OzqbGMSpNsyddu2TbWOzSiVze6Bq95Ph1QIJqLWY,23990
 reconcile/test/test_sql_query.py,sha256=rC-lf1_isT9i2ZIV9W0hkUkLi2oBIjZMRMhk-6mV-34,11029
 reconcile/test/test_status_board.py,sha256=WdAq4pFoWWqcOcfgMzssZD3xfvT1QLrEHJqUARldtvA,7875
 reconcile/test/test_terraform_aws_route53.py,sha256=xHggb8K1P76OyCfFcogbkmyKle-NlUylcbDnuv3IqvY,771
@@ -591,7 +591,7 @@ reconcile/utils/ocm_base_client.py,sha256=dBmO7y82u7G1RhhHAldj5fnNd8p8V5vx4dN_PJ
 reconcile/utils/openshift_resource.py,sha256=Ft1LpKrG71pU-gEA95Xp0G6a6Prmru0SzBSzxjaJ8no,24516
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
 reconcile/utils/output.py,sha256=4tObxIS_-EdJY_YCOOOmaYvHY40Q72IpYjWhjpJR1Ec,1856
-reconcile/utils/pagerduty_api.py,sha256=938KW_hjV-kyxV7sfYijU6rSzSdyaWy_pKV7HLwuX8A,7644
+reconcile/utils/pagerduty_api.py,sha256=fcSAUez6w51woDvbm0plJW2qSw6_NXQs1Fit_KTNitc,7653
 reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv9s8ffbTSY,1840
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
 reconcile/utils/promotion_state.py,sha256=avYxHUf4zK3dBhXEdUEry79EOSgJ7gfStvvOpcedZnI,2575
@@ -714,8 +714,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc623.dist-info/METADATA,sha256=xjFvDyYPpdcxB53kEXuqdxPzfzczGv39b5Lwe5-e7MI,2382
-qontract_reconcile-0.10.1rc623.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc623.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc623.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc623.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc625.dist-info/METADATA,sha256=zHAp9JWVyX5qDHsnC7BAbcN2EjAMiPlwm2AwJIi2KLI,2382
+qontract_reconcile-0.10.1rc625.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc625.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc625.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc625.dist-info/RECORD,,

reconcile/slack_usergroups.py

@@ -799,11 +799,20 @@ def run(
 
 def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
     gqlapi = gql.get_api()
+    # exclude user.roles (cluster access roles) with tag_on_cluster_updates: false
+    # to speedup PR checks
+    users = get_users(gqlapi.query)
+    for user in users:
+        user.roles = [
+            role
+            for role in user.roles or []
+            if role.tag_on_cluster_updates is not False
+        ]
     return {
         "permissions": [p.dict() for p in get_permissions(gqlapi.query)],
         "pagerduty_instances": [
             p.dict() for p in get_pagerduty_instances(gqlapi.query)
         ],
-        "users": [u.dict() for u in get_users(gqlapi.query)],
+        "users": [u.dict() for u in users],
         "clusters": [c.dict() for c in get_clusters(gqlapi.query)],
     }

reconcile/test/test_slack_usergroups.py

@@ -19,7 +19,7 @@ from pytest_mock import MockerFixture
 
 import reconcile.slack_base as slackbase
 import reconcile.slack_usergroups as integ
-from reconcile.gql_definitions.slack_usergroups.clusters import ClusterV1
+from reconcile.gql_definitions.slack_usergroups.clusters import ClusterAuthV1, ClusterV1
 from reconcile.gql_definitions.slack_usergroups.permissions import (
     PagerDutyInstanceV1,
     PagerDutyTargetV1,
@@ -131,6 +131,8 @@ def test_get_users(fxt: Fixtures) -> None:
     users = get_users(q)
     assert len(users) == 2
     assert users[0].org_username == "user1-org-username"
+    assert users[0].roles
+    assert len(users[0].roles) == 1
     assert (
         users[1].roles
         and users[1].roles[0].access
@@ -242,6 +244,16 @@ def test_include_user_to_cluster_usergroup_user_has_cluster_access(
     assert not integ.include_user_to_cluster_usergroup(user, cluster, ["user1"])
 
 
+def test_user_has_cluster_access(mocker: MockerFixture, user: UserV1) -> None:
+    cluster = ClusterV1(
+        name="cluster",
+        auth=[ClusterAuthV1(service="oidc")],
+        disable={"integrations": []},
+    )
+    assert integ.user_has_cluster_access(user, cluster, [user.org_username])
+    assert not integ.user_has_cluster_access(user, cluster, ["just-another-user"])
+
+
 def test_include_user_to_cluster_usergroup(mocker: MockerFixture, user: UserV1) -> None:
     mocker.patch.object(
         integ,

reconcile/utils/pagerduty_api.py

@@ -76,7 +76,7 @@ class PagerDutyApi:
             self.users: list[pypd.User] = []
 
     def init_users(self) -> None:
-        self.users = pypd.User.find()
+        self.users = pypd.User.find(limit=100)
 
     def get_pagerduty_users(
         self, resource_type: str, resource_id: str