qontract-reconcile 0.10.1rc839__py3-none-any.whl → 0.10.1rc841__py3-none-any.whl

{qontract_reconcile-0.10.1rc839.dist-info → qontract_reconcile-0.10.1rc841.dist-info}/METADATA

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

@@ -232,7 +232,7 @@ reconcile/gql_definitions/cna/queries/cna_provisioners.py,sha256=4k527BszdWB84Wk
 reconcile/gql_definitions/cna/queries/cna_resources.py,sha256=j9sa5iOOBsLT2qwlmEItnafSXK-vdNPXgd9Z4mg9mlc,2710
 reconcile/gql_definitions/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/common/alerting_services_settings.py,sha256=mT7cobC9mR_bhFSYeQX1apVA5zMqSbu5fYcdd4iZ9mg,1802
-reconcile/gql_definitions/common/app_code_component_repos.py,sha256=eGlv8SRiLl-QUYNDl_gAvtQGMB2Hr31EqUXYQO_wOcg,1835
+reconcile/gql_definitions/common/app_code_component_repos.py,sha256=4I4hQ37rkAYh9HlJdE9eKBtML-82jY8qHkXhbCZCtmM,1951
 reconcile/gql_definitions/common/app_interface_custom_messages.py,sha256=5a-rmQqR0qmews01K1WiTw1ZHUIUmQoznF9v8_Uw9QQ,2000
 reconcile/gql_definitions/common/app_interface_dms_settings.py,sha256=h-N7-XGpmH7O9d3UBPhJJl48tpZvqihLloamZKdlgVg,2568
 reconcile/gql_definitions/common/app_interface_repo_settings.py,sha256=rud0rz9NIFF-h1fFdk3MnwGmx73rhwrn1taN_HefvyU,1754
@@ -603,7 +603,7 @@ reconcile/typed_queries/namespaces_minimal.py,sha256=rUtqNQ0ORXXUTQfnpsMURymAJ4g
 reconcile/typed_queries/ocm.py,sha256=aTXW9NaMpMq-90sBUAUQmGPtk6Hnsk2rzSbXv3pD8dY,312
 reconcile/typed_queries/pagerduty_instances.py,sha256=QCHqEAakiH6eSob0Pnnn3IBd8Ga0zpEp1Z6Qu3v2uH4,733
 reconcile/typed_queries/quay.py,sha256=OvkSDDbS3o4a4W5MqVxTAVmo47p5XegeoEVNiuqsevg,242
-reconcile/typed_queries/repos.py,sha256=RKBsf7IDS6NsXTtXxJ9Ol9G3bxG9sr3vW9QQ2bahEHo,512
+reconcile/typed_queries/repos.py,sha256=9I2rJ5VrwB1boJEuaa8A3QWJ1N7wMVbkwfgFadfSrwo,858
 reconcile/typed_queries/reserved_networks.py,sha256=SWukbbEeW6acyP89v0DYd1WgbcBlUDuo-y3e27eN_vs,390
 reconcile/typed_queries/saas_files.py,sha256=4b6zhb5-y7HUyn9DDkJ9CRpvg7N-PnH6gtXtHyd-rzo,14136
 reconcile/typed_queries/slack.py,sha256=r30lspctHloyygPn8_DVybxPwUWwiBpvBRRXiTVcQYk,251
@@ -811,7 +811,7 @@ tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=w8hl4jIEWk5wKbEFN6fVEOwUJGmdlvOqYodW3XSN7mU,4978
-tools/cli_commands/systems_and_tools.py,sha256=k38KN10FD-YWCJq3g_ifMUKKLSUMtkI2mWj48l7f7Vk,10451
+tools/cli_commands/systems_and_tools.py,sha256=welsQO8ccDIeMm_1D_7MOMV7jtIQHz21kCpvq6EQEi0,11080
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/cost_report/aws.py,sha256=bdvbT3bDymBOMx4Ve4kt154MeGiGusTSpOpMMFrQ4SM,5191
 tools/cli_commands/cost_report/cost_management_api.py,sha256=tFzjaZ3RSVJeAUsfSWXHiQlMVbV8dFcXibK158ODQcA,2549
