[MISC] Split topology script (#853)

canonical · Feb 11, 2025 · 297d181 · 297d181
1 parent 6b3c868
commit 297d181
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -86,6 +86,7 @@ parts:
     source: .
     stage:
       - LICENSE
+      - scripts
       - templates
   libpq:
     build-packages:

diff --git a/scripts/__init__.py b/scripts/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2025 Canonical Ltd.
+# See LICENSE file for licensing details.
+
+"""Charm script utilities."""
diff --git a/src/rotate_logs.py → scripts/rotate_logs.py b/src/rotate_logs.py → 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
@@ -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(),

diff --git 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():

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,7 @@ parts: @@
         source: .
         stage:
           - LICENSE
+          - scripts
           - templates
       libpq:
         build-packages:
@@ Expand Down @@