qontract-reconcile 0.10.1rc277__py3-none-any.whl → 0.10.1rc279__py3-none-any.whl

{qontract_reconcile-0.10.1rc277.dist-info → qontract_reconcile-0.10.1rc279.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc277
+Version: 0.10.1rc279
 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
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
-Requires-Dist: sretoolbox ~=2.4.1
+Requires-Dist: sretoolbox ~=2.4.2
 Requires-Dist: Click <9.0,>=7.0
 Requires-Dist: gql ==3.1.0
 Requires-Dist: toml <0.11.0,>=0.10.0

{qontract_reconcile-0.10.1rc277.dist-info → qontract_reconcile-0.10.1rc279.dist-info}/RECORD

@@ -248,7 +248,7 @@ reconcile/gql_definitions/slack_usergroups/clusters.py,sha256=EsnwVAGFtuev787toH
 reconcile/gql_definitions/slack_usergroups/permissions.py,sha256=fhBQT2uwCi2N5ZEIZhzrzjVvNllp12R0ZS1AVVEM2dA,5519
 reconcile/gql_definitions/slack_usergroups/users.py,sha256=YS6PkZAHy2ZzECTvdO3F6iHGRcEdOswCzsRjifjpMvI,2877
 reconcile/gql_definitions/status_board/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/status_board/status_board.py,sha256=4Fxp-WARLL5rDD3hBSVpeYZauvEIFXAGq3OtM25xdNk,4093
+reconcile/gql_definitions/status_board/status_board.py,sha256=tWtEW_RNNmLd6b595VAl1wktllkUCqfwPEfblq91rao,4415
 reconcile/gql_definitions/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/statuspage/statuspages.py,sha256=fKHYMDfdrRLPpKjdtkTjSIkyuYdna0ezAFbj2rcE7L0,3538
 reconcile/gql_definitions/terraform_cloudflare_dns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -384,7 +384,7 @@ reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkY
 reconcile/test/test_slack_base.py,sha256=gpbWOLNxMMX6fyAbs1JakhLTnwfedb3f7WpUae4tQZE,5060
 reconcile/test/test_slack_usergroups.py,sha256=O2CNs2t1kNdAG_NqUhf5yr4K0Q-9ZLuXdQ4G_kYxatw,23647
 reconcile/test/test_sql_query.py,sha256=l0QyIflcErIrAwSP8kOIub0jO6oi0Ncuns5IJtnuaxM,455
-reconcile/test/test_status_board.py,sha256=JIUoHZhJvszZQZI4qeEwqHLLzUrYTyHd5Sd5cdu6cQQ,7381
+reconcile/test/test_status_board.py,sha256=WdAq4pFoWWqcOcfgMzssZD3xfvT1QLrEHJqUARldtvA,7875
 reconcile/test/test_terraform_aws_route53.py,sha256=xHggb8K1P76OyCfFcogbkmyKle-NlUylcbDnuv3IqvY,771
 reconcile/test/test_terraform_cloudflare_dns.py,sha256=aQTXX8Vr4h9aWvJZTnpZEhMGYoBpT2d45ZxU_ECIQ6o,3425
 reconcile/test/test_terraform_cloudflare_resources.py,sha256=cWNE2UIhz19rLSWdpJG8xRwuEEYoIZWEkDZY7e2QN_g,3426
@@ -449,7 +449,7 @@ reconcile/typed_queries/pagerduty_instances.py,sha256=QCHqEAakiH6eSob0Pnnn3IBd8G
 reconcile/typed_queries/repos.py,sha256=RKBsf7IDS6NsXTtXxJ9Ol9G3bxG9sr3vW9QQ2bahEHo,512
 reconcile/typed_queries/saas_files.py,sha256=idI0NyPpgSfXVAA-LlQ_BsX_p388GhTh1mHT1IBn71w,11874
 reconcile/typed_queries/smtp.py,sha256=aSLglYa5bHKmlGwKkxq2RZqyMWuAf0a4S_mOuhDa084,542
-reconcile/typed_queries/status_board.py,sha256=OCBMYNtINIAjcU-hx6TwdNsOqY8lstGx8QHWytkFQPM,1266
+reconcile/typed_queries/status_board.py,sha256=naxJHb13uqgX6ZkI6cVtNjFUEdbEHIkZkRmimlRAiwA,1593
 reconcile/typed_queries/tekton_pipeline_providers.py,sha256=2mpHBdsNPQB94tw0H9aenGuqj8EEjYolQ03YEq1CpiY,546
 reconcile/typed_queries/terraform_namespaces.py,sha256=71ARJ-GzkU9tBM0IfJTL3NF4349SJy-Mgs_DwAgUz_g,444
 reconcile/typed_queries/terraform_tgw_attachments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -595,8 +595,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc277.dist-info/METADATA,sha256=pKX9cMHqfNEvNN7Akq_Dxv0hDTQlO3T7VoZ5jMMaz4s,2224
-qontract_reconcile-0.10.1rc277.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc277.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
-qontract_reconcile-0.10.1rc277.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc277.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc279.dist-info/METADATA,sha256=k0TkzA3F1OuRiJdOdiYZUvnibz2cflZjJey6VM3G_Nk,2224
+qontract_reconcile-0.10.1rc279.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+qontract_reconcile-0.10.1rc279.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
+qontract_reconcile-0.10.1rc279.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc279.dist-info/RECORD,,

reconcile/gql_definitions/status_board/status_board.py

@@ -48,6 +48,10 @@ query StatusBoard {
           app {
             name
             onboardingStatus
+            childrenApps {
+              name
+              onboardingStatus
+            }
           }
         }
       }
