qontract-reconcile 0.10.2.dev495__py3-none-any.whl → 0.10.2.dev497__py3-none-any.whl

{qontract_reconcile-0.10.2.dev495.dist-info → qontract_reconcile-0.10.2.dev497.dist-info}/METADATA

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

@@ -98,7 +98,7 @@ reconcile/service_dependencies.py,sha256=KydjllianL0lUwhroBAPui7jrnhHSq7j2PB6CoV
 reconcile/signalfx_endpoint_monitoring.py,sha256=Nqgsg1cflSd2nNnm89y_e8c--7xLUqTrKOHkDs-qADE,2868
 reconcile/slack_base.py,sha256=I-msunWxfgu5bSwXYulGbtLjxUB_tRmTCAUCU-3nabI,3484
 reconcile/slack_usergroups.py,sha256=C36L64wb95tf2tIqJ8T1xXmREpxHvxbhnglk0QOfUVc,30939
-reconcile/slack_usergroups_api.py,sha256=NnO8Di6tt5yVJG0e-KnHgOOpQq5JhourwCMaMnNEhDw,24862
+reconcile/slack_usergroups_api.py,sha256=4-UJTaGcAatcJADZTfeGlEnFH1vGDc7UL9YMfnav3Mo,24713
 reconcile/sql_query.py,sha256=Go_H36p3YTW4Xv-elYDxW_Fe6Q4ErFhD6eQoFh9Jylw,26424
 reconcile/status.py,sha256=h73oaSxO5sftEGqFrXVAlySBvNYPWpowDaYYplcky5A,565
 reconcile/status_board.py,sha256=iv2CR3IsX_uDY5aXHjTOySeTR5d3vsABykYNiYNjZew,15316
@@ -138,7 +138,7 @@ reconcile/automated_actions/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 reconcile/automated_actions/config/integration.py,sha256=uvaZbLp4FQz3DHfr9dA77FyHaRJHTvJDgdqGp7wdCNg,15303
 reconcile/aws_account_manager/README.md,sha256=_XFM3GZNHUzv--e_navqJuaUWpjC6QrHfulreHynFf0,262
 reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_account_manager/integration.py,sha256=qpqefqnq4sPtXW13LBL0D2a5wXdq44mZzi3JxJtM7P0,16042
+reconcile/aws_account_manager/integration.py,sha256=rjLyjv5JPL9BmNguDZjQs_RZxzekR0sPFFLfzN1jzzk,16111
 reconcile/aws_account_manager/merge_request_manager.py,sha256=ePdn3c5MHZEW9iawgQWg7L5ydPLh0YZzfmRYV-rBCD8,3987
 reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
 reconcile/aws_account_manager/reconciler.py,sha256=_CBoRJyfabfesdaP0C_bT-xELwAKtkOiVuMtEQVbP44,17114
@@ -817,7 +817,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev495.dist-info/METADATA,sha256=1hLOdSb-pnNxKuJuU-kgziTOu9RsN65qp1tNcmNcaIk,24958
-qontract_reconcile-0.10.2.dev495.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-qontract_reconcile-0.10.2.dev495.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev495.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev497.dist-info/METADATA,sha256=KJz6Gryp-w-RDUmtOsWLrt2N1yERCAkR9IulxDx68xA,24958
+qontract_reconcile-0.10.2.dev497.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+qontract_reconcile-0.10.2.dev497.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev497.dist-info/RECORD,,

reconcile/aws_account_manager/integration.py

@@ -146,6 +146,7 @@ class AwsAccountMgmtIntegration(
                     raise ValueError(
                         f"Invalid email for account request {account_request.name} in payer account {payer_account.name}. Email {account_request.account_owner.email} is already used."
                     )
+                used_emails.add(account_request.account_owner.email)
         return payer_accounts, non_organization_accounts
 
     def save_access_key(self, account: str, access_key: AWSAccessKey) -> None:

reconcile/slack_usergroups_api.py

@@ -646,27 +646,26 @@ class SlackUsergroupsIntegration(
             return
 
         task = await self.reconcile(workspaces=workspaces, dry_run=dry_run)
-        if dry_run:
-            # wait for task completion and get the action list
-            task_result = await slack_usergroups_task_status(
-                client=self.qontract_api_client, task_id=task.id, timeout=300
-            )
-            if task_result.status == TaskStatus.PENDING:
-                logging.error("Task did not complete within the timeout period")
-                sys.exit(1)
-
-            if task_result.actions:
-                logging.info("Proposed actions:")
-                for action in task_result.actions or []:
-                    if isinstance(action, SlackUsergroupActionUpdateUsers):
-                        logging.info(
-                            f"{action.usergroup=} {action.users_to_add=} {action.users_to_remove=}"
-                        )
-                    else:
-                        logging.info(action)
-
-            if task_result.errors:
-                logging.error(f"Errors encountered: {len(task_result.errors)}")
-                for error in task_result.errors:
-                    logging.error(f"  - {error}")
-                sys.exit(1)
+
+        # wait for task completion and get the action list
+        task_result = await slack_usergroups_task_status(
+            client=self.qontract_api_client, task_id=task.id, timeout=300
+        )
+        if task_result.status == TaskStatus.PENDING:
+            logging.error("Task did not complete within the timeout period")
+            sys.exit(1)
+
+        if task_result.actions:
+            for action in task_result.actions or []:
+                if isinstance(action, SlackUsergroupActionUpdateUsers):
+                    logging.info(
+                        f"{action.usergroup=} {action.users_to_add=} {action.users_to_remove=}"
+                    )
+                else:
+                    logging.info(action)
+
+        if task_result.errors:
+            logging.error(f"Errors encountered: {len(task_result.errors)}")
+            for error in task_result.errors:
+                logging.error(f"  - {error}")
+            sys.exit(1)