qontract-reconcile 0.9.1rc188__py3-none-any.whl → 0.9.1rc190__py3-none-any.whl

{qontract_reconcile-0.9.1rc188.dist-info → qontract_reconcile-0.9.1rc190.dist-info}/METADATA

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

@@ -474,7 +474,7 @@ reconcile/utils/runtime/runner.py,sha256=yXWEQF5S8DAnEo6XDyJ8R8Z1Y8wi0ykL8_OKn3v
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=9q-PbOIki3uVm2Slk02ac7gg4ZVvv_ntZ60WIxBH1Zc,8443
 reconcile/utils/saasherder/models.py,sha256=pmHYafLyasZHeVz_HvHraIb_9ITj4j6S9K604LRtDHg,4700
-reconcile/utils/saasherder/saasherder.py,sha256=gTU4lom9oUg3Ll9KqKIFCf90ek9CMXIgQFQQ-ODMKMg,76659
+reconcile/utils/saasherder/saasherder.py,sha256=vK9HeH7RZ7fYIGo3hMKC_mAd8SBWof-ocQpPes50qwE,76811
 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=91611UNL4xFdoERiRRamb8Da55amV62kGlSws2JzVrE,4417
@@ -488,7 +488,7 @@ release/test_version.py,sha256=jOMn3Qx-mZC5pnJR0LU9ieIdNaYZSmr1kQ6aCkPngAU,2053
 release/version.py,sha256=Ud36t9FxGHLubMrE2o5aaaZRGB9_9hU_z0RN9go0TQM,3876
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/app_interface_reporter.py,sha256=DIWu0dpBDk_cBweaf2Qun5HnyrLER1bu-pv3kHM5YGY,21861
-tools/qontract_cli.py,sha256=rCDP3TO0VFYIOuUBAV4swFrzeNaRIgfOpiKPReq0mmo,83193
+tools/qontract_cli.py,sha256=f9HQWdeB1OSjJjMSOFAGkwKsZAPtvgojMp3iPpHxC_E,83197
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=JryinrDdvztN931enUY3FuDeLVnfs6y58mnK7itNK6Y,4940
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
@@ -496,8 +496,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc188.dist-info/METADATA,sha256=oDdGL_24-Yf9Lhv4tnaQXX0QPaJzp6fDceHiK85rX_s,2212
-qontract_reconcile-0.9.1rc188.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc188.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc188.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc188.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc190.dist-info/METADATA,sha256=iur9PZ9aAI70Oq3i8ratlEB4PG4G3zdIOOvE1GDmq4M,2212
+qontract_reconcile-0.9.1rc190.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc190.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc190.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc190.dist-info/RECORD,,

reconcile/utils/saasherder/saasherder.py

@@ -1759,7 +1759,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     logging.error(
                         "Parent saas target has run with a newer "
                         "configuration and the same commit (ref). "
-                        "Check if other MR exists for this target"
+                        "Check if other MR exists for this target, "
+                        f"or update {parent_saas_config.target_config_hash} "
+                        f"to {state_config_hash} for channel {channel}"
                     )
                     return False
         return True

tools/qontract_cli.py

@@ -1216,13 +1216,15 @@ def cluster_openshift_resources(ctx):
 @get.command
 @click.pass_context
 def aws_terraform_resources(ctx):
-    gqlapi = gql.get_api()
-    namespaces = gqlapi.query(tfr.TF_NAMESPACES_QUERY)["namespaces"]
+    namespaces = tfr.get_namespaces()
     columns = ["name", "total"]
     results = {}
     for ns_info in namespaces:
         specs = (
-            get_external_resource_specs(ns_info, provision_provider=PROVIDER_AWS) or []
+            get_external_resource_specs(
+                ns_info.dict(by_alias=True), provision_provider=PROVIDER_AWS
+            )
+            or []
         )
         for spec in specs:
             account = spec.provisioner_name