Merge ~peter-sabaini/charm-hw-health:fix-removing-sudoer into ~nagios-charmers/charm-hw-health:master

[Peter Sabaini]

Fix file not found upon removal

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Alvaro Uria (aluria)]

lgtm

review: Approve

[Jeremy Lounder (jldev)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 81841995fee9aa2fc2fbde8471fae717bc4dda9c

diff --git a/src/lib/hwhealth/tools.py b/src/lib/hwhealth/tools.py
index fd6692d..0bf0121 100644
--- a/src/lib/hwhealth/tools.py
+++ b/src/lib/hwhealth/tools.py
@@ -9,6 +9,7 @@ import shlex
 import shutil
 import subprocess
 
+from pathlib import Path
 from zipfile import ZipFile, BadZipFile
 from tempfile import TemporaryDirectory
 
@@ -209,9 +210,11 @@ class Tool():
         )
 
     def _remove_sudoer(self):
-        sudoer_path = os.path.join(self.SUDOERS_DIR, self._sudoer_file)
-        os.remove(sudoer_path)
-        hookenv.log('deleted sudoer file'.format(sudoer_path), hookenv.DEBUG)
+        sudoer_path = Path(self.SUDOERS_DIR) / self._sudoer_file
+        if not sudoer_path.exists():
+            return
+        sudoer_path.unlink()
+        hookenv.log('deleted sudoer file: {}'.format(sudoer_path), hookenv.DEBUG)
 
 
 class VendorTool(Tool):
@@ -283,8 +286,10 @@ class VendorTool(Tool):
                                         'error': error})
 
     def _remove_binary(self):
-        binary_path = os.path.join(self.TOOLS_DIR, self._shortname)
-        os.remove(binary_path)
+        binary_path = Path(self.TOOLS_DIR) / self._shortname
+        if not binary_path.exists():
+            return
+        binary_path.unlink()
         hookenv.log(
             'Removed binary tool {}'.format(binary_path),
             hookenv.DEBUG