From 9396535bba67ceecb749672f966877311c0dfbd4 Mon Sep 17 00:00:00 2001
From: Sven Seeberg <mail@sven-seeberg.de>
Date: Sat, 1 Feb 2020 21:37:50 +0100
Subject: [PATCH] Fix module

---
 src/salt_passbolt.py          | 28 ----------------------
 src/salt_passbolt/__init__.py | 45 +++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 28 deletions(-)
 delete mode 100644 src/salt_passbolt.py
 create mode 100644 src/salt_passbolt/__init__.py

diff --git a/src/salt_passbolt.py b/src/salt_passbolt.py
deleted file mode 100644
index 128fd2b..0000000
--- a/src/salt_passbolt.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Provides functions to fetch passwords from passbolt api
-"""
-import passboltapi  # pylint: disable=E0401
-
-def get_password_list(passbolt_obj, group_uuid):
-    result = list()
-    for i in passbolt_obj.get(url="/resources.json?/resources.json?filter[is-shared-with-group]={}&api-version=v2".format(group_uuid))["body"]:
-        result.append({
-            "id": i["id"],
-            "name": i["name"],
-            "username": i["username"],
-            "uri": i["uri"]
-        })
-    return result
-
-def generate_pillar(passbolt_obj, group_uuid):
-    result = get_password_list(passbolt_obj, group_uuid)
-    salt = {'passbolt': {}}
-    for i in result:
-        resource = passbolt_obj.get("/secrets/resource/{}.json?api-version=v2".format(i["id"]))
-        salt['passbolt'][i["id"]] = passbolt_obj.decrypt(resource["body"]["data"])
-    return salt
-
-def fetch_passbolt_passwords(group_uuid):
-    with passboltapi.PassboltAPI(config_path="/etc/salt/passbolt.ini") as passbolt:
-        salt = generate_pillar(passbolt_obj=passbolt, group_uuid)
-    return salt
diff --git a/src/salt_passbolt/__init__.py b/src/salt_passbolt/__init__.py
new file mode 100644
index 0000000..9929354
--- /dev/null
+++ b/src/salt_passbolt/__init__.py
@@ -0,0 +1,45 @@
+"""
+Provides functions to fetch passwords from passbolt api
+"""
+import passboltapi  # pylint: disable=E0401
+
+
+def get_password_list(passbolt_obj, group_uuid):
+    """
+    Get list of passwords for group UUID
+    """
+    result = list()
+    url = ("/resources.json?/resources.json?filter[is-shared-with-group]" +
+           "={}&api-version=v2".format(group_uuid))
+    for i in passbolt_obj.get(url)["body"]:  # pylint: disable=C0301
+        result.append({
+            "id": i["id"],
+            "name": i["name"],
+            "username": i["username"],
+            "uri": i["uri"]
+        })
+    return result
+
+
+def generate_pillar(passbolt_obj, group_uuid):
+    """
+    Generate dictionary that is added to the Pillar
+    """
+    result = get_password_list(passbolt_obj, group_uuid)
+    salt = {'passbolt': {}}
+    for i in result:
+        resource = passbolt_obj.get("/secrets/resource/{}.json?api-version=v2".
+                                    format(i["id"]))
+        salt['passbolt'][i["id"]] = passbolt_obj.decrypt(
+            resource["body"]["data"])
+    return salt
+
+
+def fetch_passbolt_passwords(group_uuid):
+    """
+    Generate Passbolt API object and call API fetch function
+    """
+    path = "/etc/salt/passbolt.ini"
+    with passboltapi.PassboltAPI(config_path=path) as passbolt:
+        salt = generate_pillar(passbolt, group_uuid)
+    return salt