Issue/6549 add missing migration script

changelogs/unreleased/6549-add-missing-migration-script.yml

@@ -0,0 +1,4 @@
+description: Add missing migration script.
+issue-nr: 6549
+change-type: patch
+destination-branches: [master, iso6]

src/inmanta/data/__init__.py

@@ -2816,7 +2816,6 @@ async def set(
                 RETURNING settings
         """
         values = [allow_override, self._get_value(key), self._get_value([key]), self._get_value(value)] + values
-
         new_value = await self._fetchval(query, *values, connection=connection)
         new_value_parsed = cast(
             Dict[str, m.EnvSettingType], self.get_field_metadata()["settings"].from_db(name="settings", value=new_value)

src/inmanta/data/model.py

@@ -25,6 +25,7 @@
 import pydantic.schema
 from pydantic import Extra, root_validator, validator
 from pydantic.fields import ModelField
+from pydantic.types import StrictFloat, StrictInt, StrictStr
 
 import inmanta
 import inmanta.ast.export as ast_export
@@ -234,7 +235,7 @@ def check_serializable(cls, v: Optional[Any]) -> Optional[Any]:
         return v
 
 
-EnvSettingType = Union[StrictNonIntBool, int, float, str, Dict[str, Union[str, int, StrictNonIntBool]]]
+EnvSettingType = Union[StrictNonIntBool, StrictInt, StrictFloat, StrictStr, Dict[str, Union[str, int, StrictNonIntBool]]]
 
 
 class Environment(BaseModel):

src/inmanta/db/versions/v202310090.py

@@ -0,0 +1,37 @@
+"""
+    Copyright 2023 Inmanta
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Contact: code@inmanta.com
+"""
+from asyncpg import Connection
+
+from inmanta import data
+
+
+def convert_setting_to_str(setting: str) -> str:
+    # The ->> operator gets the JSON object field as text
+    return f"""
+    UPDATE environment
+    SET settings=jsonb_set(settings, '{{{setting}}}'::TEXT[], to_jsonb(settings->>'{setting}'), FALSE)
+    WHERE settings ? '{setting}'
+    """
+
+
+async def update(connection: Connection) -> None:
+    """
+    Update the type of the autostart_agent_repair_interval and autostart_agent_deploy_interval from int to str
+    """
+    await connection.execute(convert_setting_to_str(data.AUTOSTART_AGENT_REPAIR_INTERVAL))
+    await connection.execute(convert_setting_to_str(data.AUTOSTART_AGENT_DEPLOY_INTERVAL))

tests/db/migration_tests/dump_tool.py

@@ -67,9 +67,9 @@ async def test_dump_db(server, client, postgres_db, database_name):
     shutil.copytree(project_source, project_dir)
 
     check_result(await client.set_setting(env_id_1, "autostart_agent_deploy_splay_time", 0))
-    check_result(await client.set_setting(env_id_1, "autostart_agent_deploy_interval", 0))
+    check_result(await client.set_setting(env_id_1, "autostart_agent_deploy_interval", "0"))
     check_result(await client.set_setting(env_id_1, "autostart_agent_repair_splay_time", 0))
-    check_result(await client.set_setting(env_id_1, "autostart_agent_repair_interval", 600))
+    check_result(await client.set_setting(env_id_1, "autostart_agent_repair_interval", "600"))
     check_result(await client.set_setting(env_id_1, "auto_deploy", False))
 
     await client.notify_change(id=env_id_1)