qontract-reconcile 0.10.2.dev67__py3-none-any.whl → 0.10.2.dev68__py3-none-any.whl

{qontract_reconcile-0.10.2.dev67.dist-info → qontract_reconcile-0.10.2.dev68.dist-info}/METADATA

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

@@ -637,7 +637,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=H8frsS370y8xfivKLNBD1dwlBLHvfuR6JSN_syBL5Qc,36033
-reconcile/utils/terrascript_aws_client.py,sha256=hPfWduAsMpVUcYgw1cx7tiAyVmsJ1BdTCqPzyYPTThE,286260
+reconcile/utils/terrascript_aws_client.py,sha256=n22HESuN24UVT9g0cEqLWqy1n6_RnCTGSQqt-Sg39Qw,286203
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -777,7 +777,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.dev67.dist-info/METADATA,sha256=Nyd438BM7Sf5HGgYKflFl_4LLGDU4l0YQ-4r5AYn5DM,24665
-qontract_reconcile-0.10.2.dev67.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev67.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev67.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev68.dist-info/METADATA,sha256=F5HAp7c__2fD2gE1spyhMIzgE72B9CKhV0A-7MxOQNY,24665
+qontract_reconcile-0.10.2.dev68.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev68.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev68.dist-info/RECORD,,

reconcile/utils/terrascript_aws_client.py

@@ -5179,13 +5179,13 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         return {condition_type_key: {"values": condition[condition_type_key]}}
 
     @staticmethod
-    def _get_principal_for_s3_bucket_policy(
-        region: str, elb_account_id: str | None
-    ) -> Mapping[str, str]:
+    def _get_principal_for_s3_bucket_policy(region: str) -> Mapping[str, str]:
         if region in AWS_ELB_ACCOUNT_IDS:
-            return {"AWS": f"arn:aws:iam::{elb_account_id}:root"}
+            return {"AWS": f"arn:aws:iam::{AWS_ELB_ACCOUNT_IDS[region]}:root"}
         if region in AWS_US_GOV_ELB_ACCOUNT_IDS:
-            return {"AWS": f"arn:aws-us-gov:iam::{elb_account_id}:root"}
+            return {
+                "AWS": f"arn:aws-us-gov:iam::{AWS_US_GOV_ELB_ACCOUNT_IDS[region]}:root"
+            }
         return {"Service": "logdelivery.elasticloadbalancing.amazonaws.com"}
 
     def populate_tf_resource_alb(self, spec, ocm_map=None):
@@ -5305,8 +5305,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             region = str(
                 common_values.get("region") or self.default_regions.get(account)
             )
-            elb_account_id = self._get_elb_account_id(region)
-            principal = self._get_principal_for_s3_bucket_policy(region, elb_account_id)
+            principal = self._get_principal_for_s3_bucket_policy(region)
 
             policy = {
                 "Version": "2012-10-17",