Merge pull request #15 from cbusillo/code/2026-04-27-local-typed-odoo-settings

Generate typed local Odoo settings payloads

Author: shiny-code-bot

docs/tooling/workspace-cli.md

@@ -180,6 +180,14 @@ Notes
 - Local `platform runtime up` emits manifest-backed host addon mount
   paths for compose, so tenant checkouts can bind-mount `sources/tenant/addons`
   plus `sources/shared-addons` into the devkit-owned local runtime bundle.
+- Local runtime selection converts legacy setting-shaped inputs such as
+  `ENV_OVERRIDE_CONFIG_PARAM__*`, `ENV_OVERRIDE_AUTHENTIK__*`, and
+  `ENV_OVERRIDE_SHOPIFY__*` into the typed
+  `ODOO_INSTANCE_OVERRIDES_PAYLOAD_B64` payload consumed by
+  `launchplane_settings`. The generated runtime env no longer emits those
+  legacy setting keys, while unrelated devkit control keys such as
+  `ENV_OVERRIDE_DISABLE_CRON` remain available until they get their own typed
+  local contract.
 - When `ODOO_CONTROL_PLANE_ROOT` points at a valid `launchplane`
   checkout, local runtime env resolution comes from the control-plane-owned
   environment contract. Devkit-local `.env` / `platform/secrets.toml` runtime

odoo_devkit/local_runtime.py

@@ -31,6 +31,15 @@
 GIT_SHA_PATTERN = re.compile(r"[0-9a-fA-F]{7,40}")
 ARTIFACT_SOURCE_ENV_KEYS = ("ODOO_ADDON_REPOSITORIES", "OPENUPGRADE_ADDON_REPOSITORY")
 RUNTIME_ENVIRONMENT_PAYLOAD_ENV_VAR = "ODOO_DEVKIT_RUNTIME_ENVIRONMENT_JSON"
