qontract-reconcile 0.10.1rc847__py3-none-any.whl → 0.10.1rc849__py3-none-any.whl

{qontract_reconcile-0.10.1rc847.dist-info → qontract_reconcile-0.10.1rc849.dist-info}/METADATA

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

@@ -701,7 +701,7 @@ reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,35
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=mZEKpu6nbfiQd60wRkc8-5sljBTUTOgaAKnF89itMzU,32085
 reconcile/utils/terrascript_aws_client.py,sha256=87J2RszhfqYkABzZ5yO-JxycOvjvrx3bWgSmISop1tQ,276092
-reconcile/utils/three_way_diff_strategy.py,sha256=nnTk4VDex1GIEqryFVfATU1AeRwzXyoPl_FX6zzmRFI,4643
+reconcile/utils/three_way_diff_strategy.py,sha256=Jo0M42zvG_K6ygJOSAZZTAPxF2Fkr247O1YsmDbi0TA,4641
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=AYGG5aDJ7CSVhTFdZowfEg3iSQWenoAt676aGjHQMX8,14978
 reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO608Bo,931
@@ -806,12 +806,12 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=gf20IVJqMjaKpMi-zWDZKAMSKPSj6vCoCVXTkqCVin0,118372
+tools/qontract_cli.py,sha256=y6Okq0KPRKXx8glu4g3GeDavtoosH8iqwy5YZMV8cwc,118517
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 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=UCX_0czYXgm1EbWSAn_91D1CbfQui4RFX4QAlo4pjYA,11106
+tools/cli_commands/systems_and_tools.py,sha256=SRMV-VZn2BQ9JeUY_w5O8M_f9eMVxu7LidISUi1cfJQ,15073
 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.1rc847.dist-info/METADATA,sha256=INYD7UnaUfqWYkXT3V-JyoXD9jjY6j3Ji6xD-E9vWA0,2273
-qontract_reconcile-0.10.1rc847.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc847.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc847.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc847.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc849.dist-info/METADATA,sha256=9kea4FnbZH5tdRzVr18mi4qWWVKwjRXh37Ge0Qo2PzA,2273
+qontract_reconcile-0.10.1rc849.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc849.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc849.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc849.dist-info/RECORD,,

reconcile/utils/three_way_diff_strategy.py

@@ -61,7 +61,7 @@ def normalize_object(item: OR) -> OR:
         validate_k8s_object=False,
     )
 
-    annotations = n.body.get("metadata", {}).get("annotations", {})
+    annotations = n.body.get("metadata").get("annotations") or {}
     metadata["annotations"] = {
         k: v for k, v in annotations.items() if k not in NORMALIZE_IGNORE_ANNOTATIONS
     }

tools/cli_commands/systems_and_tools.py

