qontract-reconcile 0.10.2.dev248__py3-none-any.whl → 0.10.2.dev249__py3-none-any.whl

{qontract_reconcile-0.10.2.dev248.dist-info → qontract_reconcile-0.10.2.dev249.dist-info}/METADATA

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

@@ -103,7 +103,7 @@ reconcile/slack_base.py,sha256=I-msunWxfgu5bSwXYulGbtLjxUB_tRmTCAUCU-3nabI,3484
 reconcile/slack_usergroups.py,sha256=xFkVe67RXSUj8JvpfSFEiRdQzB0TnJJEHW_b5PEwLng,30213
 reconcile/sql_query.py,sha256=auZCWe6dytsDp83Imfo4zqkpMCLRXU007IUlPeUE3j4,26376
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
-reconcile/status_board.py,sha256=Hxx6sFFyPTNi6zY-qlAco9OqPvdx6Kbgce0DunDUsNQ,15838
+reconcile/status_board.py,sha256=wDto8vVFXHLIGwh4MfvsXTogVQ08JhqyDmhOyjjTJyk,15288
 reconcile/terraform_aws_route53.py,sha256=dQzzT46YhwRA902_H6pi-f7WlX4EaH187wXSdmJAUkQ,9958
 reconcile/terraform_cloudflare_dns.py,sha256=-aLEe2QnH5cJPu7HWqs-R9NmQ1NlFbcVUm0v7alVL3I,13431
 reconcile/terraform_cloudflare_resources.py,sha256=pq8Ieo5NmB-dYQ9X2F0s6iEoINMzhiqGw2yQK4ovok4,14980
@@ -797,7 +797,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.dev248.dist-info/METADATA,sha256=c3r-1NuxuH1uZzBEPnvPQsiGN3B6vQ6D0-BKyCLCcmo,23974
-qontract_reconcile-0.10.2.dev248.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev248.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev248.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev249.dist-info/METADATA,sha256=gwjkeR4GBIHNQvWj-GxTlvIelNg9lny81cU3jDwHC8c,23974
+qontract_reconcile-0.10.2.dev249.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev249.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev249.dist-info/RECORD,,

reconcile/status_board.py

@@ -5,9 +5,7 @@ from abc import (
 )
 from collections.abc import Iterable, Mapping
 from enum import Enum
-from typing import (
-    Optional,
-)
+from itertools import chain
 
 from pydantic import BaseModel
 
@@ -122,11 +120,11 @@ class Product(AbstractStatusBoard):
 
 
 class Application(AbstractStatusBoard):
-    product: Optional["Product"]
+    product: Product
     services: list["Service"] | None
 
     def create(self, ocm: OCMBaseClient) -> None:
-        if self.product and self.product.id:
+        if self.product.id:
             spec = self.to_ocm_spec()
             self.id = create_application(ocm, spec)
         else:
@@ -147,7 +145,7 @@ class Application(AbstractStatusBoard):
         return f'Application: "{self.name}" "{self.fullname}"'
 
     def to_ocm_spec(self) -> ApplicationOCMSpec:
