qontract-reconcile 0.10.2.dev80__py3-none-any.whl → 0.10.2.dev82__py3-none-any.whl

{qontract_reconcile-0.10.2.dev80.dist-info → qontract_reconcile-0.10.2.dev82.dist-info}/METADATA

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

@@ -204,7 +204,7 @@ reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUx
 reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMcVdISlxhzXE,3898
 reconcile/external_resources/model.py,sha256=dxwiyI3J9xyLeue8_W9NJoap-CkKLMAoY0S0ml5-NbU,13450
 reconcile/external_resources/reconciler.py,sha256=-0trp1K-iUgOQn3mm1ZUSmfaReRrUT0eHzPkUhNPolQ,9583
-reconcile/external_resources/secrets_sync.py,sha256=50fK4fzgSz-K8uy5_DQQWA_ju_rTDYAC2HRymgfY7TA,16344
+reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
 reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/fleet_labeler/dependencies.py,sha256=Ta-SLnrHRN4OBAmhE_mTk1P7y1X7AInIiQsIYaY6hY0,2910
@@ -646,7 +646,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=n22HESuN24UVT9g0cEqLWqy1n6_RnCTGSQqt-Sg39Qw,286203
+reconcile/utils/terrascript_aws_client.py,sha256=-l2a8Sa5FIzFwVDgHEHcqQeqBGTMn7nacb1p5B8junI,286242
 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
@@ -786,7 +786,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.dev80.dist-info/METADATA,sha256=y3d1ijPuxlumADt6r3Yu1YqzS50B3kC5hlk0R5Nn1w8,24565
-qontract_reconcile-0.10.2.dev80.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev80.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev80.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev82.dist-info/METADATA,sha256=FwBFzjJ63yxyQKIdkLoz5yKi1BjdhtY7GphWfQPNI0M,24565
+qontract_reconcile-0.10.2.dev82.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev82.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev82.dist-info/RECORD,,

reconcile/external_resources/secrets_sync.py

@@ -104,18 +104,13 @@ class OutputSecretsFormatter:
     def __init__(self, secret_reader: SecretReaderBase) -> None:
         self.secret_reader = secret_reader
 
-    def _key_must_be_populated(self, key: str) -> bool:
-        "Only keys containing '__' must be populated to Secrets"
-        return "__" in key
-
     def _format_key(self, key: str) -> str:
-        if "__" not in key:
-            return key
-        k_split = key.split("__")
-        output_key = k_split[1]
-        if output_key.startswith("db"):
-            output_key = output_key.replace("db_", "db.")
-        return output_key
+        # The "__" separator is a legacy feature of terraform resources
+        # This should be removed once all modules don't have outputs with this format.
+        if "__" in key:
+            _, key = key.split("__", 1)
+
+        return key.replace("db_", "db.", 1) if key.startswith("db_") else key
 
     def _format_value(self, value: str) -> str:
         decoded_value = base64.b64decode(value).decode("utf-8")
@@ -130,7 +125,6 @@ class OutputSecretsFormatter:
         return {
             self._format_key(key): self._format_value(value)
             for key, value in data.items()
-            if self._key_must_be_populated(key)
         }
 
 

reconcile/utils/terrascript_aws_client.py

@@ -5295,6 +5295,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             lb_access_logs_s3_bucket_values = {
                 "provider": provider,
                 "bucket": bucket_identifier,
+                "force_destroy": True,
             }
             lb_access_logs_s3_bucket_tf_resource = aws_s3_bucket(
                 bucket_identifier, **lb_access_logs_s3_bucket_values