@@ -8,41 +8,107 @@ from typing import (
 
 from pydantic import BaseModel
 
+from reconcile.gql_definitions.common.app_code_component_repos import (
+    DEFINITION as CODE_COMPONENTS_DEFINITION,
+)
 from reconcile.gql_definitions.common.app_code_component_repos import (
     AppCodeComponentsV1,
 )
-from reconcile.gql_definitions.common.clusters import ClusterV1
+from reconcile.gql_definitions.common.clusters import (
+    DEFINITION as CLUSTERS_DEFINITION,
+)
+from reconcile.gql_definitions.common.clusters import (
+    ClusterV1,
+)
+from reconcile.gql_definitions.common.ocm_environments import (
+    DEFINITION as OCM_ENVIRONMENTS_DEFINITION,
+)
+from reconcile.gql_definitions.common.pagerduty_instances import (
+    DEFINITION as PAGERDUTY_INSTANCES_DEFINITION,
+)
 from reconcile.gql_definitions.common.pagerduty_instances import (
     PagerDutyInstanceV1,
 )
-from reconcile.gql_definitions.common.quay_instances import QuayInstanceV1
-from reconcile.gql_definitions.common.slack_workspaces import SlackWorkspaceV1
+from reconcile.gql_definitions.common.quay_instances import (
+    DEFINITION as QUAY_INSTANCES_DEFINITION,
+)
+from reconcile.gql_definitions.common.quay_instances import (
+    QuayInstanceV1,
+)
+from reconcile.gql_definitions.common.slack_workspaces import (
+    DEFINITION as SLACK_WORKSPACES_DEFINITION,
+)
+from reconcile.gql_definitions.common.slack_workspaces import (
+    SlackWorkspaceV1,
+)
+from reconcile.gql_definitions.dynatrace_token_provider.dynatrace_bootstrap_tokens import (
+    DEFINITION as DYNATRACE_ENVIRONMENTS_DEFINITION,
+)
 from reconcile.gql_definitions.dynatrace_token_provider.dynatrace_bootstrap_tokens import (
     DynatraceEnvironmentV1,
 )
 from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
-from reconcile.gql_definitions.gitlab_members.gitlab_instances import GitlabInstanceV1
-from reconcile.gql_definitions.glitchtip.glitchtip_instance import GlitchtipInstanceV1
+from reconcile.gql_definitions.gitlab_members.gitlab_instances import (
+    DEFINITION as GITLAB_INSTANCES_DEFINITION,
+)
+from reconcile.gql_definitions.gitlab_members.gitlab_instances import (
+    GitlabInstanceV1,
+)
+from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
+    DEFINITION as GLITCHTIP_INSTANCES_DEFINITION,
+)
+from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
+    GlitchtipInstanceV1,
+)
+from reconcile.gql_definitions.jenkins_configs.jenkins_instances import (
+    DEFINITION as JENKINS_INSTANCES_DEFINITION,
+)
 from reconcile.gql_definitions.jenkins_configs.jenkins_instances import (
     JenkinsInstanceV1,
 )
-from reconcile.gql_definitions.jira.jira_servers import JiraServerV1
-from reconcile.gql_definitions.statuspage.statuspages import StatusPageV1
+from reconcile.gql_definitions.jira.jira_servers import (
+    DEFINITION as JIRA_SERVERS_DEFINITION,
+)
+from reconcile.gql_definitions.jira.jira_servers import (
+    JiraServerV1,
+)
+from reconcile.gql_definitions.statuspage.statuspages import (
+    DEFINITION as STATUS_PAGES_DEFINITION,
+)
+from reconcile.gql_definitions.statuspage.statuspages import (
+    StatusPageV1,
+)
+from reconcile.gql_definitions.terraform_cloudflare_resources.terraform_cloudflare_accounts import (
+    DEFINITION as CLOUDFLARE_ACCOUNTS_DEFINITION,
+)
 from reconcile.gql_definitions.terraform_cloudflare_resources.terraform_cloudflare_accounts import (
     CloudflareAccountV1,
 )
+from reconcile.gql_definitions.terraform_tgw_attachments.aws_accounts import (
+    DEFINITION as AWS_ACCOUNTS_DEFINITION,
+)
 from reconcile.gql_definitions.terraform_tgw_attachments.aws_accounts import (
     AWSAccountV1,
 )
+from reconcile.gql_definitions.unleash_feature_toggles.feature_toggles import (
+    DEFINITION as UNLEASH_INSTANCES_DEFINITION,
+)
 from reconcile.gql_definitions.unleash_feature_toggles.feature_toggles import (
     UnleashInstanceV1,
 )
-from reconcile.gql_definitions.vault_instances.vault_instances import VaultInstanceV1
+from reconcile.gql_definitions.vault_instances.vault_instances import (
+    DEFINITION as VAULT_INSTANCES_DEFINITION,
+)
+from reconcile.gql_definitions.vault_instances.vault_instances import (
+    VaultInstanceV1,
+)
 from reconcile.statuspage.integration import get_status_pages
 from reconcile.typed_queries.cloudflare import get_cloudflare_accounts
 from reconcile.typed_queries.clusters import get_clusters
 from reconcile.typed_queries.dynatrace import get_dynatrace_environments
-from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
+from reconcile.typed_queries.gitlab_instances import (
+    get_gitlab_instances,
+)
 from reconcile.typed_queries.glitchtip import get_glitchtip_instances
 from reconcile.typed_queries.jenkins import get_jenkins_instances
 from reconcile.typed_queries.jira import get_jira_servers
