From 19e561ebd1c9eff5bad2c6bfa661addab0326760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinclert=20P=C3=A9rez?= Date: Mon, 10 Feb 2025 15:58:40 +0100 Subject: [PATCH 1/5] Create new root scripts folder --- scripts/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 scripts/__init__.py diff --git a/scripts/__init__.py b/scripts/__init__.py new file mode 100644 index 0000000000..e1b55ab3b2 --- /dev/null +++ b/scripts/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2025 Canonical Ltd. +# See LICENSE file for licensing details. + +"""Charm script utilities.""" From 6305cc2eec4d57837caecc258f60a7765c261c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinclert=20P=C3=A9rez?= Date: Mon, 10 Feb 2025 15:58:54 +0100 Subject: [PATCH 2/5] Move rotate-logs script into new folder --- {src => scripts}/rotate_logs.py | 2 +- src/backups.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename {src => scripts}/rotate_logs.py (93%) diff --git a/src/rotate_logs.py b/scripts/rotate_logs.py similarity index 93% rename from src/rotate_logs.py rename to scripts/rotate_logs.py index b19e935573..cb6a3f441b 100644 --- a/src/rotate_logs.py +++ b/scripts/rotate_logs.py @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Service for rotating logs.""" diff --git a/src/backups.py b/src/backups.py index 1324b50791..c798e930be 100644 --- a/src/backups.py +++ b/src/backups.py @@ -1205,7 +1205,7 @@ def _render_pgbackrest_conf_file(self) -> bool: with open("templates/pgbackrest.logrotate.j2") as file: template = Template(file.read()) self.container.push(PGBACKREST_LOGROTATE_FILE, template.render()) - with open("src/rotate_logs.py") as f: + with open("scripts/rotate_logs.py") as f: self.container.push( "/home/postgres/rotate_logs.py", f.read(), From cd4c1ff99c89f79333888961f6d910fceb0abaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinclert=20P=C3=A9rez?= Date: Mon, 10 Feb 2025 16:02:10 +0100 Subject: [PATCH 3/5] Update rotate-logs script tests --- tests/unit/test_rotate_logs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test_rotate_logs.py b/tests/unit/test_rotate_logs.py index c5f66f1fce..8b579e8e21 100644 --- a/tests/unit/test_rotate_logs.py +++ b/tests/unit/test_rotate_logs.py @@ -3,7 +3,7 @@ import contextlib from unittest.mock import call, patch -from rotate_logs import main +from scripts.rotate_logs import main def test_main(): From ebdaf741958380390e0b53f4ba9dacf65444a4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinclert=20P=C3=A9rez?= Date: Mon, 10 Feb 2025 15:59:07 +0100 Subject: [PATCH 4/5] Update charmcraft.yaml --- charmcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charmcraft.yaml b/charmcraft.yaml index 75f1fb50f9..87a3f72d53 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -86,6 +86,7 @@ parts: source: . stage: - LICENSE + - scripts - templates libpq: build-packages: From 2b8e10ca3ae5e784bbcbebcd9d7d0d8744fd8218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinclert=20P=C3=A9rez?= Date: Mon, 10 Feb 2025 15:59:14 +0100 Subject: [PATCH 5/5] Update tox.ini --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f61bf9cf28..f842fe1afe 100644 --- a/tox.ini +++ b/tox.ini @@ -7,9 +7,10 @@ env_list = lint, unit [vars] src_path = "{tox_root}/src" +scripts_path = "{tox_root}/scripts" tests_path = "{tox_root}/tests" lib_path = "{tox_root}/lib/charms/postgresql_k8s" -all_path = {[vars]src_path} {[vars]tests_path} {[vars]lib_path} +all_path = {[vars]src_path} {[vars]scripts_path} {[vars]tests_path} {[vars]lib_path} [testenv] set_env = @@ -48,7 +49,7 @@ set_env = commands_pre = poetry install --only main,charm-libs,unit --no-root commands = - poetry run coverage run --source={[vars]src_path} \ + poetry run coverage run --source={[vars]src_path},{[vars]scripts_path} \ -m pytest -v --tb native -s {posargs} {[vars]tests_path}/unit poetry run coverage report poetry run coverage xml