-        product_id = self.product.id if self.product and self.product.id else ""
+        product_id = self.product.id or ""
         return {
             "name": self.name,
             "fullname": self.fullname,
@@ -160,18 +158,12 @@ class Application(AbstractStatusBoard):
 
 
 class Service(AbstractStatusBoard):
-    # `application` here is used to create a flat map to easily compare state.
-    # This field is optional so we can create the Service object without the
-    # need to create an Application object first.
-    # This filed is needed when we are creating a Service on teh OCM API.
-    # This field is not used when we are mapping the services that belongs to an
-    # application in that case we use the `services` field in Application class.
-    application: Optional["Application"]
+    application: Application
     metadata: ServiceMetadataSpec
 
     def create(self, ocm: OCMBaseClient) -> None:
         spec = self.to_ocm_spec()
-        if self.application and self.application.id:
+        if self.application.id:
             self.id = create_service(ocm, spec)
         else:
             logging.warning("Missing application id for service")
@@ -187,7 +179,7 @@ class Service(AbstractStatusBoard):
             logging.error(f'Trying to update Service "{self.name}" without id')
             return
         spec = self.to_ocm_spec()
-        if self.application and self.application.id:
+        if self.application.id:
             update_service(ocm, self.id, spec)
         else:
             logging.warning("Missing application id for service")
@@ -196,9 +188,7 @@ class Service(AbstractStatusBoard):
         return f'Service: "{self.name}" "{self.fullname}"'
 
     def to_ocm_spec(self) -> ServiceOCMSpec:
-        application_id = (
-            self.application.id if self.application and self.application.id else ""
-        )
+        application_id = self.application.id or ""
 
         return {
             "name": self.name,
@@ -281,21 +271,24 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
                 logging.error(f'Product "{p.name}" has no id')
                 continue
             p.applications = [
-                Application(**a) for a in get_product_applications(ocm_api, p.id)
+                Application(**a, product=p)
+                for a in get_product_applications(ocm_api, p.id)
             ]
             for a in p.applications:
                 if not a.id:
                     logging.error(f'Application "{a.name}" has no id')
                     continue
                 a.services = [
-                    Service(**s) for s in get_application_services(ocm_api, a.id)
+                    Service(**s, application=a)
+                    for s in get_application_services(ocm_api, a.id)
                 ]
 
         return products
 
     @staticmethod
     def desired_abstract_status_board_map(
-        desired_product_apps: Mapping[str, set[str]], slodocs: list[SLODocumentV1]
+        desired_product_apps: Mapping[str, set[str]],
+        slodocs: list[SLODocumentV1],
     ) -> dict[str, AbstractStatusBoard]:
         """
         Returns a Mapping of all the AbstractStatusBoard data objects as dictionaries.
@@ -304,25 +297,26 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
         on Status Board OCM API.
         """
         desired_abstract_status_board_map: dict[str, AbstractStatusBoard] = {}
-        for product, apps in desired_product_apps.items():
-            desired_abstract_status_board_map[product] = Product(
-                name=product, fullname=product, applications=[], metadata={}
+        for product_name, apps in desired_product_apps.items():
+            product = Product(
+                id=None, name=product_name, fullname=product_name, applications=[]
             )
+            desired_abstract_status_board_map[product_name] = product
             for a in apps:
-                key = f"{product}/{a}"
+                key = f"{product_name}/{a}"
                 desired_abstract_status_board_map[key] = Application(
+                    id=None,
                     name=a,
                     fullname=key,
                     services=[],
-                    product=desired_abstract_status_board_map[product],
-                    metadata={},
+                    product=product,
                 )
         for slodoc in slodocs:
             products = [
                 ns.namespace.environment.product.name for ns in slodoc.namespaces
             ]
             for slo in slodoc.slos or []:
-                for product in products:
+                for product_name in products:
                     if slodoc.app.parent_app:
                         app = f"{slodoc.app.parent_app.name}-{slodoc.app.name}"
                     else:
@@ -330,8 +324,8 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
 
                     # Check if the product or app is excluded from the desired list
                     product_or_app_excluded = (
-                        product not in desired_product_apps
-                        or app not in desired_product_apps.get(product, set())
+                        product_name not in desired_product_apps
+                        or app not in desired_product_apps.get(product_name, set())
                     )
 
                     # Check if statusBoard label exists and is explicitly disabled
@@ -344,8 +338,8 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
                     if product_or_app_excluded or not status_board_enabled:
                         continue
 
-                    key = f"{product}/{app}/{slo.name}"
-                    metadata = {
+                    key = f"{product_name}/{app}/{slo.name}"
+                    metadata: ServiceMetadataSpec = {
                         "sli_type": slo.sli_type,
                         "sli_specification": slo.sli_specification,
                         "slo_details": slo.slo_details,
@@ -354,11 +348,12 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
                         "window": slo.slo_parameters.window,
                     }
                     desired_abstract_status_board_map[key] = Service(
+                        id=None,
                         name=slo.name,
                         fullname=key,
                         metadata=metadata,
                         application=desired_abstract_status_board_map[
-                            f"{product}/{app}"
+                            f"{product_name}/{app}"
                         ],
                     )
 
@@ -382,7 +377,6 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
     def get_diff(
         desired_abstract_status_board_map: Mapping[str, AbstractStatusBoard],
         current_abstract_status_board_map: Mapping[str, AbstractStatusBoard],
-        current_products: Mapping[str, Product],
     ) -> list[StatusBoardHandler]:
         return_list: list[StatusBoardHandler] = []
 
@@ -391,6 +385,9 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
             desired_abstract_status_board_map,
         )
 
+        for pair in chain(diff_result.identical.values(), diff_result.change.values()):
+            pair.desired.id = pair.current.id
+
         return_list.extend(
             StatusBoardHandler(action=Action.create, status_board_object=o)
             for o in diff_result.add.values()
@@ -460,14 +457,9 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
             current_abstract_status_board_map = self.current_abstract_status_board_map(
                 current_products_applications_services
             )
-
-            current_products = {
-                p.name: p for p in current_products_applications_services
-            }
             diff = self.get_diff(
                 desired_abstract_status_board_map,
                 current_abstract_status_board_map,
-                current_products,
             )
 
             self.apply_diff(dry_run, ocm_api, diff)