@@ -67,203 +133,228 @@ class SystemTool(BaseModel):
     name: str
     url: str
     description: str
+    enumeration: str
 
     @classmethod
-    def init_from_model(cls, model: Any) -> Self:
+    def init_from_model(cls, model: Any, enumeration: Any) -> Self:
         match model:
             case GitlabInstanceV1():
-                return cls.init_from_gitlab(model)
+                return cls.init_from_gitlab(model, enumeration)
             case JenkinsInstanceV1():
-                return cls.init_from_jenkins(model)
+                return cls.init_from_jenkins(model, enumeration)
             case ClusterV1():
-                return cls.init_from_cluster(model)
+                return cls.init_from_cluster(model, enumeration)
             case AWSAccountV1():
-                return cls.init_from_aws_account(model)
+                return cls.init_from_aws_account(model, enumeration)
             case DynatraceEnvironmentV1():
-                return cls.init_from_dynatrace_environment(model)
+                return cls.init_from_dynatrace_environment(model, enumeration)
             case GlitchtipInstanceV1():
-                return cls.init_from_glitchtip_instance(model)
+                return cls.init_from_glitchtip_instance(model, enumeration)
             case JiraServerV1():
-                return cls.init_from_jira_server(model)
+                return cls.init_from_jira_server(model, enumeration)
             case OCMEnvironment():
-                return cls.init_from_ocm_environment(model)
+                return cls.init_from_ocm_environment(model, enumeration)
             case PagerDutyInstanceV1():
-                return cls.init_from_pagerduty_instance(model)
+                return cls.init_from_pagerduty_instance(model, enumeration)
             case QuayInstanceV1():
-                return cls.init_from_quay_instance(model)
+                return cls.init_from_quay_instance(model, enumeration)
             case SlackWorkspaceV1():
-                return cls.init_from_slack_workspace(model)
+                return cls.init_from_slack_workspace(model, enumeration)
             case StatusPageV1():
-                return cls.init_from_status_page(model)
+                return cls.init_from_status_page(model, enumeration)
             case UnleashInstanceV1():
-                return cls.init_from_unleash_instance(model)
+                return cls.init_from_unleash_instance(model, enumeration)
             case VaultInstanceV1():
-                return cls.init_from_vault_instance(model)
+                return cls.init_from_vault_instance(model, enumeration)
             case CloudflareAccountV1():
-                return cls.init_from_cloudflare_account(model)
+                return cls.init_from_cloudflare_account(model, enumeration)
             case AppCodeComponentsV1():
-                return cls.init_from_code_component(model)
+                return cls.init_from_code_component(model, enumeration)
             case _:
                 raise NotImplementedError(f"unsupported: {model}")
 
     @classmethod
