qontract-reconcile 0.9.1rc235__py3-none-any.whl → 0.9.1rc236__py3-none-any.whl

tools/qontract_cli.py

@@ -8,24 +8,15 @@ import sys
 from collections import defaultdict
 from datetime import datetime
 from operator import itemgetter
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Optional
 
 import click
 import requests
 import yaml
-from rich import box
-from rich.console import (
-    Console,
-    Group,
-)
-from rich.table import Table
-from rich.tree import Tree
 from sretoolbox.utils import threaded
 
 import reconcile.aus.base as aus
+import reconcile.gitlab_housekeeping as glhk
 import reconcile.openshift_base as ob
 import reconcile.openshift_resources_base as orb
 import reconcile.terraform_resources as tfr
@@ -53,7 +44,6 @@ from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
 from reconcile.typed_queries.clusters import get_clusters
-from reconcile.typed_queries.saas_files import get_saas_files
 from reconcile.utils import (
     amtool,
     config,
@@ -86,7 +76,6 @@ from reconcile.utils.oc import (
 from reconcile.utils.oc_map import init_oc_map_from_clusters
 from reconcile.utils.ocm import OCMMap
 from reconcile.utils.output import print_output
-from reconcile.utils.saasherder.saasherder import SaasHerder
 from reconcile.utils.secret_reader import (
     SecretReader,
     create_secret_reader,
@@ -1654,8 +1643,6 @@ def sre_checkpoints(ctx):
 @get.command()
 @click.pass_context
 def app_interface_merge_queue(ctx):
-    import reconcile.gitlab_housekeeping as glhk
-
     settings = queries.get_app_interface_settings()
     instance = queries.get_gitlab_instance()
     gl = GitLabApi(instance, project_url=settings["repoUrl"], settings=settings)
@@ -1695,8 +1682,6 @@ def app_interface_merge_queue(ctx):
 @get.command()
 @click.pass_context
 def app_interface_review_queue(ctx) -> None:
-    import reconcile.gitlab_housekeeping as glhk
-
     settings = queries.get_app_interface_settings()
     instance = queries.get_gitlab_instance()
     secret_reader = SecretReader(settings=settings)
@@ -2469,26 +2454,36 @@ def alert_to_receiver(
 @click.option("--saas-file-name", default=None, help="saas-file to act on.")
 @click.option("--env-name", default=None, help="environment to use for parameters.")
 @click.pass_context
-def saas_dev(ctx, app_name=None, saas_file_name=None, env_name=None) -> None:
+def saas_dev(ctx, app_name=None, saas_file_name=None, env_name=None):
     if env_name in [None, ""]:
         print("env-name must be defined")
         return
-    saas_files = get_saas_files(saas_file_name, env_name, app_name)
+    saas_files = queries.get_saas_files(saas_file_name, env_name, app_name)
     if not saas_files:
         print("no saas files found")
         sys.exit(1)
-
     for saas_file in saas_files:
-        for rt in saas_file.resource_templates:
-            for target in rt.targets:
-                if target.namespace.environment.name != env_name:
+        saas_file_parameters = json.loads(saas_file.get("parameters") or "{}")
+        for rt in saas_file["resourceTemplates"]:
+            url = rt["url"]
+            path = rt["path"]
+            rt_parameters = json.loads(rt.get("parameters") or "{}")
+            for target in rt["targets"]:
+                target_parameters = json.loads(target.get("parameters") or "{}")
+                namespace = target["namespace"]
+                namespace_name = namespace["name"]
+                environment = namespace["environment"]
+                if environment["name"] != env_name:
                     continue
-
-                parameters: dict[str, Any] = {}
-                parameters.update(target.namespace.environment.parameters or {})
-                parameters.update(saas_file.parameters or {})
-                parameters.update(rt.parameters or {})
-                parameters.update(target.parameters or {})
+                ref = target["ref"]
+                environment_parameters = json.loads(
+                    environment.get("parameters") or "{}"
+                )
+                parameters = {}
+                parameters.update(environment_parameters)
+                parameters.update(saas_file_parameters)
+                parameters.update(rt_parameters)
+                parameters.update(target_parameters)
 
                 for replace_key, replace_value in parameters.items():
                     if not isinstance(replace_value, str):
@@ -2503,79 +2498,19 @@ def saas_dev(ctx, app_name=None, saas_file_name=None, env_name=None) -> None:
                 parameters_cmd = ""
                 for k, v in parameters.items():
                     parameters_cmd += f' -p {k}="{v}"'
-                raw_url = rt.url.replace("github.com", "raw.githubusercontent.com")
+                raw_url = url.replace("github.com", "raw.githubusercontent.com")
                 if "gitlab" in raw_url:
                     raw_url += "/raw"
-                raw_url += "/" + target.ref
-                raw_url += rt.path
+                raw_url += "/" + ref
+                raw_url += path
                 cmd = (
                     "oc process --local --ignore-unknown-parameters"
                     + f"{parameters_cmd} -f {raw_url}"
-                    + f" | oc apply -n {target.namespace.name} -f - --dry-run"
+                    + f" | oc apply -n {namespace_name} -f - --dry-run"
                 )
                 print(cmd)
 
 
-@root.command()
-@click.option("--saas-file-name", default=None, help="saas-file to act on.")
-@click.option("--app-name", default=None, help="app to act on.")
-@click.pass_context
-def saas_targets(
-    ctx, saas_file_name: Optional[str] = None, app_name: Optional[str] = None
-) -> None:
-    """Resolve namespaceSelectors and print all resulting targets of a saas file."""
-    console = Console()
-    if not saas_file_name and not app_name:
-        console.print("[b red]saas-file-name or app-name must be given")
-        sys.exit(1)
-
-    saas_files = get_saas_files(name=saas_file_name, app_name=app_name)
-    if not saas_files:
-        console.print("[b red]no saas files found")
-        sys.exit(1)
-
-    SaasHerder.resolve_templated_parameters(saas_files)
-    root = Tree("Saas Files", highlight=True, hide_root=True)
-    for saas_file in saas_files:
-        saas_file_node = root.add(f":notebook: Saas File: [b green]{saas_file.name}")
-        for rt in saas_file.resource_templates:
-            rt_node = saas_file_node.add(
-                f":page_with_curl: Resource Template: [b blue]{rt.name}"
-            )
-            for target in rt.targets:
-                info = Table("Key", "Value")
-                info.add_row("Ref", target.ref)
-                info.add_row(
-                    "Cluster/Namespace",
-                    f"{target.namespace.cluster.name}/{target.namespace.name}",
-                )
-
-                if target.parameters:
-                    param_table = Table("Key", "Value", box=box.MINIMAL)
-                    for k, v in target.parameters.items():
-                        param_table.add_row(k, v)
-                    info.add_row("Parameters", param_table)
-
-                if target.secret_parameters:
-                    param_table = Table(
-                        "Name", "Path", "Field", "Version", box=box.MINIMAL
-                    )
-                    for secret in target.secret_parameters:
-                        param_table.add_row(
-                            secret.name,
-                            secret.secret.path,
-                            secret.secret.field,
-                            str(secret.secret.version),
-                        )
-                    info.add_row("Secret Parameters", param_table)
-
-                rt_node.add(
-                    Group(f"🎯 Target: [b yellow]{target.name or 'No name'}", info)
-                )
-
-    console.print(root)
-
-
 @root.command()
 @click.argument("query")
 @click.option(

reconcile/gql_definitions/common/saas_target_namespaces.py

@@ -1,118 +0,0 @@
-"""
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
-"""
-from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
-from datetime import datetime  # noqa: F401 # pylint: disable=W0611
-from enum import Enum  # noqa: F401 # pylint: disable=W0611
-from typing import (  # noqa: F401 # pylint: disable=W0611
-    Any,
-    Optional,
-    Union,
-)
-
-from pydantic import (  # noqa: F401 # pylint: disable=W0611
-    BaseModel,
-    Extra,
-    Field,
-    Json,
-)
-
-from reconcile.gql_definitions.fragments.saas_target_namespace import (
-    SaasTargetNamespace,
-)
-
-
-DEFINITION = """
-fragment CommonJumphostFields on ClusterJumpHost_v1 {
-  hostname
-  knownHosts
-  user
-  port
-  remotePort
-  identity {
-    ... VaultSecret
-  }
-}
-
-fragment OcConnectionCluster on Cluster_v1 {
-  name
-  serverUrl
-  internal
-  insecureSkipTLSVerify
-  jumpHost {
-    ...CommonJumphostFields
-  }
-  automationToken {
-    ...VaultSecret
-  }
-  clusterAdminAutomationToken {
-    ...VaultSecret
-  }
-  disable {
-    integrations
-    e2eTests
-  }
-}
-
-fragment SaasTargetNamespace on Namespace_v1 {
-  name
-  environment {
-    name
-    parameters
-    secretParameters {
-      name
-      secret {
-        ...VaultSecret
-      }
-    }
-  }
-  app {
-    name
-  }
-  cluster {
-    ...OcConnectionCluster
-  }
-}
-
-fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
-}
-
-query SaasFileTargetNamespaces {
-  namespaces: namespaces_v1 {
-    ...SaasTargetNamespace
-  }
-}
-"""
-
-
-class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union = True
-        extra = Extra.forbid
-
-
-class SaasFileTargetNamespacesQueryData(ConfiguredBaseModel):
-    namespaces: Optional[list[SaasTargetNamespace]] = Field(..., alias="namespaces")
-
-
-def query(query_func: Callable, **kwargs: Any) -> SaasFileTargetNamespacesQueryData:
-    """
-    This is a convenience function which queries and parses the data into
-    concrete types. It should be compatible with most GQL clients.
-    You do not have to use it to consume the generated data classes.
-    Alternatively, you can also mime and alternate the behavior
-    of this function in the caller.
-
-    Parameters:
-        query_func (Callable): Function which queries your GQL Server
-        kwargs: optional arguments that will be passed to the query function
-
-    Returns:
-        SaasFileTargetNamespacesQueryData: queried data parsed into generated classes
-    """
-    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return SaasFileTargetNamespacesQueryData(**raw_data)

reconcile/gql_definitions/fragments/saas_target_namespace.py

@@ -1,53 +0,0 @@
-"""
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
-"""
-from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
-from datetime import datetime  # noqa: F401 # pylint: disable=W0611
-from enum import Enum  # noqa: F401 # pylint: disable=W0611
-from typing import (  # noqa: F401 # pylint: disable=W0611
-    Any,
-    Optional,
-    Union,
-)
-
-from pydantic import (  # noqa: F401 # pylint: disable=W0611
-    BaseModel,
-    Extra,
-    Field,
-    Json,
-)
-
-from reconcile.gql_definitions.fragments.oc_connection_cluster import (
-    OcConnectionCluster,
-)
-from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
-
-
-class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union = True
-        extra = Extra.forbid
-
-
-class SaasSecretParametersV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    secret: VaultSecret = Field(..., alias="secret")
-
-
-class EnvironmentV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    parameters: Optional[Json] = Field(..., alias="parameters")
-    secret_parameters: Optional[list[SaasSecretParametersV1]] = Field(
-        ..., alias="secretParameters"
-    )
-
-
-class AppV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-
-
-class SaasTargetNamespace(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    environment: EnvironmentV1 = Field(..., alias="environment")
-    app: AppV1 = Field(..., alias="app")
-    cluster: OcConnectionCluster = Field(..., alias="cluster")