Merge pull request #52 from d4rkstar/main

chore(operator): content-type json

Author: sciabarracom

actions/common/util.py

@@ -16,7 +16,7 @@
 # under the License.
 #
 
-import mimetypes
+import json
 
 def get_env_value(user_data, key):
     """
@@ -32,4 +32,15 @@ def get_env_value(user_data, key):
         if env['key'] == key:
             return env['value']
 
-    return None  
+    return None
+
+def is_json(value):
+    if isinstance(value, (dict, list)):  # Already a JSON-compatible structure
+        return True
+    if isinstance(value, str):  # Try parsing if it's a string
+        try:
+            json.loads(value)
+            return True
+        except json.JSONDecodeError:
+            return False
+    return False

actions/devel/ferretdb/__main__.py

@@ -17,6 +17,7 @@
 #
 import json
 
+from common.util import is_json
 from common.authorize import Authorize
 from common.command_data import CommandData
 from command.ferretbd import FerretDB
@@ -31,12 +32,15 @@ def build_error(message: str):
         "body": message
     }
 
-def build_response(data:CommandData):
+def build_response(data: CommandData):
     meta_data = data.get_metadata()
-    return {
+    result = {
         "statusCode": meta_data['status'],
         "body": meta_data['result']
     }
+    if is_json(meta_data['result']):
+        result['headers'] = { 'Content-Type': 'application/json' }
+    return result
 
 def parse_body(args):
     try:

actions/devel/ferretdb/common/util.py

@@ -16,7 +16,7 @@
 # under the License.
 #
 
-import mimetypes
+import json
 
 def get_env_value(user_data, key):
     """
@@ -32,4 +32,15 @@ def get_env_value(user_data, key):
         if env['key'] == key:
             return env['value']
 
-    return None  
+    return None
+
+def is_json(value):
+    if isinstance(value, (dict, list)):  # Already a JSON-compatible structure
+        return True
+    if isinstance(value, str):  # Try parsing if it's a string
+        try:
+            json.loads(value)
+            return True
+        except json.JSONDecodeError:
+            return False
+    return False

actions/devel/minio/__main__.py

@@ -15,10 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-import nuvolaris.config as cfg
-import nuvolaris.couchdb_util as cu
-import logging, json
 
+import json
+
+from common.util import is_json
 from common.authorize import Authorize
 from command.minio import Minio
 from common.command_data import CommandData
@@ -33,12 +33,15 @@ def build_error(message: str):
         "body": message
     }
 
-def build_response(data:CommandData):
+def build_response(data: CommandData):
     meta_data = data.get_metadata()
