qontract-reconcile 0.10.2.dev249__tar.gz → 0.10.2.dev251__tar.gz

{qontract_reconcile-0.10.2.dev249 → qontract_reconcile-0.10.2.dev251}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev249
+Version: 0.10.2.dev251
 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
@@ -130,8 +130,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
                                   RHIDP.
   cluster-deployment-mapper       Maps ClusterDeployment resources to Cluster
                                   IDs.
-  dashdotdb-cso                   Collects the ImageManifestVuln CRs from all
-                                  the clusters and posts them to Dashdotdb.
   dashdotdb-dora                  Collects dora metrics.
   dashdotdb-dvo                   Collects the DeploymentValidations from all
                                   the clusters and posts them to Dashdotdb.

{qontract_reconcile-0.10.2.dev249 → qontract_reconcile-0.10.2.dev251}/README.md

@@ -65,8 +65,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
                                   RHIDP.
   cluster-deployment-mapper       Maps ClusterDeployment resources to Cluster
                                   IDs.
-  dashdotdb-cso                   Collects the ImageManifestVuln CRs from all
-                                  the clusters and posts them to Dashdotdb.
   dashdotdb-dora                  Collects dora metrics.
   dashdotdb-dvo                   Collects the DeploymentValidations from all
                                   the clusters and posts them to Dashdotdb.

{qontract_reconcile-0.10.2.dev249 → qontract_reconcile-0.10.2.dev251}/reconcile/cli.py

@@ -3203,18 +3203,6 @@ def gitlab_fork_compliance(
     )
 
 
-@integration.command(
-    short_help="Collects the ImageManifestVuln CRs from all the clusters "
-    "and posts them to Dashdotdb."
-)
-@threaded(default=2)
-@click.pass_context
-def dashdotdb_cso(ctx: click.Context, thread_pool_size: int) -> None:
-    import reconcile.dashdotdb_cso
-
-    run_integration(reconcile.dashdotdb_cso, ctx, thread_pool_size)
-
-
 @integration.command(
     short_help="Collects the DeploymentValidations from all the clusters "
     "and posts them to Dashdotdb."

{qontract_reconcile-0.10.2.dev249 → qontract_reconcile-0.10.2.dev251}/reconcile/status_board.py

@@ -149,7 +149,7 @@ class Application(AbstractStatusBoard):
         return {
             "name": self.name,
             "fullname": self.fullname,
-            "product_id": product_id,
+            "product": {"id": product_id},
         }
 
     @staticmethod
@@ -196,7 +196,7 @@ class Service(AbstractStatusBoard):
             "metadata": self.metadata,
             "status_type": "traffic_light",
             "service_endpoint": "none",
-            "application_id": application_id,
+            "application": {"id": application_id},
         }
 
     @staticmethod

{qontract_reconcile-0.10.2.dev249 → qontract_reconcile-0.10.2.dev251}/reconcile/utils/ocm/status_board.py

@@ -16,8 +16,12 @@ class BaseOCMSpec(TypedDict):
     fullname: str
 
 
+class IDSpec(TypedDict):
+    id: str
+
+
 class ApplicationOCMSpec(BaseOCMSpec):
-    product_id: str
+    product: IDSpec
 
 
 class ServiceMetadataSpec(TypedDict):
@@ -34,7 +38,7 @@ class ServiceOCMSpec(BaseOCMSpec):
     # https://gitlab.cee.redhat.com/service/status-board/-/blob/main/scripts/create-services-from-app-intf.sh?ref_type=heads#L116
     status_type: str
     service_endpoint: str
-    application_id: str
+    application: IDSpec
     metadata: ServiceMetadataSpec
 
 

qontract_reconcile-0.10.2.dev249/reconcile/dashdotdb_cso.py

@@ -1,117 +0,0 @@
-from typing import Any
-
-import requests
-from sretoolbox.utils import threaded
-
-from reconcile.dashdotdb_base import (
-    LOG,
-    DashdotdbBase,
-)
-from reconcile.gql_definitions.common.clusters import ClusterV1
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
-from reconcile.typed_queries.clusters import get_clusters
-from reconcile.utils.oc import (
-    OCLogMsg,
-    StatusCodeError,
-)
-from reconcile.utils.oc_map import (
-    OCMap,
-    init_oc_map_from_clusters,
-)
-from reconcile.utils.secret_reader import (
-    SecretReaderBase,
-    create_secret_reader,
-)
-
-QONTRACT_INTEGRATION = "dashdotdb-cso"
-LOGMARKER = "DDDB_CSO:"
-
-
-class DashdotdbCSO(DashdotdbBase):
-    def __init__(
-        self, dry_run: bool, thread_pool_size: int, secret_reader: SecretReaderBase
-    ) -> None:
-        super().__init__(
-            dry_run=dry_run,
-            thread_pool_size=thread_pool_size,
-            marker=LOGMARKER,
-            scope="imagemanifestvuln",
-            secret_reader=secret_reader,
-        )
-
-    def _post(self, manifest: dict[Any, Any]) -> requests.Response | None:
-        if manifest is None:
-            return None
-
-        cluster = manifest["cluster"]
-        imagemanifestvuln = manifest["data"]
-
-        response = None
-
-        LOG.info("%s syncing cluster %s", self.logmarker, cluster)
-
-        if self.dry_run:
-            return response
-
-        for item in imagemanifestvuln["items"]:
-            endpoint = f"{self.dashdotdb_url}/api/v1/imagemanifestvuln/{cluster}"
-            response = self._do_post(endpoint, item)
-            try:
-                response.raise_for_status()
-            except requests.exceptions.HTTPError as details:
-                LOG.error("%s error posting %s - %s", self.logmarker, cluster, details)
-
-        LOG.info("%s cluster %s synced", self.logmarker, cluster)
-        return response
-
-    @staticmethod
-    def _get_imagemanifestvuln(cluster: str, oc_map: OCMap) -> dict[str, Any] | None:
-        LOG.info("%s processing %s", LOGMARKER, cluster)
-        oc = oc_map.get(cluster)
-        if isinstance(oc, OCLogMsg):
-            LOG.log(level=oc.log_level, msg=oc.message)
-            return None
-
-        try:
-            imagemanifestvuln = oc.get_all("ImageManifestVuln", all_namespaces=True)
-        except StatusCodeError:
-            LOG.info("%s not installed on %s", LOGMARKER, cluster)
-            return None
-
-        if not imagemanifestvuln:
-            return None
-
-        return {"cluster": cluster, "data": imagemanifestvuln}
-
-    def run(self) -> None:
-        clusters: list[ClusterV1] = get_clusters()
-        oc_map = init_oc_map_from_clusters(
-            clusters=clusters,
-            secret_reader=self.secret_reader,
-            integration=QONTRACT_INTEGRATION,
-            use_jump_host=True,
-            thread_pool_size=self.thread_pool_size,
-        )
-        manifests = threaded.run(
-            func=self._get_imagemanifestvuln,
-            iterable=oc_map.clusters(),
-            thread_pool_size=self.thread_pool_size,
-            oc_map=oc_map,
-        )
-
-        self._get_token()
-        threaded.run(
-            func=self._post, iterable=manifests, thread_pool_size=self.thread_pool_size
-        )
-        self._close_token()
-
-
-def run(dry_run: bool = False, thread_pool_size: int = 10) -> None:
-    vault_settings = get_app_interface_vault_settings()
-    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-    dashdotdb_cso = DashdotdbCSO(
-        dry_run=dry_run, thread_pool_size=thread_pool_size, secret_reader=secret_reader
-    )
-    dashdotdb_cso.run()