qontract-reconcile 0.10.2.dev273__py3-none-any.whl → 0.10.2.dev275__py3-none-any.whl

{qontract_reconcile-0.10.2.dev273.dist-info → qontract_reconcile-0.10.2.dev275.dist-info}/METADATA

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

@@ -141,7 +141,7 @@ reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 reconcile/aws_account_manager/integration.py,sha256=WEbcvF8GocFHJrlz3mmXSOyYHIUrrHxq_SKaImgJQ2c,15346
 reconcile/aws_account_manager/merge_request_manager.py,sha256=q8t-YwD4y_4UpxdoG9TQrEbDpjlzasOQIynFoCjP2OE,3947
 reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
-reconcile/aws_account_manager/reconciler.py,sha256=oSuR3xrN6fihmJUl79HSDxH5-MsR7Sfpf7eqiMlwwRg,17141
+reconcile/aws_account_manager/reconciler.py,sha256=-ki1ve7Hurrcl10NSlSH766DLm8FkxcR6aPXm9t1Si0,17144
 reconcile/aws_account_manager/utils.py,sha256=iYPPOtbZ7FiKkz9v5f1YXRIHw5YFOtSavUkF8oMwfJY,1439
 reconcile/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_ami_cleanup/integration.py,sha256=KG7g9NpbKmoaveDD3oi9SinqUE29NaM-4lGo-6YuHlM,9302
@@ -669,10 +669,10 @@ reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2
 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
-reconcile/utils/aws_api_typed/account.py,sha256=4UfsVcOKIkR1b6bYlr6lcnYk5A6T-KZWUi1mZoLL40c,3376
+reconcile/utils/aws_api_typed/account.py,sha256=j73Oqd64UATP_FnAZ7VXh5KZ-pmhQ33CDdY1ULCBLgk,3283
 reconcile/utils/aws_api_typed/api.py,sha256=1h_dQXnE7FUAZi4RRgBEU7nbyAz8awRo0cpuilXyhHE,9239
 reconcile/utils/aws_api_typed/dynamodb.py,sha256=AKUbz8HGzmSq4cnpjJe7PgqsikMkjbpbzUD2UJv2b58,383
-reconcile/utils/aws_api_typed/iam.py,sha256=uuK5JzVmlWpokyixhd_Oy2pBr_31z_d4Gz7bPeDK71E,2864
+reconcile/utils/aws_api_typed/iam.py,sha256=-mpiFiIIMCbNzSi41CoLDk22CMDIi3ehxULiNCkKZ-w,2873
 reconcile/utils/aws_api_typed/organization.py,sha256=rmZkm14t30Bm0ctMTtCNzcDrTjOFkal1TO0pHncNxcg,5513
 reconcile/utils/aws_api_typed/s3.py,sha256=J2uOTtEFgMyKT22pa4DbFnV7zfg575m2DeidQaeselM,1034
 reconcile/utils/aws_api_typed/service_quotas.py,sha256=ywPligZTxGgDhJ4TjWzXg5MbQ4j1iGUxonngII_KOHo,3022
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=oF7C4hpIgyMTwTRm3Aun3cDCHIjVar65JoLp6NcJHlU,3909
 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.dev273.dist-info/METADATA,sha256=lkF2PT5f15ZagYCMCoNzWxSG-5fbB1nb9gB5HfhFtHA,24501
-qontract_reconcile-0.10.2.dev273.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev273.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev273.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev275.dist-info/METADATA,sha256=1E9h_7UESs5-f4Fza1ZH2ROeTpUiLBntDj6v4pwLXO4,24501
+qontract_reconcile-0.10.2.dev275.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev275.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev275.dist-info/RECORD,,

reconcile/aws_account_manager/reconciler.py

@@ -322,7 +322,7 @@ class AWSReconciler:
             if _state.exists and _state.value == security_contact:
                 return
 
-            logging.info(f"{name}: Setting security contact")
+            logging.info(f"{account}: Setting security contact")
             if self.dry_run:
                 raise AbortStateTransactionError("Dry run")
 

reconcile/utils/aws_api_typed/account.py

@@ -8,7 +8,6 @@ if TYPE_CHECKING:
 else:
     AccountClient = AlternateContactTypeDef = object
 
-import botocore
 from pydantic import BaseModel
 
 
@@ -44,10 +43,7 @@ class AWSApiAccount:
                 Title=title,
                 PhoneNumber=phone_number,
             )
-        except botocore.exceptions.ClientError as e:
-            if e.response["Error"]["Code"] != "AccessDenied":
-                raise
-
+        except self.client.exceptions.AccessDeniedException:
             # This exception is raised if the user does not have permission to perform this action.
             # Let's see if the current security contact is already set to the same values.
             current_contact = self.get_security_contact()

reconcile/utils/aws_api_typed/iam.py

@@ -69,7 +69,7 @@ class AWSApiIam:
                     raise ValueError(
                         "Account alias already exists for another AWS account. Choose another one!"
                     ) from e
-            elif e.response["Error"]["Code"] == "AccessDenied":
+            elif e.response["Error"]["Code"] == "AccessDeniedException":
                 # AccessDeniedException can occur if the user does not have permission to create an account alias.
                 # This can happen if the alias is already set and we don't have permission to change it.
                 # If the existing alias is the one we want, we can ignore the error.