-    return {
+    result = {
         "statusCode": meta_data['status'],
         "body": meta_data['result']
     }
+    if is_json(meta_data['result']):
+        result['headers'] = { 'Content-Type': 'application/json' }
+    return result
 
 def parse_body(args):
     try:

actions/devel/minio/common/util.py

@@ -16,7 +16,7 @@
 # under the License.
 #
 
-import mimetypes
+import json
 
 def get_env_value(user_data, key):
     """
@@ -32,4 +32,15 @@ def get_env_value(user_data, key):
         if env['key'] == key:
             return env['value']
 
-    return None  
+    return None
+
+def is_json(value):
+    if isinstance(value, (dict, list)):  # Already a JSON-compatible structure
+        return True
+    if isinstance(value, str):  # Try parsing if it's a string
+        try:
+            json.loads(value)
+            return True
+        except json.JSONDecodeError:
+            return False
+    return False

actions/devel/psql/__main__.py

@@ -18,6 +18,7 @@
 import json
 from base64 import b64decode
 
+from common.util import is_json
 from command.psql import Psql
 from common.authorize import Authorize
 from common.command_data import CommandData
@@ -26,26 +27,33 @@
 class ApiError(Exception):
     pass
 
+
 def build_error(message: str):
     return {
         "statusCode": 400,
         "body": message
     }
 
-def build_response(data:CommandData):
+
+def build_response(data: CommandData):
     meta_data = data.get_metadata()
-    return {
+    result = {
         "statusCode": meta_data['status'],
         "body": meta_data['result']
     }
+    if is_json(meta_data['result']):
+        result['headers'] = { 'Content-Type': 'application/json' }
+    return result
+
 
 def parse_body(args):
     try:
-        return b64decode(args['__ow_body']).decode().strip()        
+        return b64decode(args['__ow_body']).decode().strip()
     except Exception as e:
         print(e)
         raise ApiError("could not parse __ow_body as base64")
 
+
 def main(args):
     """
     Action implementing a generic command wrapper for the nuv devel plugin. The action must be called with a POST request receiving a JSON
@@ -64,10 +72,11 @@ def main(args):
 
     if len(args['__ow_body']) == 0:
         return build_error("invalid request, no command payload received")
-    
-    try:        
-        user_data = Authorize(args['couchdb_host'],args['couchdb_user'],args['couchdb_password']).login(headers['x-impersonate-auth'])               
+
+    try:
+        user_data = Authorize(args['couchdb_host'], args['couchdb_user'], args['couchdb_password']).login(
+            headers['x-impersonate-auth'])
         cmd = CommandData(json.loads(parse_body(args)))
         return build_response(Psql(user_data).execute(cmd))
-    except Exception as e:        
-        return build_error(f"failed to execute nuv devel psql. Reason: {str(e)}")
+    except Exception as e:
+        return build_error(f"failed to execute nuv devel psql. Reason: {str(e)}")

actions/devel/psql/command/psql.py

@@ -52,7 +52,7 @@ def _query(self, input:CommandData):
             # Open a cursor to perform database operations
             with conn.cursor(row_factory=dict_row) as cur:
                 cur.execute(query)
-                result = cur.fetchall()                
+                result = cur.fetchall()
                 input.result(json.dumps(result))
                 input.status(200)
                 return input

actions/devel/psql/common/util.py

@@ -16,7 +16,7 @@
 # under the License.
 #
 
-import mimetypes
+import json
 
 def get_env_value(user_data, key):
     """
@@ -32,4 +32,15 @@ def get_env_value(user_data, key):
         if env['key'] == key:
             return env['value']
 
-    return None  
+    return None
+
+def is_json(value):
+    if isinstance(value, (dict, list)):  # Already a JSON-compatible structure
+        return True
+    if isinstance(value, str):  # Try parsing if it's a string
+        try:
+            json.loads(value)
+            return True
+        except json.JSONDecodeError:
+            return False
+    return False

actions/devel/redis/__main__.py

@@ -17,6 +17,7 @@
 #
 import json
 
+from common.util import is_json
 from common.authorize import Authorize
 from common.command_data import CommandData
 from command.redis import Redis
@@ -31,12 +32,15 @@ def build_error(message: str):
         "body": message
     }
 
-def build_response(data:CommandData):
+def build_response(data: CommandData):
     meta_data = data.get_metadata()
-    return {
+    result = {
         "statusCode": meta_data['status'],
         "body": meta_data['result']
     }
+    if is_json(meta_data['result']):
+        result['headers'] = { 'Content-Type': 'application/json' }
+    return result
 
 def parse_body(args):
     try:

actions/devel/redis/common/util.py

@@ -16,7 +16,7 @@
 # under the License.
 #
 
-import mimetypes
+import json
 
 def get_env_value(user_data, key):
     """
@@ -32,4 +32,15 @@ def get_env_value(user_data, key):
         if env['key'] == key:
             return env['value']
 
-    return None  
+    return None
+
+def is_json(value):
+    if isinstance(value, (dict, list)):  # Already a JSON-compatible structure
+        return True
+    if isinstance(value, str):  # Try parsing if it's a string
+        try:
+            json.loads(value)
+            return True
+        except json.JSONDecodeError:
+            return False
+    return False