mrok 0.1.8__tar.gz → 0.1.9__tar.gz

{mrok-0.1.8 → mrok-0.1.9}/.github/workflows/pr-build-merge.yaml

@@ -38,7 +38,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install the project dependancies
+      - name: Install the project dependencies
         run: uv sync --all-extras --dev
 
       - name: Run formatting checks
@@ -77,7 +77,7 @@ jobs:
         with:
           python-version-file: ".python-version"
 
-      - name: Install the project dependancies
+      - name: Install the project dependencies
         run: uv sync --all-extras --dev
 
       - name: Run tests

{mrok-0.1.8 → mrok-0.1.9}/PKG-INFO

@@ -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 → mrok-0.1.9}/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-0.1.8 → mrok-0.1.9}/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 → mrok-0.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mrok"
-version = "0.1.8"
+version = "0.1.9"
 description = "MPT Extensions OpenZiti Orchestrator"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [

{mrok-0.1.8 → mrok-0.1.9}/tests/ziti/test_api.py

@@ -236,6 +236,7 @@ async def test_search_methods(
     ("method_name", "endpoint"),
     [
         ("delete_config", "/configs"),
+        ("delete_config_type", "/config-types"),
         ("delete_service_policy", "/service-policies"),
         ("delete_service_router_policy", "/service-edge-router-policies"),
         ("delete_router_policy", "/edge-router-policies"),

{mrok-0.1.8 → mrok-0.1.9}/tests/ziti/test_bootstrap.py

@@ -140,3 +140,43 @@ async def test_bootstrap_identity_already_bootstrapped(
 
     assert identity_id == "identity-id"
     assert identity_json is None
+
+
+@pytest.mark.asyncio
+async def test_bootstrap_identity_with_forced_and_config_type(
+    mocker: MockerFixture,
+    settings_factory: SettingsFactory,
+):
+    settings = settings_factory()
+    mocked_mgmt_api = mocker.AsyncMock()
+
+    mocked_mgmt_api.search_identity.return_value = {"id": "old-proxy-identity-id"}
+    mocked_mgmt_api.search_router_policy.side_effect = [
+        {"id": "old-router-policy-id", "name": "policy"},
+        None,
+    ]
+    mocked_mgmt_api.search_config_type.return_value = {"id": "old-config-type-id"}
+    mocked_mgmt_api.delete_router_policy.return_value = None
+    mocked_mgmt_api.delete_identity.return_value = None
+    mocked_mgmt_api.delete_config_type.return_value = None
+
+    mocker.patch(
+        "mrok.ziti.bootstrap.enroll_proxy_identity",
+        new_callable=mocker.AsyncMock,
+        return_value=("new-identity-id", {"id": "key, cert and ca", "ztAPI": "https://ziti.api"}),
+    )
+
+    mocked_mgmt_api.create_router_policy.return_value = "new-policy-id"
+    mocked_mgmt_api.create_config_type.return_value = "config-type-id"
+
+    identity_id, identity_json = await bootstrap_identity(
+        mocked_mgmt_api,
+        mocker.AsyncMock(),
+        settings.proxy.identity,
+        settings.proxy.mode,
+        True,
+        {},
+    )
+
+    assert identity_id == "new-identity-id"
+    assert identity_json == {"id": "key, cert and ca", "ztAPI": "https://ziti.api"}