mrok 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

mrok/cli/commands/admin/list/instances.py

@@ -21,7 +21,11 @@ from mrok.ziti.constants import (
 
 
 async def get_instances(
-    settings: Settings, detailed: bool, extension: str | None = None, tags: list[str] | None = None
+    settings: Settings,
+    detailed: bool,
+    extension: str | None = None,
+    tags: list[str] | None = None,
+    online_only: bool = False,
 ) -> list[dict]:
     async with ZitiManagementAPI(settings) as api:
         tags = tags or []
@@ -29,6 +33,9 @@ async def get_instances(
         identities = [
             identity async for identity in api.identities(params={"filter": tags_to_filter(tags)})
         ]
+        if online_only:
+            identities = list(filter(lambda i: i["hasEdgeRouterConnection"], identities))
+
         if detailed or extension:
             for identity in identities:
                 identity["services"] = [
@@ -60,10 +67,11 @@ async def get_instances(
 def render_tsv(instances: list[dict], detailed: bool) -> None:
     console = get_console()
     if detailed:
-        console.print("id\tname\tservices\tpolicies\ttags\tcreated\tupdated")
+        console.print("id\tname\tstatus\tservices\tpolicies\ttags\tcreated\tupdated")
         for instance in instances:
             console.print(
                 f"{instance['id']}\t{instance['name']}\t"
+                f"{'online' if instance['hasEdgeRouterConnection'] else 'offline'}\t"
                 f"{extract_names(instance['services'], ', ')}\t"
                 f"{extract_names(instance['policies'], ', ')}\t"
                 f"{format_tags(instance['tags'], ', ')}\t"
@@ -71,10 +79,11 @@ def render_tsv(instances: list[dict], detailed: bool) -> None:
                 f"{format_timestamp(instance['updatedAt'])}"
             )
     else:
-        console.print("id\tname\ttags\tcreated")
+        console.print("id\tname\tstatus\ttags\tcreated")
         for instance in instances:
             console.print(
                 f"{instance['id']}\t{instance['name']}\t"
+                f"{'online' if instance['hasEdgeRouterConnection'] else 'offline'}\t"
                 f"{format_tags(instance['tags'], ', ')}\t"
                 f"{format_timestamp(instance['createdAt'])}\t"
             )
@@ -90,6 +99,7 @@ def render_table(instances: list[dict], detailed: bool) -> None:
     )
     table.add_column("Id", style="green")
     table.add_column("Name", style="bold cyan")
+    table.add_column("Status", justify="center")
     if detailed:
         table.add_column("Associated services")
         table.add_column("Associated service policies")
@@ -102,6 +112,7 @@ def render_table(instances: list[dict], detailed: bool) -> None:
         row = [
             instance["id"],
             instance["name"],
+            "🟢" if instance["hasEdgeRouterConnection"] else "⚪",
         ]
         if detailed:
             row += [
@@ -142,6 +153,15 @@ def register(app: typer.Typer) -> None:
                 show_default=True,
             ),
         ] = None,
+        online_only: Annotated[
+            bool,
+            typer.Option(
+                "--online-only",
+                "-o",
+                help="Show only connected instances",
+                show_default=True,
+            ),
+        ] = False,
         detailed: bool = typer.Option(
             False,
             "--detailed",
@@ -155,7 +175,7 @@ def register(app: typer.Typer) -> None:
         ),
     ):
         """List instances in OpenZiti (identities)."""
-        instances = asyncio.run(get_instances(ctx.obj, detailed, extension, tags))
+        instances = asyncio.run(get_instances(ctx.obj, detailed, extension, tags, online_only))
 
         if len(instances) == 0:
             get_console().print("No instances found.")

mrok/cli/commands/admin/register/extensions.py

@@ -8,14 +8,14 @@ from rich import print
 from mrok.cli.commands.admin.utils import parse_tags
 from mrok.conf import Settings
 from mrok.ziti.api import ZitiManagementAPI
-from mrok.ziti.services import register_extension
+from mrok.ziti.services import register_service
 
 RE_EXTENSION_ID = re.compile(r"(?i)EXT-\d{4}-\d{4}")
 
 
 async def do_register(settings: Settings, extension_id: str, tags: list[str] | None):
     async with ZitiManagementAPI(settings) as api:
-        await register_extension(settings, api, extension_id, tags=parse_tags(tags))
+        await register_service(settings, api, extension_id, tags=parse_tags(tags))
 
 
 def validate_extension_id(extension_id: str) -> str:

mrok/cli/commands/admin/register/instances.py

@@ -9,7 +9,7 @@ import typer
 from mrok.cli.commands.admin.utils import parse_tags
 from mrok.conf import Settings
 from mrok.ziti.api import ZitiClientAPI, ZitiManagementAPI
-from mrok.ziti.identities import register_instance
+from mrok.ziti.identities import register_identity
 
 RE_EXTENSION_ID = re.compile(r"(?i)EXT-\d{4}-\d{4}")
 
@@ -18,8 +18,8 @@ async def do_register(
     settings: Settings, extension_id: str, instance_id: str, tags: list[str] | None
 ):
     async with ZitiManagementAPI(settings) as mgmt_api, ZitiClientAPI(settings) as client_api:
-        return await register_instance(
-            mgmt_api, client_api, extension_id, instance_id, tags=parse_tags(tags)
+        return await register_identity(
+            settings, mgmt_api, client_api, extension_id, instance_id, tags=parse_tags(tags)
         )
 
 

mrok/cli/commands/admin/unregister/extensions.py

@@ -5,14 +5,14 @@ import typer
 
 from mrok.conf import Settings
 from mrok.ziti.api import ZitiManagementAPI
-from mrok.ziti.services import unregister_extension
+from mrok.ziti.services import unregister_service
 
 RE_EXTENSION_ID = re.compile(r"(?i)EXT-\d{4}-\d{4}")
 
 
 async def do_unregister(settings: Settings, extension_id: str):
     async with ZitiManagementAPI(settings) as api:
-        await unregister_extension(settings, api, extension_id)
+        await unregister_service(settings, api, extension_id)
 
 
 def validate_extension_id(extension_id: str):

mrok/cli/commands/admin/unregister/instances.py

@@ -5,14 +5,14 @@ import typer
 
 from mrok.conf import Settings
 from mrok.ziti.api import ZitiManagementAPI
-from mrok.ziti.identities import unregister_instance
+from mrok.ziti.identities import unregister_identity
 
 RE_EXTENSION_ID = re.compile(r"(?i)EXT-\d{4}-\d{4}")
 
 
 async def do_unregister(settings: Settings, extension_id: str, instance_id: str):
     async with ZitiManagementAPI(settings) as api:
-        await unregister_instance(api, extension_id, instance_id)
+        await unregister_identity(settings, api, extension_id, instance_id)
 
 
 def validate_extension_id(extension_id: str):

mrok/controller/app.py

@@ -51,9 +51,15 @@ def setup_app():
 
     # TODO: Add healthcheck
     app.include_router(
-        extensions_router, prefix="/extensions", dependencies=[Depends(authenticate)]
+        extensions_router,
+        prefix="/extensions",
+        dependencies=[Depends(authenticate)],
+    )
+    app.include_router(
+        instances_router,
+        prefix="/instances",
+        dependencies=[Depends(authenticate)],
     )
-    app.include_router(instances_router, prefix="/instances", dependencies=[Depends(authenticate)])
 
     settings = get_settings()
 

mrok/controller/routes/extensions.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Annotated
+from typing import Annotated, Literal
 
 from fastapi import APIRouter, Body, HTTPException, status
 
@@ -14,8 +14,8 @@ from mrok.ziti.errors import (
     ServiceAlreadyRegisteredError,
     ServiceNotFoundError,
 )
-from mrok.ziti.identities import register_instance, unregister_instance
-from mrok.ziti.services import register_extension, unregister_extension
+from mrok.ziti.identities import register_identity, unregister_identity
+from mrok.ziti.services import register_service, unregister_service
 
 logger = logging.getLogger("mrok.controller")
 
@@ -83,7 +83,7 @@ async def create_extension(
     ],
 ):
     try:
-        service = await register_extension(settings, mgmt_api, data.extension.id, data.tags)
+        service = await register_service(settings, mgmt_api, data.extension.id, data.tags)
         return ExtensionRead(
             id=service["id"],
             name=service["name"],
@@ -116,8 +116,26 @@ async def create_extension(
 async def get_extension_by_id_or_extension_id(
     mgmt_api: ZitiManagementAPI,
     id_or_extension_id: str,
+    with_instances: Literal["none", "online", "offline"] = "none",
 ):
-    return ExtensionRead(**(await fetch_extension_or_404(mgmt_api, id_or_extension_id)))
+    extension = await fetch_extension_or_404(mgmt_api, id_or_extension_id)
+
+    if with_instances == "none":
+        return ExtensionRead(**extension)
+
+    instances = list(
+        filter(
+            lambda ir: ir.status == with_instances,
+            [
+                InstanceRead(**identity)
+                async for identity in mgmt_api.identities(
+                    {"filter": f'tags.{MROK_SERVICE_TAG_NAME} = "{extension["name"]}"'}
+                )
+            ],
+        )
+    )
+
+    return ExtensionRead(**extension, instances=instances)
 
 
 @router.delete(
@@ -131,7 +149,7 @@ async def delete_instance_by_id_or_extension_id(
     id_or_extension_id: str,
 ):
     try:
-        await unregister_extension(settings, mgmt_api, id_or_extension_id)
+        await unregister_service(settings, mgmt_api, id_or_extension_id)
     except ServiceNotFoundError:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
@@ -185,6 +203,7 @@ async def get_extensions(
     tags=["Instances"],
 )
 async def create_extension_instances(
+    settings: AppSettings,
     mgmt_api: ZitiManagementAPI,
     client_api: ZitiClientAPI,
     id_or_extension_id: str,
@@ -205,8 +224,8 @@ async def create_extension_instances(
     ],
 ):
     service = await fetch_extension_or_404(mgmt_api, id_or_extension_id)
-    identity, identity_file = await register_instance(
-        mgmt_api, client_api, service["name"], data.instance.id, data.tags
+    identity, identity_file = await register_identity(
+        settings, mgmt_api, client_api, service["name"], data.instance.id, data.tags
     )
     return InstanceRead(
         id=identity["id"],
@@ -272,11 +291,7 @@ async def get_instance_by_id_or_instance_id(
     id_or_instance_id: str,
 ):
     identity = await fetch_instance_or_404(mgmt_api, id_or_extension_id, id_or_instance_id)
-    return InstanceRead(
-        id=identity["id"],
-        name=identity["name"],
-        tags=identity["tags"],
-    )
+    return InstanceRead(**identity)
 
 
 @router.delete(
@@ -285,10 +300,11 @@ async def get_instance_by_id_or_instance_id(
     tags=["Instances"],
 )
 async def delete_instance_by_id_or_instance_id(
+    settings: AppSettings,
     mgmt_api: ZitiManagementAPI,
     id_or_extension_id: str,
     id_or_instance_id: str,
 ):
     identity = await fetch_instance_or_404(mgmt_api, id_or_extension_id, id_or_instance_id)
     instance_id, extension_id = identity["name"].split(".")
-    await unregister_instance(mgmt_api, extension_id, instance_id)
+    await unregister_identity(settings, mgmt_api, extension_id, instance_id)

mrok/controller/routes/instances.py

@@ -6,6 +6,7 @@ from mrok.controller.dependencies import ZitiManagementAPI
 from mrok.controller.openapi import examples
 from mrok.controller.pagination import LimitOffsetPage, paginate
 from mrok.controller.schemas import InstanceRead
+from mrok.ziti.constants import MROK_IDENTITY_TYPE_TAG_NAME, MROK_IDENTITY_TYPE_TAG_VALUE_INSTANCE
 
 logger = logging.getLogger("mrok.controller")
 
@@ -68,4 +69,7 @@ async def get_instance_by_id_or_instance_id(
 async def get_instances(
     mgmt_api: ZitiManagementAPI,
 ):
-    return await paginate(mgmt_api, "/identities", InstanceRead)
+    params = {
+        "filter": f'tags.{MROK_IDENTITY_TYPE_TAG_NAME}="{MROK_IDENTITY_TYPE_TAG_VALUE_INSTANCE}"'
+    }
+    return await paginate(mgmt_api, "/identities", InstanceRead, extra_params=params)

mrok/controller/schemas.py

@@ -1,4 +1,6 @@
-from typing import Annotated, Any
+from __future__ import annotations
+
+from typing import Annotated, Any, Literal
 
 from pydantic import (
     BaseModel,
@@ -34,6 +36,7 @@ class ExtensionBase(BaseSchema):
 
 class ExtensionRead(BaseSchema, IdSchema):
     name: str
+    instances: list[InstanceRead] | None = None
 
     @computed_field
     def extension(self) -> dict:
@@ -51,6 +54,11 @@ class InstanceBase(BaseSchema):
 class InstanceRead(BaseSchema, IdSchema):
     name: str
     identity: dict[str, Any] | None = None
+    has_edge_router_connection: bool | None = Field(
+        False,
+        alias="hasEdgeRouterConnection",
+        exclude=True,
+    )
 
     @computed_field
     def instance(self) -> dict:
@@ -62,6 +70,10 @@ class InstanceRead(BaseSchema, IdSchema):
         _, extension_id = self.name.split(".", 1)
         return {"id": extension_id.upper()}
 
+    @computed_field
+    def status(self) -> Literal["online", "offline"]:
+        return "online" if bool(self.has_edge_router_connection) else "offline"
+
 
 class InstanceCreate(InstanceBase):
     pass

mrok/ziti/api.py

@@ -397,7 +397,7 @@ class ZitiManagementAPI(BaseZitiAPI):
     async def search_config_type(self, id_or_name: str) -> dict[str, Any] | None:
         return await self.search_by_id_or_name("/config-types", id_or_name)
 
-    async def delete_config_type(self, config_type_id: str) -> dict[str, Any] | None:
+    async def delete_config_type(self, config_type_id: str) -> None:
         return await self.delete("/config-types", config_type_id)
 
     async def get_identity(self, identity_id: str) -> dict[str, Any]:

mrok/ziti/identities.py

@@ -1,8 +1,10 @@
+import copy
 import logging
 from typing import Any
 
 import jwt
 
+from mrok.conf import Settings
 from mrok.ziti import pki
 from mrok.ziti.api import TagsType, ZitiClientAPI, ZitiManagementAPI
 from mrok.ziti.constants import (
@@ -16,31 +18,37 @@ from mrok.ziti.errors import (
     ServiceNotFoundError,
     UserIdentityNotFoundError,
 )
+from mrok.ziti.services import register_service, unregister_service
 
 logger = logging.getLogger("mrok.ziti")
 
 
-async def register_instance(
+async def register_identity(
+    settings: Settings,
     mgmt_api: ZitiManagementAPI,
     client_api: ZitiClientAPI,
-    extension_id: str,
-    instance_id: str,
+    service_external_id: str,
+    identity_external_id: str,
     tags: TagsType | None = None,
 ):
-    service_name = extension_id.lower()
-    tags = tags or {}
-    tags[MROK_SERVICE_TAG_NAME] = service_name
-    tags[MROK_IDENTITY_TYPE_TAG_NAME] = MROK_IDENTITY_TYPE_TAG_VALUE_INSTANCE
+    service_name = service_external_id.lower()
+    identity_tags = copy.copy(tags or {})
+    identity_tags[MROK_SERVICE_TAG_NAME] = service_name
+    identity_tags[MROK_IDENTITY_TYPE_TAG_NAME] = MROK_IDENTITY_TYPE_TAG_VALUE_INSTANCE
     service = await mgmt_api.search_service(service_name)
     if not service:
-        raise ServiceNotFoundError(f"A service with name `{extension_id}` does not exists.")
+        raise ServiceNotFoundError(f"A service with name `{service_external_id}` does not exists.")
 
-    identity_name = f"{instance_id.lower()}.{service_name}"
+    identity_name = f"{identity_external_id.lower()}.{service_name}"
     service_policy_name = f"{identity_name}:bind"
+    self_service_policy_name = f"self.{service_policy_name}"
 
     identity = await mgmt_api.search_identity(identity_name)
     if identity:
         service_policy = await mgmt_api.search_service_policy(service_policy_name)
+        if service_policy:
+            await mgmt_api.delete_service_policy(service_policy["id"])
+        service_policy = await mgmt_api.search_service_policy(self_service_policy_name)
         if service_policy:
             await mgmt_api.delete_service_policy(service_policy["id"])
         router_policy = await mgmt_api.search_router_policy(identity_name)
@@ -48,7 +56,7 @@ async def register_instance(
             await mgmt_api.delete_router_policy(router_policy["id"])
         await mgmt_api.delete_identity(identity["id"])
 
-    identity_id = await mgmt_api.create_user_identity(identity_name, tags=tags)
+    identity_id = await mgmt_api.create_user_identity(identity_name, tags=identity_tags)
     identity = await mgmt_api.get_identity(identity_id)
 
     identity_json = await _enroll_identity(
@@ -58,33 +66,55 @@ async def register_instance(
         identity,
         mrok={
             "identity": identity_name,
-            "extension": extension_id,
-            "instance": instance_id,
+            "extension": service_external_id,
+            "instance": identity_external_id,
+            "domain": settings.proxy.domain,
+            "tags": identity_tags,
         },
     )
 
+    self_service = await mgmt_api.search_service(identity_name)
+    if not self_service:
+        self_service = await register_service(settings, mgmt_api, identity_name, tags)
+
     await mgmt_api.create_bind_service_policy(service_policy_name, service["id"], identity_id)
+    await mgmt_api.create_bind_service_policy(
+        self_service_policy_name,
+        self_service["id"],
+        identity_id,
+    )
     await mgmt_api.create_router_policy(identity_name, identity_id)
 
     return identity, identity_json
 
 
-async def unregister_instance(
+async def unregister_identity(
+    settings: Settings,
     mgmt_api: ZitiManagementAPI,
-    extension_id: str,
-    instance_id: str,
+    service_external_id: str,
+    identity_external_id: str,
 ):
-    service_name = extension_id.lower()
+    service_name = service_external_id.lower()
     service = await mgmt_api.search_service(service_name)
     if not service:
-        raise ServiceNotFoundError(f"A service with name `{extension_id}` does not exists.")
+        raise ServiceNotFoundError(f"A service with name `{service_external_id}` does not exists.")
 
-    identity_name = f"{instance_id.lower()}.{service_name}"
+    identity_name = f"{identity_external_id.lower()}.{service_name}"
     service_policy_name = f"{identity_name}:bind"
 
     identity = await mgmt_api.search_identity(identity_name)
     if not identity:
-        raise UserIdentityNotFoundError(f"Instance `{instance_id}` not found.")
+        raise UserIdentityNotFoundError(f"Identity `{identity_external_id}` not found.")
+
+    self_service_policy_name = f"self.{service_policy_name}"
+
+    service_policy = await mgmt_api.search_service_policy(self_service_policy_name)
+    if service_policy:
+        await mgmt_api.delete_service_policy(service_policy["id"])
+
+    self_service = await mgmt_api.search_service(identity_name)
+    if self_service:
+        await unregister_service(settings, mgmt_api, identity_name)
 
     service_policy = await mgmt_api.search_service_policy(service_policy_name)
     if service_policy:
@@ -120,7 +150,7 @@ async def _enroll_identity(
     client_api: ZitiClientAPI,
     identity_id: str,
     identity: dict[str, Any] | None = None,
-    mrok: dict[str, str] | None = None,
+    mrok: dict[str, str | dict] | None = None,
 ):
     if identity is None:
         identity = await mgmt_api.get_identity(identity_id)

mrok/ziti/services.py

@@ -13,10 +13,10 @@ from mrok.ziti.errors import (
 logger = logging.getLogger(__name__)
 
 
-async def register_extension(
-    settings: Settings, mgmt_api: ZitiManagementAPI, extension_id: str, tags: TagsType | None
+async def register_service(
+    settings: Settings, mgmt_api: ZitiManagementAPI, external_id: str, tags: TagsType | None
 ) -> dict[str, Any]:
-    service_name = extension_id.lower()
+    service_name = external_id.lower()
     registered = False
     proxy_identity = await mgmt_api.search_identity(settings.proxy.identity)
     if not proxy_identity:
@@ -58,17 +58,17 @@ async def register_extension(
         await mgmt_api.create_service_router_policy(service_name, service_id, tags=tags)
         registered = True
     if not registered:
-        raise ServiceAlreadyRegisteredError(f"Extension `{extension_id}` already registered.")
+        raise ServiceAlreadyRegisteredError(f"Service `{external_id}` already registered.")
     return service
 
 
-async def unregister_extension(
-    settings: Settings, mgmt_api: ZitiManagementAPI, extension_id: str
+async def unregister_service(
+    settings: Settings, mgmt_api: ZitiManagementAPI, external_id: str
 ) -> None:
-    service_name = extension_id.lower()
+    service_name = external_id.lower()
     service = await mgmt_api.search_service(service_name)
     if not service:
-        raise ServiceNotFoundError(f"Extension `{extension_id}` not found.")
+        raise ServiceNotFoundError(f"Service `{external_id}` not found.")
 
     router_policy = await mgmt_api.search_service_router_policy(service_name)
     if router_policy:

{mrok-0.2.2.dist-info → mrok-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mrok
-Version: 0.2.2
+Version: 0.3.0
 Summary: MPT Extensions OpenZiti Orchestrator
 Author: SoftwareOne AG
 License:                                  Apache License

{mrok-0.2.2.dist-info → mrok-0.3.0.dist-info}/RECORD

@@ -16,13 +16,13 @@ mrok/cli/commands/admin/bootstrap.py,sha256=iOnHctYajgcHrG_Idjn5Y7VVSaWYRIhdgqKS
 mrok/cli/commands/admin/utils.py,sha256=wQ-qQJGFyhikMJY_CWT-G6sTEIZb-LUdj1AUZisLPBw,1363
 mrok/cli/commands/admin/list/__init__.py,sha256=kjCMcpn1gopcrQaaHxfFh8Kyngldepnle8R2br5dJ_0,195
 mrok/cli/commands/admin/list/extensions.py,sha256=16fhDB5ucL8su2WQnSaQ1E6MhgC4vkP9-nuHAcPpzyE,4405
-mrok/cli/commands/admin/list/instances.py,sha256=HpEXk7DfeAXeUwi8Z4qnOmQCB1_lPm2JVBl8k0tjvUk,5179
+mrok/cli/commands/admin/list/instances.py,sha256=kaqeyidwUxgYqfaHXqp2m76rm5h2ErBsYyZcNeaBRwY,5912
 mrok/cli/commands/admin/register/__init__.py,sha256=5Jb_bc2L47MEpQIrOcquzduTFWQ01Jd1U1MpqaR-Ekw,209
-mrok/cli/commands/admin/register/extensions.py,sha256=nX2PUX8hmsWjyp2dGgge2YmkfeGgGXhqk7fwUx99o9o,1489
-mrok/cli/commands/admin/register/instances.py,sha256=_9xpa4rZYmf7SZ58hx103EuEbA3o2FZYbAVmpT8oRhM,1930
+mrok/cli/commands/admin/register/extensions.py,sha256=p1qX5gSQX1IGpOQjO2MJzbc09v1ebdFuPo94QzJErKk,1485
+mrok/cli/commands/admin/register/instances.py,sha256=XB6uAchc7Rm8uAu7o3-oHaN_rS8CCIBf0QKWZGW86fI,1940
 mrok/cli/commands/admin/unregister/__init__.py,sha256=-GjjCPX1pISbWmJK6GpKO3ijGsDQb21URjU1hNu99O4,215
-mrok/cli/commands/admin/unregister/extensions.py,sha256=AVBjHu-Zc7bUZ_YSbvEk41fKByvRl2Hggip1E2c11Mk,1020
-mrok/cli/commands/admin/unregister/instances.py,sha256=UvMEDOw7FhZYz2AZci79sSVKfDxOS7d5GY5iCUtUZRM,1128
+mrok/cli/commands/admin/unregister/extensions.py,sha256=GR3Iwzeksk_R0GkgmCSG7iHRcUrI7ABqDi25Gbes64Y,1016
+mrok/cli/commands/admin/unregister/instances.py,sha256=-28wL8pTXTWHVHtw93y8-dqi-Dlf0OZOnlBCKOyGo80,1138
 mrok/cli/commands/agent/__init__.py,sha256=Jr9RDSDdRPjbVJ7NhzgjRD-jtr5hD2vvKzDe7XsLnVo,140
 mrok/cli/commands/agent/run/__init__.py,sha256=E_IJCl3BfMffqFASe8gzJwhhQgt5bQfjhuyekVwdEBA,164
 mrok/cli/commands/agent/run/asgi.py,sha256=aqwu_h9WyCDI2Ts8D4zTvawCETNmcke7cX3zIUyRww4,1265
@@ -31,10 +31,10 @@ mrok/cli/commands/controller/__init__.py,sha256=2xw-YVN0akiLiuGUU3XbYyZZ0ugOjQ6X
 mrok/cli/commands/controller/openapi.py,sha256=QLjVao9UkB2vBaGkFi_q_jrlg4Np4ldMRwDIJsrJ7A8,1175
 mrok/cli/commands/controller/run.py,sha256=osyjssb81xNMYZLPb6dfPR4W_BQlCxKDfvl-BIhG_1A,2460
 mrok/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mrok/controller/app.py,sha256=_MzTu_wFRbD4kGbw4PdP5OYpl3KDlOCJFeNWxt-WM-c,1818
+mrok/controller/app.py,sha256=XxCIB7N1YE52vSYfvGW2UPgEEOZ9jxDMe2l9D2SfXi8,1866
 mrok/controller/auth.py,sha256=Kg94W8yNMs6TvUmLRYv1QeUjDy4qlGZ-_6OHa4KH1zg,2648
 mrok/controller/pagination.py,sha256=raYpYa34q8Ckl4BXBOEdpWlKkFj6z7e6QLWr2HT7dzI,2187
-mrok/controller/schemas.py,sha256=zk91PIJ0zncpBgs4bhU-n-76EWlRKo87r3VVx15JxPc,1320
+mrok/controller/schemas.py,sha256=AaF8_bEwZTHM02apVEBAzlUb2t71zoxYaG-VHtPNeMk,1705
 mrok/controller/dependencies/__init__.py,sha256=voewk6gjkA0OarL6HFmfT_RLqBns0Fpl-VIqK5xVAEI,202
 mrok/controller/dependencies/conf.py,sha256=2Pa8fxJHkZ29q6UL-w6hUP_wr7WnNELfw5LlzWg1Tec,162
 mrok/controller/dependencies/ziti.py,sha256=fYoxeJb4s6p2_3gxbExbFSRabjpvp_gZMBb3ocXZV3Y,702
@@ -42,8 +42,8 @@ mrok/controller/openapi/__init__.py,sha256=U1dw45w76CcoQagyqg_FXdMuJF3qJZZM6wG8T
 mrok/controller/openapi/examples.py,sha256=ZI0BP7L6sI0z7Mq1I3uc2UrweGpzpPeGSIuf1bUKkgg,1419
 mrok/controller/openapi/utils.py,sha256=Kn55ISAWlMJNwrJTum7iFrBvJvr81To76pCK8W-s79Q,1114
 mrok/controller/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mrok/controller/routes/extensions.py,sha256=j-dLO4yLkUj-rdjnGhO2suvmR690-UdaNvokDZ7ZpF0,8670
-mrok/controller/routes/instances.py,sha256=rcpbKfLsYsokOo7aZamzQks-c9AYoU-8KKK9pDYpoOY,1963
+mrok/controller/routes/extensions.py,sha256=zoY4sNz_BIZcbly6WXM7Rbpn2jmB89njS_0xdJkoKfs,9192
+mrok/controller/routes/instances.py,sha256=v-fn_F6JHbDZ4YUNCIZzClgHp6aC1Eu5HB7k7qBG5pk,2202
 mrok/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mrok/http/config.py,sha256=k8mjvD3ninJn-v1t-co-GSa3upm4b70bWyk3fwdcOh8,2161
 mrok/http/forwarder.py,sha256=mo-Z8B8Zg6kdDX-lWEiptRv-9kJU9cEdmg6gt6eF0cc,11374
@@ -52,15 +52,15 @@ mrok/http/master.py,sha256=TwU78yE_GQecogBs_PDpl3gY7_jWYNIRNaAXRzi0rvY,4152
 mrok/http/protocol.py,sha256=ap8jbLUvgbAH81ZJZCBkQiYR7mkV_eL3rpfwEkoE8sU,392
 mrok/http/server.py,sha256=Mj7C85fc-DXp-WTBWaOd7ag808oliLmFBH5bf-G2FHg,370
 mrok/ziti/__init__.py,sha256=20OWMiexRhOovZOX19zlX87-V78QyWnEnSZfyAftUdE,263
-mrok/ziti/api.py,sha256=onVOSgcqALTeC3EBX-RPJvkqQ3OhhzvJ91HPsGaIJC4,16171
+mrok/ziti/api.py,sha256=KvGiT9d4oSgC3JbFWLDQyuHcLX2HuZJoJ8nHmWtCDkY,16154
 mrok/ziti/bootstrap.py,sha256=QIDhlkIxPW2QRuumFq2D1WDbD003P5f3z24pAUsyeBI,2696
 mrok/ziti/constants.py,sha256=Urq1X3bCBQZfw8NbnEa1pqmY4oq1wmzkwPfzam3kbTw,339
 mrok/ziti/errors.py,sha256=yYCbVDwktnR0AYduqtynIjo73K3HOhIrwA_vQimvEd4,368
-mrok/ziti/identities.py,sha256=oE_3j6Y4xCr6uKNdprW55bxGsyKnmJt-MrxrylB2Ey4,5388
+mrok/ziti/identities.py,sha256=1BcwfqAJHMBhc3vRaf0aLaIkoHskj5Xe2Lsq2lO9Vs8,6735
 mrok/ziti/pki.py,sha256=o2tySqHC8-7bvFuI2Tqxg9vX6H6ZSxWxfP_9x29e19M,1954
-mrok/ziti/services.py,sha256=JnznLTHNZjgbFwnBtv7y2XIp4NiQxLVawwP9EfWdVuM,3208
-mrok-0.2.2.dist-info/METADATA,sha256=aB7i_YKGCGzw0Eo2yOHE5u7uY4Y4wuDaj24245QH3fE,15546
-mrok-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mrok-0.2.2.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
-mrok-0.2.2.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
-mrok-0.2.2.dist-info/RECORD,,
+mrok/ziti/services.py,sha256=zR1PEBYwXVou20iJK4euh0ZZFAo9UB8PZk8f6SDmiUE,3194
+mrok-0.3.0.dist-info/METADATA,sha256=5d5NEs5U_FXyVXXoZXhZgZUkdQl5N_EbFPjkDJ79whM,15546
+mrok-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mrok-0.3.0.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
+mrok-0.3.0.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
+mrok-0.3.0.dist-info/RECORD,,

{mrok-0.2.2.dist-info → mrok-0.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any