@@ -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.1rc839.dist-info/METADATA,sha256=6fv9DaKZrF-noChsztXOxgop9F-wAGR8yEbE015Yj4M,2275
-qontract_reconcile-0.10.1rc839.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc839.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc839.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc839.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc841.dist-info/METADATA,sha256=q7YIqqm9VGJzFsTqTlhLX_DUD_SnKGOas3-t_7ddQgA,2275
+qontract_reconcile-0.10.1rc841.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc841.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc841.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc841.dist-info/RECORD,,

reconcile/gql_definitions/common/app_code_component_repos.py

@@ -22,6 +22,8 @@ DEFINITION = """
 query AppCodeComponentRepos {
   apps: apps_v1 {
     codeComponents {
+      name
+      resource
       url
     }
   }
@@ -36,6 +38,8 @@ class ConfiguredBaseModel(BaseModel):
 
 
 class AppCodeComponentsV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    resource: str = Field(..., alias="resource")
     url: str = Field(..., alias="url")
 
 

reconcile/typed_queries/repos.py

@@ -1,17 +1,30 @@
 from collections.abc import Callable
 from typing import Optional
 
-from reconcile.gql_definitions.common.app_code_component_repos import query
+from reconcile.gql_definitions.common.app_code_component_repos import (
+    AppCodeComponentsV1,
+    query,
+)
 from reconcile.utils import gql
 
 
-def get_repos(
+def get_code_components(
     server: str = "",
     query_func: Optional[Callable] = None,
-) -> list[str]:
+) -> list[AppCodeComponentsV1]:
     if not query_func:
         query_func = gql.get_api().query
-    repos: list[str] = []
+    code_components: list[AppCodeComponentsV1] = []
     for app in query(query_func).apps or []:
-        repos += [c.url for c in app.code_components or [] if c.url.startswith(server)]
-    return repos
+        code_components += [
+            c for c in app.code_components or [] if c.url.startswith(server)
+        ]
+    return code_components
+
+
+def get_repos(
+    server: str = "",
+    query_func: Optional[Callable] = None,
+) -> list[str]:
+    code_components = get_code_components(server=server, query_func=query_func)
+    return [c.url for c in code_components]

tools/cli_commands/systems_and_tools.py

@@ -8,6 +8,9 @@ from typing import (
 
 from pydantic import BaseModel
 
+from reconcile.gql_definitions.common.app_code_component_repos import (
+    AppCodeComponentsV1,
+)
 from reconcile.gql_definitions.common.clusters import ClusterV1
 from reconcile.gql_definitions.common.pagerduty_instances import (
     PagerDutyInstanceV1,
@@ -46,6 +49,7 @@ from reconcile.typed_queries.jira import get_jira_servers
 from reconcile.typed_queries.ocm import get_ocm_environments
 from reconcile.typed_queries.pagerduty_instances import get_pagerduty_instances
 from reconcile.typed_queries.quay import get_quay_instances
+from reconcile.typed_queries.repos import get_code_components
 from reconcile.typed_queries.slack import get_slack_workspaces
 from reconcile.typed_queries.terraform_tgw_attachments.aws_accounts import (
     get_aws_accounts,
@@ -97,6 +101,8 @@ class SystemTool(BaseModel):
                 return cls.init_from_vault_instance(model)
             case CloudflareAccountV1():
                 return cls.init_from_cloudflare_account(model)
+            case AppCodeComponentsV1():
+                return cls.init_from_code_component(model)
             case _:
                 raise NotImplementedError(f"unsupported: {model}")
 
@@ -250,6 +256,16 @@ class SystemTool(BaseModel):
             description=a.description,
         )
 
+    @classmethod
+    def init_from_code_component(cls, c: AppCodeComponentsV1) -> Self:
+        return cls(
+            system_type=c.resource,
+            system_id=c.name,
+            name=c.name,
+            url=c.url,
+            description=c.name,
+        )
+
 
 class SystemToolInventory:
     def __init__(self) -> None:
@@ -305,6 +321,9 @@ def get_systems_and_tools_inventory() -> SystemToolInventory:
     inventory.update(get_unleash_instances())
     inventory.update(get_vault_instances())
     inventory.update(get_cloudflare_accounts())
+    inventory.update([
+        c for c in get_code_components() if c.resource == "app-interface"
+    ])
 
     inventory.systems_and_tools.append(
         SystemTool(