qontract-reconcile 0.10.1rc179__py3-none-any.whl → 0.10.1rc181__py3-none-any.whl

{qontract_reconcile-0.10.1rc179.dist-info → qontract_reconcile-0.10.1rc181.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc179
+Version: 0.10.1rc181
 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.1rc179.dist-info → qontract_reconcile-0.10.1rc181.dist-info}/RECORD

@@ -92,7 +92,7 @@ reconcile/query_validator.py,sha256=oLEZIAsQCzxmmZ7b9dSw-OKuEjpI1dbVu4XfCfjpmi8,
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
 reconcile/saas_file_validator.py,sha256=WdRVwAdEWO3uH3atefZhZRiQEZje7SQBfVZI6L6c7cA,1955
-reconcile/sendgrid_teammates.py,sha256=SzPY9Sq8da9UWBJPdnfPA5wE9XFRy5oXOHOwiKFbPS0,4578
+reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9D8,4773
 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
@@ -143,7 +143,7 @@ reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_G
 reconcile/cna/assets/null.py,sha256=Fby1Fbn7oNRIGNasdyhRDvXJ0ktpxv-pUAPN0lZWSzk,1684
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip/integration.py,sha256=52TnE8OH3I-GMg7p3IvlbnV-ysgnGBM2Rt57Hi0KI7s,6216
-reconcile/glitchtip/reconciler.py,sha256=U0ywAmdKjBU8Y75_YJhKEbTUJmX0IDjHvgLDb31xXPY,11608
+reconcile/glitchtip/reconciler.py,sha256=37XiDur1-6sAkYFju2xLI8ybbtkraLghdV2bibKyEiU,11499
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=IvFlSYumDPhUw7gLfFX1P8tg-7Vns0ot2-Nqf2_sE18,7997
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -552,7 +552,7 @@ reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO6
 reconcile/utils/cloud_resource_best_practice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/cloud_resource_best_practice/aws_rds.py,sha256=ZMQ7jT1HQbPIw0yJ7dXlDc6IETKUsLX3azWOvf5QLe0,2246
 reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5__Dcl7yt0,258
-reconcile/utils/glitchtip/client.py,sha256=xra8V8R6p0NGISD5PWbl4uSIecoIm7xBqVTILkfRSh8,8454
+reconcile/utils/glitchtip/client.py,sha256=XKJtIDFBQv0q7n6GwVof8nxJNVuqqtRiCSgyuZkho0E,8420
 reconcile/utils/glitchtip/models.py,sha256=hZphtws-06IJUdd5uTpt22r8cv5Z4MLNE4OTo3zo6Lc,3800
 reconcile/utils/mr/__init__.py,sha256=KrOHqf4qbF-2Sk73xGYDQxeAC53n0mlXgcYspbeNEkI,2366
 reconcile/utils/mr/app_interface_reporter.py,sha256=oksi5DjFO2y7dVnj6RTRhbocz-BdOZ25921UWZ9ecpY,1725
@@ -611,8 +611,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc179.dist-info/METADATA,sha256=4SywciAMRsGbYub1P0P7s2vsNUx-juCLaG1H4p06Lxk,2320
-qontract_reconcile-0.10.1rc179.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc179.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc179.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc179.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc181.dist-info/METADATA,sha256=l6FSgHTQm880panBhJvpX_2jEU8kPolK_nc9dfPy5xg,2320
+qontract_reconcile-0.10.1rc181.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc181.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc181.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc181.dist-info/RECORD,,

reconcile/glitchtip/reconciler.py

@@ -35,8 +35,6 @@ class GlitchtipReconciler:
             if not self.dry_run:
                 self.client.delete_project(
                     organization_slug=organization_slug,
-                    # there is always at least one team
-                    team_slug=project.teams[0].slug,
                     slug=project.slug,
                 )
 

reconcile/sendgrid_teammates.py

@@ -44,27 +44,37 @@ def fetch_desired_state(users):
 @retry()
 def fetch_current_state(sg_client):
     state = []
+    limit = 100
 
     # pending invites
-    limit = 300
-    invites = sg_client.teammates.pending.get({"limit": limit}).to_dict["result"]
-    if len(invites) == limit:
-        raise RuntimeError(
-            "too many pending invites and i was too lazy to implement paging. take that future me"
-        )
-    for invite in invites:
-        t = Teammate(invite["email"], pending_token=invite["token"])
-        state.append(t)
+    offset = 0
+    while True:
+        invites = sg_client.teammates.pending.get(
+            query_params={"limit": limit, "offset": offset}
+        ).to_dict["result"]
+        if not invites:
+            break
+        for invite in invites:
+            t = Teammate(invite["email"], pending_token=invite["token"])
+            state.append(t)
+        offset += limit
 
     # current teammates
-    teammates = sg_client.teammates.get().to_dict["result"]
-    for teammate in teammates:
-        if teammate["user_type"] == "owner":
-            # we want to ignore the root account (owner account)
-            continue
-
-        t = Teammate(teammate["email"], username=teammate["username"])
-        state.append(t)
+    offset = 0
+    while True:
+        teammates = sg_client.teammates.get(
+            query_params={"limit": limit, "offset": offset}
+        ).to_dict["result"]
+        if not teammates:
+            break
+        for teammate in teammates:
+            if teammate["user_type"] == "owner":
+                # we want to ignore the root account (owner account)
+                continue
+
+            t = Teammate(teammate["email"], username=teammate["username"])
+            state.append(t)
+        offset += limit
 
     return state
 

reconcile/utils/glitchtip/client.py

@@ -145,10 +145,10 @@ class GlitchtipClient:
             )
         )
 
-    def delete_project(self, organization_slug: str, team_slug: str, slug: str) -> None:
+    def delete_project(self, organization_slug: str, slug: str) -> None:
         """Delete a project."""
         self._delete(
-            f"/api/0/teams/{organization_slug}/{team_slug}/projects/{slug}/",
+            f"/api/0/projects/{organization_slug}/{slug}/",
         )
 
     def project_key(self, organization_slug: str, project_slug: str) -> ProjectKey: