Adding cleanup operation to dynamo client.

packages/server/src/api/controllers/query.js

@@ -116,9 +116,8 @@ exports.preview = async function(ctx) {
 
   const enrichedQuery = await enrichQueryFields(fields, parameters)
 
-  const rows = formatResponse(
+  const integration = new Integration(datasource.config)
-    await new Integration(datasource.config)[queryVerb](enrichedQuery)
+  const rows = formatResponse(await integration[queryVerb](enrichedQuery))
-  )
 
   // get all the potential fields in the schema
   const keys = rows.flatMap(Object.keys)
@@ -127,6 +126,10 @@ exports.preview = async function(ctx) {
     rows,
     schemaFields: [...new Set(keys)],
   }
+  // cleanup
+  if (integration.end) {
+    integration.end()
+  }
 }
 
 exports.execute = async function(ctx) {
@@ -146,10 +149,13 @@ exports.execute = async function(ctx) {
     ctx.request.body.parameters
   )
 
+  const integration = new Integration(datasource.config)
   // call the relevant CRUD method on the integration class
-  ctx.body = formatResponse(
+  ctx.body = formatResponse(await integration[query.queryVerb](enrichedQuery))
-    await new Integration(datasource.config)[query.queryVerb](enrichedQuery)
+  // cleanup
-  )
+  if (integration.end) {
+    integration.end()
+  }
 }
 
 exports.destroy = async function(ctx) {

packages/server/src/db/dynamoClient.js

@@ -2,6 +2,7 @@ let _ = require("lodash")
 let env = require("../environment")
 
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1"
+exports.AWS_REGION = AWS_REGION
 
 const TableInfo = {
   API_KEYS: {

packages/server/src/integrations/dynamodb.js

@@ -1,5 +1,6 @@
 const AWS = require("aws-sdk")
 const { FIELD_TYPES, QUERY_TYPES } = require("./Integration")
+const { AWS_REGION } = require("../db/dynamoClient")
 
 const SCHEMA = {
   docs: "https://github.com/dabit3/dynamodb-documentclient-cheat-sheet",
@@ -114,10 +115,22 @@ class DynamoDBIntegration {
     })
   }
 
+  end() {
+    this.disconnect()
+  }
+
   connect() {
     AWS.config.update(this.config)
   }
 
+  disconnect() {
+    AWS.config.update({
+      secretAccessKey: undefined,
+      accessKeyId: undefined,
+      region: AWS_REGION,
+    })
+  }
+
   async create(query) {
     const params = {
       TableName: query.table,