Merge pull request #64 from HuseinA/master

Add: debug mode & ACL info in list bucket

Author: efenfauzi

obs/api/app/controllers/api/admin.py

@@ -13,14 +13,21 @@ def get_client():
     return client.admin_client()
 
 
+def init_parser():
+    parser = reqparse.RequestParser()
+    parser.add_argument("userId", type=str, required=True)
+    parser.add_argument("groupId", type=str, required=True)
+    parser.add_argument("debug", type=inputs.boolean, default=False)
+    return parser
+
+
 class user_api(Resource):
     def get(self):
-        parser = reqparse.RequestParser()
+        parser = init_parser().copy()
         parser.add_argument("user_type", type=str, default="all")
         parser.add_argument("user_status", type=str, default="active")
         parser.add_argument("limit", type=str, default="")
-        parser.add_argument("userId", type=str)
-        parser.add_argument("groupId", type=str, required=True)
+        parser.replace_argument("userId", type=str, required=False)
         args = parser.parse_args()
 
         try:
@@ -49,7 +56,7 @@ def get(self):
 
             return response(200, data=user_list)
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
     def post(self):
@@ -79,6 +86,7 @@ def post(self):
             else:
                 parser.add_argument(index, type=str)
         parser.add_argument("quotaLimit", type=int)
+        parser.add_argument("debug", type=inputs.boolean, default=False)
         args = parser.parse_args()
 
         try:
@@ -97,13 +105,11 @@ def post(self):
             else:
                 return response(201, f"User {options['userId']} created successfully.")
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
     def put(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
+        parser = init_parser().copy()
         parser.add_argument("suspend", type=inputs.boolean, required=True)
         args = parser.parse_args()
 
@@ -129,14 +135,11 @@ def put(self):
             message = f"User has been {msg}"
             return response(200, message)
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             response(500, f"{e}")
 
     def delete(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
-        args = parser.parse_args()
+        args = init_parser().parse_args()
 
         try:
             status = user.remove(get_client(), args["userId"], args["groupId"])
@@ -146,16 +149,13 @@ def delete(self):
 
             return response(200, f"User {args['userId']} deleted successfully.")
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
 
 class qos_api(Resource):
     def get(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
-        args = parser.parse_args()
+        args = init_parser().parse_args()
 
         try:
             infos = qos.info(get_client(), args["userId"], args["groupId"])
@@ -171,13 +171,11 @@ def get(self):
 
             return response(200, data=infos)
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
     def post(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
+        parser = init_parser().copy()
         parser.add_argument("limit", type=int, required=True)
         args = parser.parse_args()
 
@@ -193,14 +191,11 @@ def post(self):
                 201, f"User {args['userId']} quota changed successfully.", status
             )
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
     def delete(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
-        args = parser.parse_args()
+        args = init_parser().parse_args()
 
         try:
             status = qos.rm(get_client(), args["userId"], args["groupId"])
@@ -212,16 +207,13 @@ def delete(self):
                 200, f"User {args['userId']} quota changed to unlimited.", status
             )
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
 
 class cred_api(Resource):
     def get(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
-        args = parser.parse_args()
+        args = init_parser().parse_args()
 
         try:
             cred_list = credential.list(get_client(), args["userId"], args["groupId"])
@@ -231,14 +223,11 @@ def get(self):
 
             return response(200, data=cred_list)
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
     def post(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
-        args = parser.parse_args()
+        args = init_parser().parse_args()
 
         try:
             status = credential.create(get_client(), args["userId"], args["groupId"])
@@ -250,13 +239,14 @@ def post(self):
                 201, f"User {args['userId']} new credential created successfully."
             )
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
     def put(self):
         parser = reqparse.RequestParser()
         parser.add_argument("access_key", type=str, required=True)
         parser.add_argument("status", type=str, required=True, default="true")
+        parser.add_argument("debug", type=inputs.boolean, default=False)
         args = parser.parse_args()
 
         try:
@@ -268,12 +258,13 @@ def put(self):
 
             return response(200, f"Credential status has been {stats}.")
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
     def delete(self):
         parser = reqparse.RequestParser()
         parser.add_argument("access_key", type=str, required=True)
+        parser.add_argument("debug", type=inputs.boolean, default=False)
         args = parser.parse_args()
 
         try:
@@ -286,16 +277,13 @@ def delete(self):
                 200, f"Access key {args['access_key']} deleted successfully."
             )
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")
 
 
 class user_usage(Resource):
     def get(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("userId", type=str, required=True)
-        parser.add_argument("groupId", type=str, required=True)
-        args = parser.parse_args()
+        args = init_parser().parse_args()
 
         try:
             status = admin_usage.usage(get_client(), args["userId"], args["groupId"])
@@ -305,5 +293,5 @@ def get(self):
 
             return response(200, data=status[0])
         except Exception as e:
-            current_app.logger.error(f"{e}")
+            current_app.logger.error(f"{e}", exc_info=args["debug"])
             return response(500, f"{e}")