@@ -90,9 +94,15 @@ class ProductV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
 
 
+class AppV1_AppV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    onboarding_status: str = Field(..., alias="onboardingStatus")
+
+
 class AppV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     onboarding_status: str = Field(..., alias="onboardingStatus")
+    children_apps: Optional[list[AppV1_AppV1]] = Field(..., alias="childrenApps")
 
 
 class NamespaceV1(ConfiguredBaseModel):

reconcile/test/test_status_board.py

@@ -71,7 +71,18 @@ def status_board(gql_class_factory: Callable[..., StatusBoardV1]) -> StatusBoard
                                     "onboardingStatus": "OnBoarded",
                                 }
                             },
-                            {"app": {"name": "foo", "onboardingStatus": "OnBoarded"}},
+                            {
+                                "app": {
+                                    "name": "foo",
+                                    "onboardingStatus": "OnBoarded",
+                                    "childrenApps": [
+                                        {
+                                            "name": "bar",
+                                            "onboardingStatus": "OnBoarded",
+                                        },
+                                    ],
+                                }
+                            },
                             {"app": {"name": "oof", "onboardingStatus": "BestEffort"}},
                         ],
                         "product": {
@@ -109,7 +120,7 @@ def test_status_board_handler(mocker: MockerFixture) -> None:
 
 def test_get_product_apps(status_board: StatusBoardV1) -> None:
     p = StatusBoardExporterIntegration.get_product_apps(status_board)
-    assert p == {"foo": {"foo"}}
+    assert p == {"foo": {"foo", "foo-bar"}}
 
 
 def test_get_diff_create_app() -> None:

reconcile/typed_queries/status_board.py

@@ -1,4 +1,5 @@
 from typing import (
+    Any,
     Callable,
     Iterable,
     Optional,
@@ -26,21 +27,23 @@ def get_selected_app_names(
     global_selectors: Iterable[str],
     product: StatusBoardProductV1,
 ) -> set[str]:
-    selected_app_names: set[str] = {
-        a.app.name for a in product.product_environment.namespaces or []
-    }
+    selected_app_names: set[str] = set()
+    apps: dict[str, Any] = {"apps": []}
+    for namespace in product.product_environment.namespaces or []:
+        selected_app_names.add(namespace.app.name)
+        apps["apps"].append(namespace.app.dict(by_alias=True))
+
+        for child in namespace.app.children_apps or []:
+            selected_app_names.add(f"{namespace.app.name}-{child.name}")
+            child_dict = child.dict(by_alias=True)
+            child_dict["name"] = f"{namespace.app.name}-{child.name}"
+            apps["apps"].append(child_dict)
+            print(child_dict)
 
     selectors = set(global_selectors)
     if product.app_selectors:
         selectors.update(product.app_selectors.exclude or [])
 
-    apps = {
-        "apps": [
-            a.app.dict(by_alias=True)
-            for a in product.product_environment.namespaces or []
-        ],
-    }
-
     for selector in selectors:
         apps_to_remove: set[str] = set()
         results = parser.parse(selector).find(apps)