qontract-reconcile 0.10.1rc844__py3-none-any.whl → 0.10.1rc846__py3-none-any.whl

{qontract_reconcile-0.10.1rc844.dist-info → qontract_reconcile-0.10.1rc846.dist-info}/METADATA

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

@@ -734,7 +734,7 @@ reconcile/utils/internal_groups/models.py,sha256=GSkF6fVcdbl774q51ZFUmNfSJPta03O
 reconcile/utils/jinja2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jinja2/extensions.py,sha256=zV_x8MhSHAynKhFnG3fULXrwsm5fUG_88IygZHSnN0o,1284
 reconcile/utils/jinja2/filters.py,sha256=_kJjdMsY3lGS5PUn4NnpXUQDNrL1IwiKsB-0MhTMGYM,4521
-reconcile/utils/jinja2/utils.py,sha256=ywoHM4hr1vGjfd37C9LS1QDscg0unF3jo2xT7gZqMZ4,6701
+reconcile/utils/jinja2/utils.py,sha256=3FID6S8ASr9wCrUqRtztp5gJjLn1PxGMrvj5DuG3fMU,6778
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jobcontroller/controller.py,sha256=J_Usf3B4hmQmIseWqnAzam3oku8z7EUP0KCwdSTy9Lw,14514
 reconcile/utils/jobcontroller/models.py,sha256=z0gRJy8Ow1leYS-GrvTUv-t-mQDPHTJVDoHb1nVcZ_8,6349
@@ -786,7 +786,7 @@ reconcile/utils/runtime/sharding.py,sha256=roCdbnBklhTK_g34zbgQYqzpKPaNQ8J6Xd9XL
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=XXY35h8VWQ66z3LBPxaoUAMkIW50264DQiecrzyV6oA,9076
 reconcile/utils/saasherder/models.py,sha256=1DKXUmiTS_MejUfSpFCeuBLMTgR4ldv2N1tAz8qHAwc,5547
-reconcile/utils/saasherder/saasherder.py,sha256=Z6indeXBLzo_1w9Utc8Uj27wSe4J0OwBqykYYAqPpnI,86416
+reconcile/utils/saasherder/saasherder.py,sha256=5rKp1ONBgRgfRO9tMHheEHXjQbipqWB8kUALSCKMGDc,86545
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=py-Ree-QUYD6Hvng6bM40VgSuttteehIKNgwOSoJO1o,4706
@@ -834,8 +834,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc844.dist-info/METADATA,sha256=NBxvvpkVxmP8Ir7g9Iiin-y62XxqWzDZfQaWeiJK10o,2273
-qontract_reconcile-0.10.1rc844.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc844.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc844.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc844.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc846.dist-info/METADATA,sha256=iQc7VJY7P_Q720UpY5pu8GHIl04MuBB_N5swMWQK6Y0,2273
+qontract_reconcile-0.10.1rc846.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc846.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc846.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc846.dist-info/RECORD,,

reconcile/utils/jinja2/utils.py

@@ -10,6 +10,7 @@ from reconcile.checkpoint import url_makes_sense
 from reconcile.github_users import init_github
 from reconcile.utils import gql
 from reconcile.utils.aws_api import AWSApi
+from reconcile.utils.helpers import flatten
 from reconcile.utils.jinja2.extensions import B64EncodeExtension, RaiseErrorExtension
 from reconcile.utils.jinja2.filters import (
     eval_filter,
@@ -180,6 +181,7 @@ def process_jinja2_template(
         "query": lookup_graphql_query_results,
         "url": url_makes_sense,
         "s3": lookup_s3_object,
+        "flatten_dict": flatten,
     })
     if "_template_mocks" in vars:
         for k, v in vars["_template_mocks"].items():

reconcile/utils/saasherder/saasherder.py

@@ -959,6 +959,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 )
                 raise
 
+            # add COMMIT_SHA only if it is unspecified
+            consolidated_parameters.setdefault("COMMIT_SHA", commit_sha)
+
             # add IMAGE_TAG only if it is unspecified
             if not (image_tag := consolidated_parameters.get("IMAGE_TAG", "")):
                 sha_substring = commit_sha[:hash_length]