Improve code to run checks

The tests now are green. I just changed it to return the contents of the yaml file.

In the test no path has to be passed. This is already done in the configloader. Can I remove this from the test @bkircher ?

Author: Jonathan Lutterbeck

examples/configloader.py

@@ -26,7 +26,7 @@ def which_path():
         if not os.path.exists(path):
             os.makedirs(path)
     else:
-        "Operating System not supported"
+        print("Operating System not supported")
 
     return path
 
@@ -35,45 +35,18 @@ def create_config(path):
     shutil.copyfile(f"{cwd}/config.yaml", path)
     print(f"New config file created, edit config file at: {path}")
 
-def load_config(projectname, goal, path):
-    with open(f"{path}", 'r') as stream:
-        try:
-            data = yaml.safe_load(stream)
-
-            for value in data.values():
-                for x in range(len(value)):
-                    result = value[x]
-                    #returns userID and token for the selected project
-                    if (result.get("name") == projectname):
-                        userid = result.get("userId")
-                        token = result.get("token")
-        except yaml.YAMLError as exc:
-            print(exc)
-
-    if(goal == "id"):
-        return userid
-    elif(goal == "token"):
-        return token
-
-def load_token(project):
+def load_config(path):
     syspath = which_path() + "/config.yaml"
-    goal = "token"
 
-    # check if config file exists
     if not os.path.exists(syspath):
         create_config(syspath)
-        return load_config(project, goal, syspath)
-    else:
-        return load_config(project, goal, syspath)
-
 
-def load_userid(project):
-    syspath = which_path() + "/config.yaml"
-    goal = "id"
+    with open(f"{syspath}", 'r') as stream:
+        try:
+            data = yaml.safe_load(stream)
+            #return list of dictionaries for all projects
+            for value in data.values():
+                return(value)
 
-    # check if config file exists
-    if not os.path.exists(syspath):
-        create_config(syspath)
-        return load_config(project, goal, syspath)
-    else:
-        return load_config(project, goal, syspath)
+        except yaml.YAMLError as exc:
+            print(exc)

examples/examples.py

@@ -2,13 +2,15 @@
 
 from pprint import pprint
 from uuid import uuid4
+import os
 from index_by.key import index_by_key
-from configloader import load_token, load_userid
+from configloader import load_config
 
 from gs_api_client import SyncGridscaleApiClient, GridscaleApiClient, models
 from gs_api_client import Configuration
 
 
+CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 if __name__ == '__main__':
 
@@ -19,9 +21,10 @@
     api_config.host = 'https://api.gridscale.io'
 
     #TODO: Change project
-    project = "default"
-    api_config.api_key['X-Auth-Token'] = load_token(project)
-    api_config.api_key['X-Auth-UserId'] = load_userid(project)
+    example_config = os.path.join(CURRENT_DIR, "config.yaml")
+    configfile = load_config(example_config)
+    api_config.api_key['X-Auth-Token'] = configfile[0].get("token")
+    api_config.api_key['X-Auth-UserId'] = configfile[0].get("userId")
     api_config.debug = True
 
     print('-' * 80)