Merge ~peter-sabaini/charm-sudo-pair:more-deconfiguration into ~sudo-pair-charmers/charm-sudo-pair:master

[Peter Sabaini]

More deconfiguration
 - Be tidier when deconfiguring sudo-pair
 - Add action to remove sudo-pair binaries and config

[Drew Freiberger (afreiberger)]

+1 lgtm

review: Approve

[Jeremy Lounder (jldev)]

review: Approve

diff --git a/actions.yaml b/actions.yaml
new file mode 100644
index 0000000..dad5090
--- /dev/null
+++ b/actions.yaml
@@ -0,0 +1,3 @@
+remove-sudopair:
+  description: Remove sudo-pair configuration and binaries
+
diff --git a/actions/actions.py b/actions/actions.py
new file mode 100755
index 0000000..7dd03d8
--- /dev/null
+++ b/actions/actions.py
@@ -0,0 +1,48 @@
+#!/usr/local/sbin/charm-env python3
+#
+# Copyright 2016,2019,2020 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+import sys
+
+from charmhelpers.core.hookenv import action_set, action_fail
+
+
+sys.path.append("lib")
+
+import libsudopair  # NOQA
+
+
+def remove():
+    """Action to remove sudo-pair config and binaries"""
+    sph = libsudopair.SudoPairHelper()
+    sph.deconfigure()
+    action_set({"message": "Successfully removed sudo-pair config and binaries"})
+
+
+# A dictionary of all the defined actions to callables (which take
+# parsed arguments).
+ACTIONS = {"remove-sudopair": remove}
+
+
+def main(args):
+    action_name = os.path.basename(args[0])
+    try:
+        ACTIONS[action_name]()
+    except Exception as e:
+        action_fail(str(e))
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
diff --git a/actions/remove-sudopair b/actions/remove-sudopair
new file mode 120000
index 0000000..ff9536b
--- /dev/null
+++ b/actions/remove-sudopair
@@ -0,0 +1 @@
+./actions.py
\ No newline at end of file
diff --git a/lib/libsudopair.py b/lib/libsudopair.py
index d3b96a7..095e9a4 100644
--- a/lib/libsudopair.py
+++ b/lib/libsudopair.py
@@ -113,7 +113,19 @@ class SudoPairHelper(object):
         return None
 
     def deconfigure(self):
-        hookenv.log("Delete {}".format(self.sudo_conf_path))
-        os.unlink(self.sudo_conf_path)
-        sudo_pair_lib = os.path.join(hookenv.charm_dir(), 'files', 'sudo_pair.so')
-        hookenv.log("Delete lib {}".format(sudo_pair_lib))
+        paths = [
+            self.sudo_conf_path,
+            self.sudo_lib_path,
+            self.binary_path,
+            self.user_prompt_path,
+            self.pair_prompt_path,
+            self.sudoers_bypass_path,
+            self.tmpfiles_conf
+        ]
+        hookenv.log("Deleting: {}".format(paths))
+        for path in paths:
+            try:
+                os.unlink(path)
+            except Exception as e:
+                # We're trying hard to delete all files, even if some might fail
+                hookenv.log("Got exception unlinking {}: {}, continuing".format(path, e))