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

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.1.9.dist-info}/METADATA

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

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

@@ -50,15 +50,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.1.9.dist-info/METADATA,sha256=C6efuUa5kHfw19OLwZVawjLZEcGXBMCH7vV3YniB9Fw,15506
+mrok-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mrok-0.1.9.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
+mrok-0.1.9.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
+mrok-0.1.9.dist-info/RECORD,,