mrok 0.1.8__py3-none-any.whl → 0.2.0__py3-none-any.whl

mrok/controller/app.py

@@ -8,7 +8,8 @@ from fastapi.routing import APIRoute, APIRouter
 from mrok.conf import get_settings
 from mrok.controller.auth import authenticate
 from mrok.controller.openapi import generate_openapi_spec
-from mrok.controller.routes import router as extensions_router
+from mrok.controller.routes.extensions import router as extensions_router
+from mrok.controller.routes.instances import router as instances_router
 
 logger = logging.getLogger(__name__)
 
@@ -52,6 +53,7 @@ def setup_app():
     app.include_router(
         extensions_router, prefix="/extensions", dependencies=[Depends(authenticate)]
     )
+    app.include_router(instances_router, prefix="/instances", dependencies=[Depends(authenticate)])
 
     settings = get_settings()
 

mrok/controller/routes/instances.py

@@ -0,0 +1,71 @@
+import logging
+
+from fastapi import APIRouter, HTTPException, status
+
+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
+
+logger = logging.getLogger("mrok.controller")
+
+router = APIRouter()
+
+
+async def fetch_instance_or_404(mgmt_api: ZitiManagementAPI, id_or_instance_id: str):
+    identity = await mgmt_api.search_identity(id_or_instance_id)
+    if not identity:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+        )
+    return identity
+
+
+@router.get(
+    "/{id_or_instance_id}",
+    response_model=InstanceRead,
+    responses={
+        200: {
+            "description": "Instance",
+            "content": {"application/json": {"example": examples.INSTANCE_RESPONSE}},
+        },
+    },
+    dependencies=[],
+    tags=["Instances"],
+)
+async def get_instance_by_id_or_instance_id(
+    mgmt_api: ZitiManagementAPI,
+    id_or_instance_id: str,
+):
+    identity = await fetch_instance_or_404(mgmt_api, id_or_instance_id)
+    return InstanceRead(**identity)
+
+
+@router.get(
+    "",
+    response_model=LimitOffsetPage[InstanceRead],
+    responses={
+        200: {
+            "description": "List of Instances",
+            "content": {
+                "application/json": {
+                    "example": {
+                        "data": [examples.INSTANCE_RESPONSE],
+                        "$meta": {
+                            "pagination": {
+                                "total": 1,
+                                "limit": 10,
+                                "offset": 0,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    },
+    tags=["Instances"],
+)
+async def get_instances(
+    mgmt_api: ZitiManagementAPI,
+):
+    return await paginate(mgmt_api, "/identities", InstanceRead)

mrok/ziti/api.py

@@ -397,6 +397,9 @@ 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:
+        return await self.delete("/config-types", config_type_id)
+
     async def get_identity(self, identity_id: str) -> dict[str, Any]:
         return await self.get("/identities", identity_id)
 

mrok/ziti/bootstrap.py

@@ -19,19 +19,27 @@ async def bootstrap_identity(
 
     identity_json = None
     existing_identity = await mgmt_api.search_identity(identity_name)
+    policy = await mgmt_api.search_router_policy(identity_name)
+    config_type_name = f"{mode}.proxy.v1"
+    config_type = await mgmt_api.search_config_type(config_type_name)
 
     if forced and existing_identity:
         logger.info(f"Deleting existing identity '{identity_name}' ({existing_identity['id']})")
 
-        policy = await mgmt_api.search_router_policy(identity_name)
         if policy:
             await mgmt_api.delete_router_policy(policy["id"])
             logger.info(f"Deleted existing ERP '{policy['name']}' ({policy['id']})")
+            policy = None
 
         await mgmt_api.delete_identity(existing_identity["id"])
         logger.info("Deleted existing identity")
         existing_identity = None
 
+    if forced and config_type:
+        await mgmt_api.delete_config_type(config_type["id"])
+        logger.info(f"Deleted existing config type '{config_type_name}' ({config_type['id']})")
+        config_type = None
+
     if existing_identity:
         frontend_id = existing_identity["id"]
         logger.info(f"Identity '{identity_name}' ({frontend_id}) is already enrolled")
@@ -44,7 +52,6 @@ async def bootstrap_identity(
         )
         logger.info(f"Identity '{identity_name}' ({frontend_id}) successfully enrolled")
 
-    policy = await mgmt_api.search_router_policy(identity_name)
     if not policy:
         policy_id = await mgmt_api.create_router_policy(
             identity_name,
@@ -55,8 +62,6 @@ async def bootstrap_identity(
     else:
         logger.info(f"Found ERP '{policy['name']}' ({policy['id']})")
 
-    config_type_name = f"{mode}.proxy.v1"
-    config_type = await mgmt_api.search_config_type(config_type_name)
     if config_type is None:
         config_type_id = await mgmt_api.create_config_type(config_type_name, tags=tags)
         logger.info(f"Created '{config_type_name}' ({config_type_id}) config type")

{mrok-0.1.8.dist-info → mrok-0.2.0.dist-info}/METADATA

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

{mrok-0.1.8.dist-info → mrok-0.2.0.dist-info}/RECORD

@@ -31,10 +31,9 @@ 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=-GPOu7SV3kWDDzMhwvr7hK0oP8m-HWtMmtivpNUppEg,1635
+mrok/controller/app.py,sha256=_MzTu_wFRbD4kGbw4PdP5OYpl3KDlOCJFeNWxt-WM-c,1818
 mrok/controller/auth.py,sha256=Kg94W8yNMs6TvUmLRYv1QeUjDy4qlGZ-_6OHa4KH1zg,2648
 mrok/controller/pagination.py,sha256=raYpYa34q8Ckl4BXBOEdpWlKkFj6z7e6QLWr2HT7dzI,2187
-mrok/controller/routes.py,sha256=j-dLO4yLkUj-rdjnGhO2suvmR690-UdaNvokDZ7ZpF0,8670
 mrok/controller/schemas.py,sha256=zk91PIJ0zncpBgs4bhU-n-76EWlRKo87r3VVx15JxPc,1320
 mrok/controller/dependencies/__init__.py,sha256=voewk6gjkA0OarL6HFmfT_RLqBns0Fpl-VIqK5xVAEI,202
 mrok/controller/dependencies/conf.py,sha256=2Pa8fxJHkZ29q6UL-w6hUP_wr7WnNELfw5LlzWg1Tec,162
@@ -42,6 +41,9 @@ mrok/controller/dependencies/ziti.py,sha256=fYoxeJb4s6p2_3gxbExbFSRabjpvp_gZMBb3
 mrok/controller/openapi/__init__.py,sha256=U1dw45w76CcoQagyqg_FXdMuJF3qJZZM6wG8TeTe3Zo,101
 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/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
@@ -50,15 +52,15 @@ mrok/http/master.py,sha256=o_0Sxe2XuTgVAwvBbWkYcO3HkCcfvYP4rgxcuIDPwXo,2426
 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=3y8mTruJupr6k1fMKnLFmEKcHBF42VKvp5jLQ6BYLhc,16018
-mrok/ziti/bootstrap.py,sha256=pg-8tt2t2Xt-o85UZe2ixfEtX_6eDuK5gqaCbfuCD6Q,2522
+mrok/ziti/api.py,sha256=onVOSgcqALTeC3EBX-RPJvkqQ3OhhzvJ91HPsGaIJC4,16171
+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/pki.py,sha256=-V3LDAtntYZ4C6IH2rqfAANxmzpOZ32Rd0MK_27YNME,1906
 mrok/ziti/services.py,sha256=JnznLTHNZjgbFwnBtv7y2XIp4NiQxLVawwP9EfWdVuM,3208
-mrok-0.1.8.dist-info/METADATA,sha256=Ew2luIRV0rEXgMZl9DXtp0w84GGiAdaYC3zM14FjgxY,15506
-mrok-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mrok-0.1.8.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
-mrok-0.1.8.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
-mrok-0.1.8.dist-info/RECORD,,
+mrok-0.2.0.dist-info/METADATA,sha256=A2vtrbNcUnIOTYf0xU2KZubFzN_yA7wShKQuMZcnKaE,15506
+mrok-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mrok-0.2.0.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
+mrok-0.2.0.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
+mrok-0.2.0.dist-info/RECORD,,