feat: v0.2.4 — image delete workaround + auto-version env-var update

redeploy_project: replace broken SYNO.Docker.Image/pull with a unified 4-step delete-before-start flow for all project states (RUNNING, STOPPED, BUILD_FAILED). Reads image tags from the project's compose.yaml via FileStation before stopping, deletes each cached image (non-fatal), then starts the project so DSM auto-pulls the latest version. Polls for RUNNING as before. update_image_tag: auto-update env vars whose value equals the numeric version prefix of the old tag when the new tag shares the same <digits>-<suffix> pattern (e.g. JENKINS_VERSION=2.558 → 2.560 when tag changes 2.558-jdk21 → 2.560-jdk21). Preview mode lists the pending auto-updates. Only triggers when the var exists and the pattern matches. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-21 07:57:57 +02:00
parent ae36a9fbac
commit bafa327412
6 changed files with 522 additions and 126 deletions
@@ -1,8 +1,8 @@
 """Tests for modules/compose.py."""

-import pytest
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock

+import pytest
 import yaml


@@ -14,6 +14,7 @@ def make_mock_mcp():
            def decorator(fn):
                tools[fn.__name__] = fn
                return fn
+
            return decorator

    return MockMCP(), tools
@@ -21,6 +22,7 @@ def make_mock_mcp():

 def make_config():
    from mcp_synology_container.config import AppConfig, ConnectionConfig
