Merge pull request #50 from d4rkstar/issue_100

fix(operator): invalid json in psql

Author: francescotimperi

actions/devel/psql/__main__.py

@@ -15,14 +15,13 @@
 # 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 base64 import b64decode
 
+from command.psql import Psql
 from common.authorize import Authorize
 from common.command_data import CommandData
-from command.psql import Psql
-from base64 import b64decode
+
 
 class ApiError(Exception):
     pass
@@ -60,10 +59,10 @@ def main(args):
     WARNING: the body will be received as base64 encoded string as this action will be deployed with --web raw enabled flag
     """
     headers = args['__ow_headers']
-    if('x-impersonate-auth' not in headers):
+    if 'x-impersonate-auth' not in headers:
         return build_error("invalid request, missing mandatory header: x-impersonate-auth")
 
-    if(len(args['__ow_body']) == 0):
+    if len(args['__ow_body']) == 0:
         return build_error("invalid request, no command payload received")
 
     try:        

actions/devel/psql/command/psql.py

@@ -21,6 +21,7 @@
 
 from common.command_data import CommandData
 from psycopg.rows import dict_row
+import json
 
 class Psql():
     """
@@ -52,7 +53,7 @@ def _query(self, input:CommandData):
             with conn.cursor(row_factory=dict_row) as cur:
                 cur.execute(query)
                 result = cur.fetchall()                
-                input.result(str(result))
+                input.result(json.dumps(result))
                 input.status(200)
                 return input