fix mode set to int octal instead of octal notation

Author: nicholasmhughes

CHANGELOG.md

@@ -4,6 +4,15 @@ This project uses [Semantic Versioning](https://semver.org/) - MAJOR.MINOR.PATCH
 
 # Changelog
 
+Saltext.Prometheus 2.0.2 (2023-03-13)
+=====================================
+
+Fixed
+-----
+
+- Fix mode set to int octal instead of octal notation (#21)
+
+
 Saltext.Prometheus 2.0.1 (2023-03-12)
 =====================================
 

src/saltext/prometheus/returners/prometheus_textfile.py

@@ -426,7 +426,6 @@ def returner(ret):
         salt.modules.file.chown(opts["filename"], opts["uid"], opts["gid"])
         if opts["mode"]:
             try:
-                opts["mode"] = int(opts["mode"], base=8)
                 salt.modules.file.set_mode(opts["filename"], opts["mode"])
             except ValueError:
                 opts["mode"] = None

src/saltext/prometheus/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=missing-module-docstring
-__version__ = "2.0.1"
+__version__ = "2.0.2"

tests/unit/returners/test_prometheus_textfile_return.py

@@ -8,6 +8,7 @@
 import salt.version
 import saltext.prometheus.returners.prometheus_textfile as prometheus_textfile
 
+from tests.support.mock import MagicMock
 from tests.support.mock import patch
 
 
@@ -571,3 +572,13 @@ def test_requisite_handling(patch_dunders, cache_dir, minion):
     prometheus_textfile.returner(job_ret)
 
     assert Path(os.path.join(cache_dir, "prometheus_textfile", "salt.prom")).exists()
+
+
+def test_mode_passed_to_set_mode(patch_dunders, cache_dir, job_ret, minion):
+    mock_set_mode = MagicMock(return_value=True)
+    prometheus_textfile.__opts__.update({"mode": "0644"})
+    with patch("salt.modules.file.set_mode", mock_set_mode):
+        prometheus_textfile.returner(job_ret)
+    mock_set_mode.assert_called_with(
+        os.path.join(cache_dir, "prometheus_textfile", "salt.prom"), "0644"
+    )