+ODOO_INSTANCE_OVERRIDES_PAYLOAD_ENV_KEY = "ODOO_INSTANCE_OVERRIDES_PAYLOAD_B64"
+LEGACY_CONFIG_PARAM_PREFIX = "ENV_OVERRIDE_CONFIG_PARAM__"
+LEGACY_AUTHENTIK_PREFIX = "ENV_OVERRIDE_AUTHENTIK__"
+LEGACY_SHOPIFY_PREFIX = "ENV_OVERRIDE_SHOPIFY__"
+LEGACY_SETTING_OVERRIDE_PREFIXES = (
+    LEGACY_CONFIG_PARAM_PREFIX,
+    LEGACY_AUTHENTIK_PREFIX,
+    LEGACY_SHOPIFY_PREFIX,
+)
 
 PLATFORM_RUNTIME_ENV_KEYS = (
     "PLATFORM_CONTEXT",
@@ -1545,9 +1554,93 @@ def build_runtime_env_values(
             runtime_values[environment_key] = source_environment[environment_key]
     for runtime_key, runtime_value in runtime_selection.effective_runtime_env.items():
         runtime_values[runtime_key] = runtime_value
+    apply_typed_odoo_instance_override_payload(
+        runtime_values=runtime_values,
+        context_name=runtime_selection.context_name,
+        instance_name=runtime_selection.instance_name,
+    )
     return runtime_values
 
 
+def apply_typed_odoo_instance_override_payload(
+    *,
+    runtime_values: dict[str, str],
+    context_name: str,
+    instance_name: str,
+) -> None:
+    payload = build_typed_odoo_instance_override_payload(
+        runtime_values=runtime_values,
+        context_name=context_name,
+        instance_name=instance_name,
+    )
+    if payload is None:
+        return
+    if runtime_values.get(ODOO_INSTANCE_OVERRIDES_PAYLOAD_ENV_KEY, "").strip():
+        raise RuntimeCommandError(
+            f"{ODOO_INSTANCE_OVERRIDES_PAYLOAD_ENV_KEY} cannot be combined with legacy ENV_OVERRIDE_* setting inputs."
+        )
+    encoded_payload = json.dumps(payload, separators=(",", ":"), sort_keys=True).encode("utf-8")
+    runtime_values[ODOO_INSTANCE_OVERRIDES_PAYLOAD_ENV_KEY] = base64.b64encode(encoded_payload).decode("ascii")
+    for runtime_key in tuple(runtime_values):
+        if runtime_key.startswith(LEGACY_SETTING_OVERRIDE_PREFIXES):
+            runtime_values.pop(runtime_key, None)
+
+
+def build_typed_odoo_instance_override_payload(
+    *,
+    runtime_values: dict[str, str],
+    context_name: str,
+    instance_name: str,
+) -> dict[str, object] | None:
+    config_parameters: list[dict[str, object]] = []
+    addon_settings: list[dict[str, object]] = []
+    for runtime_key in sorted(runtime_values):
+        runtime_value = runtime_values[runtime_key]
+        if runtime_key.startswith(LEGACY_CONFIG_PARAM_PREFIX):
+            suffix = runtime_key[len(LEGACY_CONFIG_PARAM_PREFIX) :].strip().lower()
+            if not suffix:
+                continue
+            config_parameters.append(
+                {
+                    "key": suffix.replace("__", "."),
+                    "value": {"source": "literal", "value": runtime_value},
+                }
+            )
+            continue
+        if runtime_key.startswith(LEGACY_AUTHENTIK_PREFIX):
+            suffix = runtime_key[len(LEGACY_AUTHENTIK_PREFIX) :].strip().lower()
+            if not suffix:
+                continue
+            addon_settings.append(
+                {
+                    "addon": "authentik_sso",
+                    "setting": suffix,
+                    "value": {"source": "literal", "value": runtime_value},
+                }
+            )
+            continue
+        if runtime_key.startswith(LEGACY_SHOPIFY_PREFIX):
+            suffix = runtime_key[len(LEGACY_SHOPIFY_PREFIX) :].strip().lower()
+            if not suffix:
+                continue
+            addon_settings.append(
+                {
+                    "addon": "shopify",
+                    "setting": suffix,
+                    "value": {"source": "literal", "value": runtime_value},
+                }
+            )
+    if not config_parameters and not addon_settings:
+        return None
+    return {
+        "schema_version": 1,
+        "context": context_name,
+        "instance": instance_name,
+        "config_parameters": config_parameters,
+        "addon_settings": addon_settings,
+    }
+
+
 def apply_publish_artifact_input_manifest(
     *,
     runtime_context: RuntimeContext,

platform/stack.toml

@@ -99,7 +99,6 @@ install_modules_add = [
 database = "opw"
 install_modules = [
     "opw_custom",
-    "environment_overrides",
 ]
 
 [contexts.opw.runtime_env]

tests/test_runtime.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import base64
 import contextlib
 import io
 import json
@@ -108,6 +109,68 @@ def test_resolve_runtime_repo_path_prefers_explicit_repo(self) -> None:
 
             self.assertEqual(resolve_runtime_repo_path(manifest), runtime_repo_path.resolve())
 
+    def test_typed_odoo_instance_override_payload_from_legacy_setting_env(self) -> None:
+        runtime_values = {
+            "ENV_OVERRIDE_CONFIG_PARAM__WEB__BASE__URL": "https://opw-local.example.com",
+            "ENV_OVERRIDE_AUTHENTIK__BASE_URL": "https://authentik.example.com",
+            "ENV_OVERRIDE_SHOPIFY__TEST_STORE": "true",
+            "ENV_OVERRIDE_DISABLE_CRON": "1",
+        }
+
+        local_runtime.apply_typed_odoo_instance_override_payload(
+            runtime_values=runtime_values,
+            context_name="opw",
+            instance_name="local",
+        )
+
+        encoded_payload = runtime_values[local_runtime.ODOO_INSTANCE_OVERRIDES_PAYLOAD_ENV_KEY]
+        payload = json.loads(base64.b64decode(encoded_payload).decode("utf-8"))
+
+        self.assertEqual(payload["context"], "opw")
+        self.assertEqual(payload["instance"], "local")
+        self.assertEqual(
+            payload["config_parameters"],
+            [
+                {
+                    "key": "web.base.url",
+                    "value": {"source": "literal", "value": "https://opw-local.example.com"},
+                }
+            ],
+        )
+        self.assertIn(
+            {
+                "addon": "authentik_sso",
+                "setting": "base_url",
+                "value": {"source": "literal", "value": "https://authentik.example.com"},
+            },
+            payload["addon_settings"],
+        )
+        self.assertIn(
+            {
+                "addon": "shopify",
+                "setting": "test_store",
+                "value": {"source": "literal", "value": "true"},
+            },
+            payload["addon_settings"],
+        )
+        self.assertNotIn("ENV_OVERRIDE_CONFIG_PARAM__WEB__BASE__URL", runtime_values)
+        self.assertNotIn("ENV_OVERRIDE_AUTHENTIK__BASE_URL", runtime_values)
+        self.assertNotIn("ENV_OVERRIDE_SHOPIFY__TEST_STORE", runtime_values)
+        self.assertEqual(runtime_values["ENV_OVERRIDE_DISABLE_CRON"], "1")
+
+    def test_typed_odoo_instance_override_payload_rejects_mixed_authority(self) -> None:
+        runtime_values = {
+            local_runtime.ODOO_INSTANCE_OVERRIDES_PAYLOAD_ENV_KEY: "already-set",
+            "ENV_OVERRIDE_CONFIG_PARAM__WEB__BASE__URL": "https://opw-local.example.com",
+        }
+
+        with self.assertRaisesRegex(local_runtime.RuntimeCommandError, "cannot be combined"):
+            local_runtime.apply_typed_odoo_instance_override_payload(
+                runtime_values=runtime_values,
+                context_name="opw",
+                instance_name="local",
+            )
+
     def test_resolve_runtime_repo_path_requires_workspace_sync_for_repo_addressable_runtime(self) -> None:
         with tempfile.TemporaryDirectory() as temporary_directory:
             temp_root = Path(temporary_directory)