feat: add JSON output format

Author: eoinsha

README.md

@@ -137,6 +137,7 @@ Here is an example of how to do this:
 ```json
 {
   "query": "COPY (SELECT * FROM 'https://github.com/Teradata/kylo/raw/refs/heads/master/samples/sample-data/parquet/userdata1.parquet' LIMIT 10) TO '/tmp/output.json'",
-  "outputFile": "/tmp/output.json"
+  "outputFile": "/tmp/output.json",
+  "outputFormat": "json"
 }
 ```

bootstrap.cpp

@@ -74,13 +74,26 @@ static invocation_response query_handler(invocation_request const &req, Connecti
     // saves the result to a file. If they also specify this filename in the event JSON's `outputFile`
     // property, it will be base64 encoded and returned as the result. This temporary file is also deleted before
     // the function completes.
+
     auto outputFile = view.GetString("outputFile");
     auto encodedOutput = b64encode(outputFile);
     // Delete the file after encoding
     remove(outputFile.c_str());
 
-    return invocation_response::success(encodedOutput,
-                                        "application/base64");
+    if (view.KeyExists("outputFormat"))
+    {
+      auto outputFormat = view.GetString("outputFormat");
+      if (outputFormat == "json")
+      {
+        JsonValue jsonResponse;
+        jsonResponse.WithString("output", encodedOutput);
+        auto jsonString = jsonResponse.View().WriteCompact();
+        return invocation_response::success(jsonString, "application/json");
+      }
+    }
+
+    // Vanilla base64 encoded response
+    return invocation_response::success(encodedOutput, "application/base64");
   }
 
   return invocation_response::success(result->ToString(), "text/plain");

examples/sam/Makefile

@@ -0,0 +1,3 @@
+build-DuckQueryFunction:
+	echo "This file is intentionally empty. Everything required is provided by the Lambda layer" > $(ARTIFACTS_DIR)/empty
+

examples/sam/template.yaml

@@ -10,20 +10,20 @@ Globals:
     Timeout: 60
 
 Resources:
-  DuckQueryRuntimeLayer:
-    Type: AWS::Serverless::Application
-    Properties:
-      Location:
-        ApplicationId: arn:aws:serverlessrepo:eu-west-1:949339270388:applications/duck-query-lambda
-        SemanticVersion: 0.0.7
+  # DuckQueryRuntimeLayer:
+  #   Type: AWS::Serverless::Application
+  #   Properties:
+  #     Location:
+  #       ApplicationId: arn:aws:serverlessrepo:eu-west-1:949339270388:applications/duck-query-lambda
+  #       SemanticVersion: 0.0.7
 
   DuckQueryFunction:
     Type: AWS::Serverless::Function
     Properties:
       Runtime: provided.al2023
       Handler: bootstrap
       Layers:
-        - !GetAtt DuckQueryRuntimeLayer.Outputs.DuckQueryLayerVersionArn
+        - "arn:aws:lambda:eu-west-1:935672627075:layer:DuckQueryLambdaLayerArm64:4"
       Architectures:
         - arm64
 

template.yaml

@@ -27,7 +27,7 @@ Resources:
       CompatibleArchitectures:
         - arm64
       CompatibleRuntimes:
-        - provided
+        - provided.al2023
       LicenseInfo: Apache-2.0
       RetentionPolicy: Retain