Add Postgres support and set as default database

Author: mkmurali

README.md

@@ -1,4 +1,5 @@
-# Proxy Authorization Service for Prefect UI and Prefect CLI 
+# Proxy Authorization Service for Prefect UI and Prefect CLI
+
 ![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/softrams/prefect-auth-proxy)
 
 [Prefect](https://prefect.io) is a great platform for building data flows/pipelines. It supports hybrid execution with execution engines running on-premises with
@@ -14,11 +15,11 @@ Prefect UI and CLI to enable authentication/authorization for API. All the reque
 
 ## Setup
 
-This initial implementation uses API Key and MySQL database backend to authenticate and authorize requests.
+This initial implementation uses API Key and MySQL/Postgres database backend to authenticate and authorize requests.
 
 ### Setup Database
 
-This service looks for prefect_api_keys table in MYSQL Database. Please refer to data/db_init.sql for the initial schema and sample data.
+This service looks for prefect_api_keys table in MYSQL/Postgres Database. Please refer to data/`<database>`/db_init.sql for the initial schema and sample data.
 
 ```sql
 -- create table prefect_api_keys
@@ -58,16 +59,18 @@ The following Environment Variables are available to configure the Proxy service
 | `PORT`                        | `3000`              | Port                                      |
 | `LOG_LEVEL_OVERRIDE_DURATION` | `300`               | Log level override duration (seconds)     |
 | `ENV`                         | `NA`                | Environment Name                          |
-| `DB_HOST`                     | `NULL`              | MySQL Database Server Host                |
-| `DB_USER`                     | `NULL`              | MySQL Database Server User                |
-| `DB_PASSWORD`                 | `NULL`              | MySQL Database Server Password            |
-| `DB_DATABASE`                 | `NULL`              | MySQL Database Name                       |
+| `DB_TYPE`                     | `postgres`          | Database Type [postgres/mysql]            |
+| `DB_HOST`                     | `NULL`              | Database Server Host                      |
+| `DB_USER`                     | `NULL`              | Database Server User                      |
+| `DB_PASSWORD`                 | `NULL`              | Database Server Password                  |
+| `DB_DATABASE`                 | `NULL`              | Database Name                             |
 
 ### Docker Image
 
 #### Use pre-built docker image
 
 Use docker image from Docker hub
+
 ```bash
 # Run using pre-built docker image from docker hub
 # Prepare environment variables in .env file

data/README.md

@@ -0,0 +1,27 @@
+# Running Database in a local container
+
+## Postgres
+
+```bash
+docker pull postgres
+
+docker run --name proxydb \
+--mount type=bind,source=$(pwd)/data/postgres,target=/docker-entrypoint-initdb.d \
+-p 5432:5432 \
+-e POSTGRES_PASSWORD=`<PASSWORD>` \
+-d postgres
+
+```
+
+## MySQL
+
+```bash
+docker pull mysql
+
+docker run --name proxydb \
+--mount type=bind,source=$(pwd)/data/postgres,target=/docker-entrypoint-initdb.d \
+-p 3306:3306 \
+-e MYSQL_ROOT_PASSWORD=`<PASSWORD>` \
+-d mysql
+
+```

data/db_init.sql renamed to data/mysql/db_init.sql

@@ -0,0 +1,15 @@
+CREATE TABLE prefect_api_keys (
+  user_id varchar(128) NOT NULL,
+  scopes varchar(2000) NOT NULL,
+  api_key varchar(128) NOT NULL,
+  key_issu_dt timestamp NOT NULL,
+  key_expr_dt timestamp NOT NULL,
+  creatd_dt timestamp NOT NULL,
+  last_updatd_dt timestamp NOT NULL,
+  creatd_by varchar(11) NOT NULL,
+  last_updatd_by varchar(11) NOT NULL,
+  PRIMARY KEY (user_id)
+);
+
+insert into prefect_api_keys (user_id, scopes, api_key, key_issu_dt, key_expr_dt, creatd_dt, last_updatd_dt, creatd_by, last_updatd_by) 
+values('USERID', 'mutation/*, query/*', 'TestKey001', '2021-12-27 00:00:00', '2022-12-31 00:00:00', '2021-12-30 00:00:00', '2021-12-30 00:00:00', 'ADMINUSERID', 'ADMINUSERID')

data/postgres/db_init.sql

@@ -1,7 +1,10 @@
 const express = require("express");
 const bodyParser = require("body-parser");
 const { createProxyMiddleware } = require("http-proxy-middleware");
+
 const mysql = require("mysql");
+const { Pool, Client } = require("pg");
+
 const { parse } = require("graphql");
 
 // Create Express Server
@@ -101,13 +104,23 @@ let dbConn;
 async function initDBConnection() {
   return new Promise(async (resolve, reject) => {
     try {
-      dbConn = mysql.createPool({
-        connectionLimit: 5,
-        host: process.env.DB_HOST,
-        user: process.env.DB_USER,
-        password: process.env.DB_PASSWORD,
-        database: process.env.DB_DATABASE,
-      });
+      if (process.env.DB_TYPE === "mysql") {
+        dbConn = mysql.createPool({
+          connectionLimit: 5,
+          host: process.env.DB_HOST,
+          user: process.env.DB_USER,
+          password: process.env.DB_PASSWORD,
+          database: process.env.DB_DATABASE,
+        });
+      } else {
+        dbConn = new Pool({
+          user: process.env.DB_USER,
+          host: process.env.DB_HOST,
+          database: process.env.DB_DATABASE,
+          password: process.env.DB_PASSWORD,
+          port: 5432,
+        });
+      }
       resolve(true);
     } catch (err) {
       console.log("Failure in creating DB connection pool:", err);
@@ -124,7 +137,37 @@ async function dbQuery(query, params) {
           reject(error);
         } else {
           // console.log('dbQuery Results:', results);
-          resolve(results);
+          resolve(results.rows ? results.rows : results);
+        }
+      });
+    } catch (err) {
+      console.log("Failure in query: ", err);
+      reject(err);
+    }
+  });
+}
+
+async function fetchAPIKeysInfo(key) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      let query = "";
+      let params;
+      if (process.env.DB_TYPE === "mysql") {
+        params = [key];
+        query =
+          "select * from prefect_api_keys where api_key=? and CURDATE() < key_expr_dt";
+      } else {
+        params = [key];
+        query =
+          "select * from prefect_api_keys where api_key=$1 and CURRENT_TIMESTAMP < key_expr_dt";
+      }
+
+      dbConn.query(query, params, (error, results) => {
+        if (error) {
+          reject(error);
+        } else {
+          // console.log('dbQuery Results:', results);
+          resolve(results.rows ? results.rows : results);
         }
       });
     } catch (err) {
@@ -201,10 +244,7 @@ app.use(async (req, res, next) => {
     let acl = tokenCache.get(apiKey);
     if (!acl) {
       // Fetch ACL from database and store in cache
-      const aclDB = await dbQuery(
-        "select * from prefect_api_keys where api_key=? and CURDATE() < key_expr_dt",
-        [apiKey]
-      );
+      const aclDB = await fetchAPIKeysInfo(apiKey);
       if (aclDB && aclDB.length > 0) {
         acl = aclDB[0];
         acl.ops = acl.scopes.split(",").map((el) => el.trim());