qontract-reconcile 0.10.1rc570__py3-none-any.whl → 0.10.1rc572__py3-none-any.whl

{qontract_reconcile-0.10.1rc570.dist-info → qontract_reconcile-0.10.1rc572.dist-info}/METADATA

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

@@ -111,7 +111,7 @@ reconcile/terraform_cloudflare_dns.py,sha256=auU4bzeLwd4S8D8oqpqJbrCUoEdELXrgi7v
 reconcile/terraform_cloudflare_resources.py,sha256=EbQQaoDnZ7brvRCpbFtwlD7KLk2hDVNcjhrJGaAywEk,15023
 reconcile/terraform_cloudflare_users.py,sha256=1EbTHwJgiPkJpMP-Ag340QNgGK3mXn3dcC3DpLakudM,13987
 reconcile/terraform_repo.py,sha256=c0GZFuY3rCm6VHjHqYbsgOHrEkRWKF_1LrMThsn2XDw,16127
-reconcile/terraform_resources.py,sha256=FcKs-uOs9nfSiw0dptxGTWx81SyEbYEpsBzf36QgEAQ,19277
+reconcile/terraform_resources.py,sha256=UJfygWCnLJAouAXU7EYpF-GBtqujeypMsWq04HZTE-A,18981
 reconcile/terraform_tgw_attachments.py,sha256=_g7QSHM03YZzTU7O189S4HYtUn7WmwOBq67G4AieU24,15298
 reconcile/terraform_users.py,sha256=kXRUxCUchKCP2dbXXOzctynqMii4oyCP6bYZHQTrlTg,10202
 reconcile/terraform_vpc_peerings.py,sha256=rnDH1u93OyzrBM8Hib0HwSnlxZtx4ScRQaZAcn3mx-k,25402
@@ -684,8 +684,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=EzJwaPxQw5CLPahLjh91oRT0pi1WCgOXZ_KgiNXZMAw,2948
 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.1rc570.dist-info/METADATA,sha256=MlJjPGrNHvVZL-tF-LOn6-xk9mijT6zEQxw6kR61t9Q,2349
-qontract_reconcile-0.10.1rc570.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc570.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc570.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc570.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc572.dist-info/METADATA,sha256=U_kZ2W_VzF9JNSsRJk_sIZoEY0O04tGxQSHQmaTDxqo,2349
+qontract_reconcile-0.10.1rc572.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc572.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc572.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc572.dist-info/RECORD,,

reconcile/terraform_resources.py

@@ -4,6 +4,7 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
+from dataclasses import asdict
 from typing import (
     Any,
     Collection,
@@ -13,6 +14,7 @@ from typing import (
     cast,
 )
 
+from deepdiff import DeepHash
 from sretoolbox.utils import (
     retry,
     threaded,
@@ -21,7 +23,6 @@ from sretoolbox.utils import (
 import reconcile.openshift_base as ob
 from reconcile import queries
 from reconcile.aws_iam_keys import run as disable_keys
-from reconcile.change_owners.diff import IDENTIFIER_FIELD_NAME
 from reconcile.gql_definitions.terraform_resources.terraform_resources_namespaces import (
     NamespaceV1,
 )
@@ -37,7 +38,6 @@ from reconcile.utils.extended_early_exit import (
     extended_early_exit_run,
 )
 from reconcile.utils.external_resource_spec import (
-    ExternalResourceSpec,
     ExternalResourceSpecInventory,
 )
 from reconcile.utils.external_resources import (
@@ -533,38 +533,41 @@ def runner(
 
 def early_exit_desired_state(*args: Any, **kwargs: Any) -> dict[str, Any]:
     gqlapi = gql.get_api()
-    namespaces = get_tf_namespaces()
-    resources = []
-    for ns_info in namespaces:
+    state_for_accounts = {
+        account["name"]: {
+            "meta": account,
+            "specs": {},
+        }
+        for account in queries.get_aws_accounts(terraform_state=True)
+    }
+    for ns_info in get_tf_namespaces():
         for spec in get_external_resource_specs(
             ns_info.dict(by_alias=True), provision_provider=PROVIDER_AWS
         ):
-
-            def register_resource(
-                spec: ExternalResourceSpec, resource: Optional[dict[str, Any]]
-            ) -> None:
-                if resource:
-                    resources.append({
-                        IDENTIFIER_FIELD_NAME: f"{spec.cluster_name}/{spec.namespace_name}/{spec.provisioner_name}/{spec.provider}/{spec.identifier}/{resource.get('path')}",
-                        "content_sha": resource.get("sha256sum"),
-                        "provisioner": spec.provisioner_name,
-                    })
-
-            defaults = spec.resource.get("defaults")
-            if defaults:
-                register_resource(spec, gqlapi.get_resource(defaults))
-            parameter_group = spec.resource.get("parameter_group")
-            if parameter_group:
-                register_resource(spec, gqlapi.get_resource(parameter_group))
-            for spec_item in spec.resource.get("specs") or []:
-                defaults = spec_item.get("defaults")
-                if defaults:
-                    register_resource(spec, gqlapi.get_resource(defaults))
+            resource_paths = [
+                spec.resource.get("defaults"),
+                spec.resource.get("parameter_group"),
+            ] + [
+                spec_item.get("defaults")
+                for spec_item in spec.resource.get("specs") or []
+            ]
+            resources = {
+                resource["path"]: resource["sha256sum"]
+                for path in resource_paths
+                if path and (resource := gqlapi.get_resource(path))
+            }
+            spec_state = {
+                "spec": asdict(spec),
+                "resources": resources,
+            }
+            spec_id = f"{spec.cluster_name}/{spec.namespace_name}/{spec.provisioner_name}/{spec.provider}/{spec.identifier}"
+            state_for_accounts[spec.provisioner_name][spec_id] = spec_state
 
     return {
-        "accounts": queries.get_aws_accounts(terraform_state=True),
-        "namespaces": [ns.dict(by_alias=True) for ns in namespaces],
-        "resources": resources,
+        "state": {
+            account: {"shard": account, "hash": DeepHash(state).get(state)}
+            for account, state in state_for_accounts.items()
+        }
     }
 
 
@@ -572,10 +575,6 @@ def desired_state_shard_config() -> DesiredStateShardConfig:
     return DesiredStateShardConfig(
         shard_arg_name="account_name",
         shard_arg_is_collection=True,
-        shard_path_selectors={
-            "accounts[*].name",
-            "namespaces[*].externalResources[*].provisioner.name",
-            "resources[*].provisioner",
-        },
+        shard_path_selectors={"state.*.shard"},
         sharded_run_review=lambda proposal: len(proposal.proposed_shards) <= 2,
     )