Address review comments

charmed-kubernetes · Sep 4, 2024 · 70cdf49 · 70cdf49
1 parent 8248550
commit 70cdf49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -258,7 +258,8 @@ def configure_ceph_cli(self) -> None:
 
     def ceph_cli(self, *args: str, timeout: int = 60) -> str:
         """Run Ceph CLI command"""
-        cmd = ["/usr/bin/ceph", "--conf", str(ceph_config_file()), "--user", self.app.name, *args]
+        conf = ceph_config_file().absolute().as_posix()
+        cmd = ["/usr/bin/ceph", "--conf", conf, "--user", self.app.name, *args]
         return subprocess.check_output(cmd, timeout=timeout).decode("UTF-8")
 
     @lru_cache(maxsize=None)

diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
@@ -127,12 +127,12 @@ def test_ceph_context_getter(check_output, harness, ceph_conf_directory):
     }
 
     assert harness.charm.ceph_context == expected_context
-    conf_file = str(ceph_conf_directory() / "ceph.conf")
+    conf = (ceph_conf_directory() / "ceph.conf").absolute().as_posix()
     check_output.assert_any_call(
-        ["/usr/bin/ceph", "--conf", conf_file, "--user", "ceph-csi", "fsid"], timeout=60
+        ["/usr/bin/ceph", "--conf", conf, "--user", "ceph-csi", "fsid"], timeout=60
     )
     check_output.assert_any_call(
-        ["/usr/bin/ceph", "--conf", conf_file, "--user", "ceph-csi", "fs", "ls", "-f", "json"],
+        ["/usr/bin/ceph", "--conf", conf, "--user", "ceph-csi", "fs", "ls", "-f", "json"],
         timeout=60,
     )