-    def init_from_gitlab(cls, g: GitlabInstanceV1) -> Self:
+    def init_from_gitlab(cls, g: GitlabInstanceV1, enumeration: Any) -> Self:
         return cls(
             system_type="gitlab",
             system_id=g.name,
             name=g.name,
             url=g.url,
             description=g.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_jenkins(cls, j: JenkinsInstanceV1) -> Self:
+    def init_from_jenkins(cls, j: JenkinsInstanceV1, enumeration: Any) -> Self:
         return cls(
             system_type="jenkins",
             system_id=j.name,
             name=j.name,
             url=j.server_url,
             description=j.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_cluster(cls, c: ClusterV1) -> Self:
+    def init_from_cluster(cls, c: ClusterV1, enumeration: Any) -> Self:
         return cls(
             system_type="openshift",
             system_id=c.spec.q_id if c.spec else "",
             name=c.name,
             url=c.server_url,
             description=c.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_aws_account(cls, a: AWSAccountV1) -> Self:
+    def init_from_aws_account(cls, a: AWSAccountV1, enumeration: Any) -> Self:
         return cls(
             system_type="aws",
             system_id=a.uid,
             name=a.name,
             url=a.console_url,
             description=a.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_dynatrace_environment(cls, dt: DynatraceEnvironmentV1) -> Self:
+    def init_from_dynatrace_environment(
+        cls, dt: DynatraceEnvironmentV1, enumeration: Any
+    ) -> Self:
         return cls(
             system_type="dynatrace",
             system_id=dt.environment_id,
             name=dt.name,
             url=dt.environment_url,
             description=dt.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_glitchtip_instance(cls, g: GlitchtipInstanceV1) -> Self:
+    def init_from_glitchtip_instance(
+        cls, g: GlitchtipInstanceV1, enumeration: Any
+    ) -> Self:
         return cls(
             system_type="glitchtip",
             system_id=g.name,
             name=g.name,
             url=g.console_url,
             description=g.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_jira_server(cls, j: JiraServerV1) -> Self:
+    def init_from_jira_server(cls, j: JiraServerV1, enumeration: Any) -> Self:
         return cls(
             system_type="jira",
             system_id=j.name,
             name=j.name,
             url=j.server_url,
             description=j.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_ocm_environment(cls, o: OCMEnvironment) -> Self:
+    def init_from_ocm_environment(cls, o: OCMEnvironment, enumeration: Any) -> Self:
         return cls(
             system_type="ocm",
             system_id=o.name,
             name=o.name,
             url=o.url,
             description=o.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_pagerduty_instance(cls, p: PagerDutyInstanceV1) -> Self:
+    def init_from_pagerduty_instance(
+        cls, p: PagerDutyInstanceV1, enumeration: Any
+    ) -> Self:
         return cls(
             system_type="pagerduty",
             system_id=p.name,
             name=p.name,
             url=p.description,  # no url
             description=p.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_quay_instance(cls, q: QuayInstanceV1) -> Self:
+    def init_from_quay_instance(cls, q: QuayInstanceV1, enumeration: Any) -> Self:
         return cls(
             system_type="quay",
             system_id=q.name,
             name=q.name,
             url=f"https://{q.name}.pagerduty.com",
             description=q.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_slack_workspace(cls, s: SlackWorkspaceV1) -> Self:
+    def init_from_slack_workspace(cls, s: SlackWorkspaceV1, enumeration: Any) -> Self:
         return cls(
             system_type="slack",
             system_id=s.name,
             name=s.name,
             url=f"https://{s.name}.slack.com",
             description=s.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_status_page(cls, s: StatusPageV1) -> Self:
+    def init_from_status_page(cls, s: StatusPageV1, enumeration: Any) -> Self:
         return cls(
             system_type="statuspage",
             system_id=s.name,
             name=s.name,
             url=s.url,
             description=s.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_unleash_instance(cls, u: UnleashInstanceV1) -> Self:
+    def init_from_unleash_instance(cls, u: UnleashInstanceV1, enumeration: Any) -> Self:
         return cls(
             system_type="unleash",
             system_id=u.name,
             name=u.name,
             url=u.url,
             description=u.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_vault_instance(cls, v: VaultInstanceV1) -> Self:
+    def init_from_vault_instance(cls, v: VaultInstanceV1, enumeration: Any) -> Self:
         return cls(
             system_type="vault",
             system_id=v.name,
             name=v.name,
             url=v.address,
             description=v.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_cloudflare_account(cls, a: CloudflareAccountV1) -> Self:
+    def init_from_cloudflare_account(
+        cls, a: CloudflareAccountV1, enumeration: Any
+    ) -> Self:
         return cls(
             system_type="cloudflare",
             system_id=a.name,
             name=a.name,
             url="https://dash.cloudflare.com/",
             description=a.description,
+            enumeration=enumeration,
         )
 
     @classmethod
-    def init_from_code_component(cls, c: AppCodeComponentsV1) -> Self:
+    def init_from_code_component(cls, c: AppCodeComponentsV1, enumeration: Any) -> Self:
         return cls(
             system_type=c.resource,
             system_id=c.name,
             name=c.name,
             url=c.url,
             description=c.description or "",
+            enumeration=enumeration,
         )
 
 
@@ -271,12 +362,12 @@ class SystemToolInventory:
     def __init__(self) -> None:
         self.systems_and_tools: list[SystemTool] = []
 
-    def append(self, model: Any) -> None:
-        self.systems_and_tools.append(SystemTool.init_from_model(model))
+    def append(self, model: Any, enumeration: Any) -> None:
+        self.systems_and_tools.append(SystemTool.init_from_model(model, enumeration))
 
-    def update(self, models: list[Any]) -> None:
+    def update(self, models: list[Any], enumeration: Any) -> None:
         for m in models:
-            self.append(m)
+            self.append(m, enumeration)
 
     @property
     def data(self) -> list[dict[str, Any]]:
@@ -287,6 +378,9 @@ class SystemToolInventory:
                 "name": st.name,
                 "url": st.url,
                 "description": st.description.replace("\n", "\\n"),
+                "enumeration": st.enumeration.strip().replace("\n", ",")
+                if st.enumeration
+                else "",
             }
             for st in self.systems_and_tools
         ]
@@ -299,6 +393,7 @@ class SystemToolInventory:
             "name",
             "url",
             "description",
+            "enumeration",
         ]
 
 
@@ -306,24 +401,31 @@ def get_systems_and_tools_inventory() -> SystemToolInventory:
     gql_api = gql.get_api()
     inventory = SystemToolInventory()
 
-    inventory.update(get_gitlab_instances())
-    inventory.update(get_jenkins_instances())
-    inventory.update(get_clusters())
-    inventory.update(get_aws_accounts(gql_api))
-    inventory.update(get_dynatrace_environments())
-    inventory.update(get_glitchtip_instances())
-    inventory.update(get_jira_servers())
-    inventory.update(get_ocm_environments())
-    inventory.update(get_pagerduty_instances(gql_api.query))
-    inventory.update(get_quay_instances())
-    inventory.update(get_slack_workspaces())
-    inventory.update(get_status_pages())
-    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 in {"gitops", "infrastructure"}
-    ])
+    inventory.update(get_gitlab_instances(), GITLAB_INSTANCES_DEFINITION)
+    inventory.update(get_jenkins_instances(), JENKINS_INSTANCES_DEFINITION)
+    inventory.update(get_clusters(), CLUSTERS_DEFINITION)
+    inventory.update(get_aws_accounts(gql_api), AWS_ACCOUNTS_DEFINITION)
+    inventory.update(get_dynatrace_environments(), DYNATRACE_ENVIRONMENTS_DEFINITION)
+    inventory.update(get_glitchtip_instances(), GLITCHTIP_INSTANCES_DEFINITION)
+    inventory.update(get_jira_servers(), JIRA_SERVERS_DEFINITION)
+    inventory.update(get_ocm_environments(), OCM_ENVIRONMENTS_DEFINITION)
+    inventory.update(
+        get_pagerduty_instances(gql_api.query), PAGERDUTY_INSTANCES_DEFINITION
+    )
+    inventory.update(get_quay_instances(), QUAY_INSTANCES_DEFINITION)
+    inventory.update(get_slack_workspaces(), SLACK_WORKSPACES_DEFINITION)
+    inventory.update(get_status_pages(), STATUS_PAGES_DEFINITION)
+    inventory.update(get_unleash_instances(), UNLEASH_INSTANCES_DEFINITION)
+    inventory.update(get_vault_instances(), VAULT_INSTANCES_DEFINITION)
+    inventory.update(get_cloudflare_accounts(), CLOUDFLARE_ACCOUNTS_DEFINITION)
+    inventory.update(
+        [
+            c
+            for c in get_code_components()
+            if c.resource in {"gitops", "infrastructure"}
+        ],
+        CODE_COMPONENTS_DEFINITION,
+    )
 
     inventory.systems_and_tools.append(
         SystemTool(
@@ -332,6 +434,7 @@ def get_systems_and_tools_inventory() -> SystemToolInventory:
             name="github",
             url="https://github.com",
             description="github",
+            enumeration="github",
         )
     )
 

tools/qontract_cli.py

@@ -2705,6 +2705,9 @@ def hcp_migration_status(ctx):
 @get.command()
 @click.pass_context
 def systems_and_tools(ctx):
+    print(
+        f"This report is obtained from app-interface Graphql endpoint available at: {config.get_config()['graphql']['server']}"
+    )
     inventory = get_systems_and_tools_inventory()
     print_output(ctx.obj["options"], inventory.data, inventory.columns)