validio-cli 0.20.2__tar.gz → 0.22.0__tar.gz

{validio_cli-0.20.2 → validio_cli-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: validio-cli
-Version: 0.20.2
+Version: 0.22.0
 Summary: CLI tool to interact with the Validio platform
 Home-page: https://validio.io/
 License: Apache-2.0

{validio_cli-0.20.2 → validio_cli-0.22.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "validio-cli"
 # This version does not represent the released version or any tag. For each
 # release we automatically bump this before building and publishing so this
 # should be kept at 0.0.1dev1
-version = "0.20.2"
+version = "0.22.0"
 description = "CLI tool to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"

{validio_cli-0.20.2 → validio_cli-0.22.0}/validio_cli/bin/entities/code.py

@@ -15,6 +15,10 @@ from validio_sdk.code import scaffold
 from validio_sdk.resource._diff import DiffContext, GraphDiff, ResourceUpdate
 from validio_sdk.resource._resource import Resource
 from validio_sdk.resource._util import SourceSchemaReinference
+from validio_sdk.resource.replacement import (
+    ImmutableFieldReplacementReason,
+    ReplacementReason,
+)
 from validio_sdk.validio_client import ValidioAPIClient
 
 from validio_cli import AsyncTyper, ConfigDir, Namespace, get_client_and_config
@@ -368,6 +372,7 @@ def _show_resources_diff(
         for t in resource_types:
             _show_create_resource_diff(
                 getattr(diff.to_create, t),
+                getattr(diff.replacement_ctx, t),
                 show_schema,
                 show_secrets,
                 escape,
@@ -378,6 +383,7 @@ def _show_resources_diff(
         for t in resource_types:
             _show_delete_resource_diff(
                 getattr(diff.to_delete, t),
+                getattr(diff.replacement_ctx, t),
                 show_schema,
                 show_secrets,
                 escape,
@@ -394,6 +400,16 @@ def _show_resources_diff(
                 diff_output=diff_output,
             )
 
+    for t in resource_types:
+        _show_replace_resource_diff(
+            getattr(diff.to_create, t),
+            getattr(diff.replacement_ctx, t),
+            show_schema,
+            show_secrets,
+            escape,
+            diff_output,
+        )
+
     _show_deprecations(deprecations)
 
     print(
@@ -405,12 +421,16 @@ def _show_resources_diff(
 
 def _show_create_resource_diff(
     resources: Mapping[str, Resource],
+    replaced_resources: Mapping[str, ReplacementReason],
     show_schema: bool,
     show_secrets: bool,
     color: bool,
     diff_output: DiffOutput,
 ) -> None:
     for r in resources.values():
+        if r.name in replaced_resources:
+            continue
+
         class_key = r.__class__.__name__
 
         print(f"{class_key} '{r.name}' will be created")
@@ -425,12 +445,16 @@ def _show_create_resource_diff(
 
 def _show_delete_resource_diff(
     resources: Mapping[str, Resource],
+    replaced_resources: Mapping[str, ReplacementReason],
     show_schema: bool,
     show_secrets: bool,
     color: bool,
     diff_output: DiffOutput,
 ) -> None:
     for r in resources.values():
+        if r.name in replaced_resources:
+            continue
+
         class_key = r.__class__.__name__
 
         print(f"{class_key} '{r.name}' will be deleted")
@@ -475,6 +499,49 @@ def _show_update_resource_diff(
         _show_diff(b_value, a_value, color, diff_output, class_key)
 
 
+def _show_replace_resource_diff(
+    resources: Mapping[str, Resource],
+    replaced_resources: Mapping[str, ReplacementReason],
+    show_schema: bool,
+    show_secrets: bool,
+    color: bool,
+    diff_output: DiffOutput,
+) -> None:
+    for r in resources.values():
+        reason = replaced_resources.get(r.name)
+        if not reason:
+            continue
+
+        class_key = r.__class__.__name__
+
+        print(f"{class_key} '{r.name}' will be replaced: {reason._reason()}")
+
+        rewrites = _diff_field_rewrites(show_schema)
+        a_value, b_value = (None, None)
+        if isinstance(reason, ImmutableFieldReplacementReason):
+            update = reason.resource_update
+            a_value = code_plan._create_resource_diff_object(
+                update.manifest,
+                show_secrets=show_secrets,
+                rewrites=rewrites,
+                secrets_changed=update.secrets_changed,
+                is_manifest=True,
+            )
+            b_value = code_plan._create_resource_diff_object(
+                update.server,
+                show_secrets=show_secrets,
+                rewrites=rewrites,
+                secrets_changed=update.secrets_changed,
+                is_manifest=False,
+            )
+        else:
+            b_value = code_plan._create_resource_diff_object(
+                r, rewrites=rewrites, show_secrets=show_secrets
+            )
+
+        _show_diff(a_value, b_value, color, diff_output, class_key)
+
+
 def _show_diff(
     current_value: Any,
     new_value: Any,

validio_cli-0.22.0/validio_cli/bin/entities/namespaces.py

@@ -0,0 +1,203 @@
+from typing import Optional
+
+import typer
+from validio_sdk import ValidioError
+from validio_sdk.graphql_client.enums import Role
+from validio_sdk.graphql_client.input_types import (
+    NamespaceCreateInput,
+    NamespaceRolesUpdateInput,
+    NamespaceRoleWithId,
+)
+
+from validio_cli import (
+    AsyncTyper,
+    ConfigDir,
+    OutputFormat,
+    OutputFormatOption,
+    OutputSettings,
+    _single_resource_if_specified,
+    get_client_and_config,
+    output_json,
+    output_text,
+)
+
+app = AsyncTyper(help="Namespaces used to separate resources")
+
+
+@app.async_command(help="Get namespaces")
+async def get(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    identifier: str = typer.Argument(default=None, help="Namespace name"),
+) -> None:
+    vc, _ = await get_client_and_config(config_dir)
+
+    namespaces = await vc.list_namespaces()
+    # TODO(UI-2311): Fully support list/get/get_by_resource_name
+    namespaces = _single_resource_if_specified(namespaces, identifier)
+
+    if output_format == OutputFormat.JSON:
+        return output_json(namespaces, identifier)
+
+    return output_text(
+        namespaces,
+        fields={
+            "name": OutputSettings(attribute_name="id"),
+        },
+    )
+
+
+@app.async_command(help="[red][bold]BETA[/bold][/red] Create a namespace")
+async def create(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    identifier: str = typer.Argument(..., help="Namespace name"),
+    role: Role = typer.Option(None, help="The role to assign --api-key and --member"),
+    api_key: list[str] = typer.Option(
+        [],
+        "--api-key",
+        help="API key to assign the --role. Can be specified multiple times",
+    ),
+    member: list[str] = typer.Option(
+        [],
+        "--member",
+        help="Member id to assign to the --role. Can be specified multiple times",
+    ),
+    name: Optional[str] = None,
+) -> None:
+    vc, cfg = await get_client_and_config(config_dir)
+
+    if (member or api_key) and not role:
+        raise ValidioError("--role is required when specifying --member or --api-key")
+
+    if role and not (member or api_key):
+        raise ValidioError(
+            "--role is specified but no --member or --api-key to assign the role"
+        )
+
+    ns_api_keys = [
+        NamespaceRoleWithId(
+            id=cfg.access_key,
+            role=Role.ADMIN,
+        )
+    ]
+    for ak in api_key:
+        ns_api_keys.append(NamespaceRoleWithId(id=ak, role=role))
+
+    ns_members = []
+    for m in member:
+        ns_members.append(NamespaceRoleWithId(id=m, role=role))
+
+    namespaces = await vc.create_namespace(
+        NamespaceCreateInput(
+            id=identifier,
+            name=name or identifier,
+            members=ns_members,
+            api_keys=ns_api_keys,
+        )
+    )
+
+    if output_format == OutputFormat.JSON:
+        return output_json(namespaces, identifier)
+
+    return output_text(
+        namespaces.namespace,
+        fields={
+            "id": None,
+            "name": None,
+        },
+    )
+
+
+@app.async_command(help="[red][bold]BETA[/bold][/red] Update a namespace")
+async def update(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    identifier: str = typer.Argument(..., help="Namespace name"),
+    role: Role = typer.Option(None, help="The role to assign --api-key and --member"),
+    api_key: list[str] = typer.Option(
+        [],
+        "--api-key",
+        help="API key to assign the --role. Can be specified multiple times",
+    ),
+    member: list[str] = typer.Option(
+        [],
+        "--member",
+        help="Member id to assign to the --role. Can be specified multiple times",
+    ),
+) -> None:
+    vc, _ = await get_client_and_config(config_dir)
+
+    if (member or api_key) and not role:
+        raise ValidioError("--role is required when specifying --member or --api-key")
+
+    if role and not (member or api_key):
+        raise ValidioError(
+            "--role is specified but no --member or --api-key to assign the role"
+        )
+
+    ns_api_keys = []
+    for ak in api_key:
+        ns_api_keys.append(NamespaceRoleWithId(id=ak, role=role))
+
+    ns_members = []
+    for m in member:
+        ns_members.append(NamespaceRoleWithId(id=m, role=role))
+
+    namespace = await vc.get_namespace(identifier)
+    if namespace is None:
+        raise ValidioError(f"namespace '{identifier}' not found")
+
+    api_keys = [
+        NamespaceRoleWithId(id=x.api_key.id, role=x.role)
+        for x in namespace.api_keys
+        if x.api_key.id not in api_key
+    ] + ns_api_keys
+
+    members = [
+        NamespaceRoleWithId(id=x.user.id, role=x.role)
+        for x in namespace.members
+        if x.user.id not in member
+    ] + ns_members
+
+    namespaces = await vc.update_namespace_roles(
+        NamespaceRolesUpdateInput(
+            namespace_id=identifier,
+            members=members,
+            api_keys=api_keys,
+        )
+    )
+
+    if output_format == OutputFormat.JSON:
+        return output_json(namespaces, identifier)
+
+    return output_text(
+        namespaces.namespace,
+        fields={
+            "id": None,
+            "name": None,
+        },
+    )
+
+
+@app.async_command(help="Remove a namespace")
+async def remove(
+    config_dir: str = ConfigDir,
+    output_format: OutputFormat = OutputFormatOption,
+    identifier: str = typer.Argument(..., help="Namespace name"),
+) -> None:
+    vc, _ = await get_client_and_config(config_dir)
+
+    result = await vc.delete_namespaces(ids=[identifier])
+
+    if output_format == OutputFormat.JSON:
+        return output_json(result, identifier)
+
+    status = "OK" if len(result.errors) == 0 else "ERROR"
+
+    return output_text(
+        {"status": status},
+        fields={
+            "status": OutputSettings(pass_full_object=True, reformat=lambda _: status),
+        },
+    )

{validio_cli-0.20.2 → validio_cli-0.22.0}/validio_cli/bin/entities/users.py

@@ -4,7 +4,6 @@ from validio_cli import (
     AsyncTyper,
     ConfigDir,
     Identifier,
-    Namespace,
     OutputFormat,
     OutputFormatOption,
     OutputSettings,
@@ -12,7 +11,6 @@ from validio_cli import (
     output_json,
     output_text,
 )
-from validio_cli.namespace import get_namespace
 
 app = AsyncTyper(help="Users in the Validio platform")
 
@@ -21,7 +19,6 @@ app = AsyncTyper(help="Users in the Validio platform")
 async def get(
     config_dir: str = ConfigDir,
     output_format: OutputFormat = OutputFormatOption,
-    namespace: str = Namespace(),
     identifier: str = Identifier,
 ) -> None:
     vc, cfg = await get_client_and_config(config_dir)
@@ -30,7 +27,6 @@ async def get(
         users = [
             await vc.get_user_by_resource_name(
                 resource_name=identifier,
-                namespace_id=get_namespace(namespace, cfg),
             )
         ]
     else:
@@ -43,8 +39,8 @@ async def get(
         users,
         fields={
             "name": OutputSettings(attribute_name="resource_name"),
-            "role": None,
-            "status": None,
+            "global_role": OutputSettings(reformat=lambda x: x.value),
+            "status": OutputSettings(reformat=lambda x: x.value),
             "identities": OutputSettings(reformat=lambda x: len(x)),
             "age": OutputSettings(attribute_name="created_at"),
         },

{validio_cli-0.20.2 → validio_cli-0.22.0}/validio_cli/bin/main.py

@@ -25,6 +25,7 @@ from validio_cli.bin.entities import (
     dbt,
     incidents,
     metrics,
+    namespaces,
     notification_rules,
     recommendations,
     resources,
@@ -50,6 +51,7 @@ app.add_typer(credentials.app, no_args_is_help=True, name="credentials")
 app.add_typer(dbt.app, no_args_is_help=True, name="dbt")
 app.add_typer(incidents.app, no_args_is_help=True, name="incidents")
 app.add_typer(metrics.app, no_args_is_help=True, name="metrics")
+app.add_typer(namespaces.app, no_args_is_help=True, name="namespaces")
 app.add_typer(resources.app, no_args_is_help=True, name="resources")
 app.add_typer(notification_rules.app, no_args_is_help=True, name="notification-rules")
 app.add_typer(recommendations.app, no_args_is_help=True, name="recommendations")