+
    return AppConfig(
        schema_version=1,
        connection=ConnectionConfig(host="nas.local", port=443, https=True, verify_ssl=True),
@@ -45,14 +47,30 @@ services:
 """


+def make_compose_client(content: str, filename: str = "docker-compose.yml") -> AsyncMock:
+    """Create an AsyncMock client pre-configured for compose tests.
+
+    FileStation.List returns a single file entry so that _find_compose_path
+    can locate the compose file.  All other requests return {}.
+    download_text returns the provided content.
+    """
+    client = AsyncMock()
+
+    async def _request(api, method, **kwargs):
+        if api == "SYNO.FileStation.List":
+            return {"files": [{"name": filename}]}
+        return {}
+
+    client.request.side_effect = _request
+    client.download_text.return_value = content
+    return client
+
+
@pytest.mark.asyncio
 async def test_read_compose():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    # Simulate FileStation.Info success for the first filename
-    client.request.return_value = {}
-    client.download_text.return_value = SAMPLE_COMPOSE
+    client = make_compose_client(SAMPLE_COMPOSE)

    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)
@@ -69,6 +87,7 @@ async def test_read_compose_not_found():
    client = AsyncMock()
    # Simulate all FileStation.Info calls failing
    from mcp_synology_container.dsm_client import SynologyError
+
    client.request.side_effect = SynologyError("not found", code=408)

    mcp, tools = make_mock_mcp()
@@ -82,10 +101,7 @@ async def test_read_compose_not_found():
 async def test_update_image_tag_requires_confirmation():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    client.request.return_value = {}
-    client.download_text.return_value = SAMPLE_COMPOSE
-
+    client = make_compose_client(SAMPLE_COMPOSE)
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -100,10 +116,7 @@ async def test_update_image_tag_requires_confirmation():
 async def test_update_image_tag_confirmed():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    client.request.return_value = {}
-    client.download_text.return_value = SAMPLE_COMPOSE
-
+    client = make_compose_client(SAMPLE_COMPOSE)
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -122,10 +135,7 @@ async def test_update_image_tag_confirmed():
 async def test_update_image_tag_service_not_found():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    client.request.return_value = {}
-    client.download_text.return_value = SAMPLE_COMPOSE
-
+    client = make_compose_client(SAMPLE_COMPOSE)
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -138,10 +148,7 @@ async def test_update_image_tag_service_not_found():
 async def test_update_env_var_new_var_list_format():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    client.request.return_value = {}
-    client.download_text.return_value = SAMPLE_COMPOSE
-
+    client = make_compose_client(SAMPLE_COMPOSE)
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -158,10 +165,7 @@ async def test_update_env_var_new_var_list_format():
 async def test_update_env_var_update_existing_list():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    client.request.return_value = {}
-    client.download_text.return_value = SAMPLE_COMPOSE
-
+    client = make_compose_client(SAMPLE_COMPOSE)
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -179,10 +183,7 @@ async def test_update_env_var_update_existing_list():
 async def test_update_env_var_dict_format():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    client.request.return_value = {}
-    client.download_text.return_value = SAMPLE_COMPOSE
-
+    client = make_compose_client(SAMPLE_COMPOSE)
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -199,8 +200,8 @@ async def test_update_env_var_dict_format():
 async def test_update_compose_invalid_yaml():
    from mcp_synology_container.modules.compose import register_compose

+    # YAML validation happens before any file I/O — no compose file needed
    client = AsyncMock()
-
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -213,7 +214,6 @@ async def test_update_compose_missing_services_key():
    from mcp_synology_container.modules.compose import register_compose

    client = AsyncMock()
-
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

@@ -225,12 +225,123 @@ async def test_update_compose_missing_services_key():
 async def test_update_compose_requires_confirmation():
    from mcp_synology_container.modules.compose import register_compose

-    client = AsyncMock()
-    client.request.return_value = {}
-
+    client = make_compose_client(SAMPLE_COMPOSE)
    mcp, tools = make_mock_mcp()
    register_compose(mcp, make_config(), client)

    result = await tools["update_compose"]("myapp", SAMPLE_COMPOSE, confirmed=False)
    assert "confirmed=True" in result
    client.upload_text.assert_not_called()
+
+
+# ──────────────────────────────────────────────────────────────────────────────
+# Auto-version-update in update_image_tag
+# ──────────────────────────────────────────────────────────────────────────────
+
+SAMPLE_COMPOSE_VERSIONED = """
+services:
+  jenkins:
+    image: jenkins/jenkins:2.558-jdk21
+    environment:
+      - JENKINS_VERSION=2.558
+      - JAVA_OPTS=-Xmx512m
+"""
+
+SAMPLE_COMPOSE_VERSIONED_DICT_ENV = """
+services:
+  jenkins:
+    image: jenkins/jenkins:2.558-jdk21
+    environment:
+      JENKINS_VERSION: "2.558"
+      JAVA_OPTS: -Xmx512m
+"""
+
+
+@pytest.mark.asyncio
+async def test_update_image_tag_auto_updates_version_env_var_list():
+    """Tag 2.558-jdk21 → 2.560-jdk21 must also update JENKINS_VERSION=2.558 → 2.560."""
+    from mcp_synology_container.modules.compose import register_compose
+
+    client = make_compose_client(SAMPLE_COMPOSE_VERSIONED)
+    mcp, tools = make_mock_mcp()
+    register_compose(mcp, make_config(), client)
+
+    result = await tools["update_image_tag"]("myapp", "jenkins", "2.560-jdk21", confirmed=True)
+    assert "jenkins/jenkins:2.558-jdk21 → jenkins/jenkins:2.560-jdk21" in result
+    assert "JENKINS_VERSION=2.560" in result
+    client.upload_text.assert_called_once()
+
+    uploaded = client.upload_text.call_args[0][2]
+    parsed = yaml.safe_load(uploaded)
+    assert parsed["services"]["jenkins"]["image"] == "jenkins/jenkins:2.560-jdk21"
+    env = parsed["services"]["jenkins"]["environment"]
+    assert "JENKINS_VERSION=2.560" in env
+    assert "JENKINS_VERSION=2.558" not in env
+
+
+@pytest.mark.asyncio
+async def test_update_image_tag_auto_updates_version_env_var_dict():
+    """Dict-format env: JENKINS_VERSION value matching old prefix must be updated."""
+    from mcp_synology_container.modules.compose import register_compose
+
+    client = make_compose_client(SAMPLE_COMPOSE_VERSIONED_DICT_ENV)
+    mcp, tools = make_mock_mcp()
+    register_compose(mcp, make_config(), client)
+
+    result = await tools["update_image_tag"]("myapp", "jenkins", "2.560-jdk21", confirmed=True)
+    assert "JENKINS_VERSION=2.560" in result
+
+    uploaded = client.upload_text.call_args[0][2]
+    parsed = yaml.safe_load(uploaded)
+    assert parsed["services"]["jenkins"]["environment"]["JENKINS_VERSION"] == "2.560"
+
+
+@pytest.mark.asyncio
+async def test_update_image_tag_no_auto_update_without_version_suffix():
+    """Tag without numeric-prefix pattern (e.g. 'latest') must not touch env vars."""
+    from mcp_synology_container.modules.compose import register_compose
+
+    client = make_compose_client(SAMPLE_COMPOSE_VERSIONED)
+    mcp, tools = make_mock_mcp()
+    register_compose(mcp, make_config(), client)
+
+    result = await tools["update_image_tag"]("myapp", "jenkins", "latest", confirmed=True)
+    assert "jenkins/jenkins:2.558-jdk21 → jenkins/jenkins:latest" in result
+    # No auto-update mention expected
+    assert "Auto-updated" not in result
+
+    uploaded = client.upload_text.call_args[0][2]
+    parsed = yaml.safe_load(uploaded)
+    env = parsed["services"]["jenkins"]["environment"]
+    # JENKINS_VERSION must be unchanged
+    assert "JENKINS_VERSION=2.558" in env
+
+
+@pytest.mark.asyncio
+async def test_update_image_tag_preview_shows_auto_update():
+    """Unconfirmed call must preview auto-update of matching env vars."""
+    from mcp_synology_container.modules.compose import register_compose
+
+    client = make_compose_client(SAMPLE_COMPOSE_VERSIONED)
+    mcp, tools = make_mock_mcp()
+    register_compose(mcp, make_config(), client)
+
+    result = await tools["update_image_tag"]("myapp", "jenkins", "2.560-jdk21", confirmed=False)
+    assert "confirmed=True" in result
+    assert "JENKINS_VERSION" in result
+    assert "2.558" in result
+    assert "2.560" in result
+    client.upload_text.assert_not_called()
+
+
+def test_extract_version_prefix():
+    """Unit tests for _extract_version_prefix helper."""
+    from mcp_synology_container.modules.compose import _extract_version_prefix
+
+    assert _extract_version_prefix("2.558-jdk21") == "2.558"
+    assert _extract_version_prefix("1.2.3-alpine") == "1.2.3"
+    assert _extract_version_prefix("2-slim") == "2"
+    assert _extract_version_prefix("latest") is None
+    assert _extract_version_prefix("1.24") is None  # no suffix
+    assert _extract_version_prefix("") is None
+    assert _extract_version_prefix("v2.0-rc1") is None  # starts with 'v'