From 35937a6f1d274322156d350b8a70b468c87451e3 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Thu, 15 Sep 2022 12:30:19 +0100
Subject: [PATCH] feat(sourcempas-reader): refactored code feat(chalice):
 changed Dockerfile feat(DB): changed version number

---
 api/Dockerfile                                         | 4 +++-
 ee/api/Dockerfile                                      | 4 +++-
 ee/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql | 8 ++++++++
 ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql | 2 +-
 scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql    | 8 ++++++++
 scripts/helm/db/init_dbs/postgresql/init_schema.sql    | 2 +-
 sourcemap-reader/servers/sourcemaps-handler.js         | 2 +-
 7 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 ee/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql
 create mode 100644 scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql

diff --git a/api/Dockerfile b/api/Dockerfile
index 8f8691159..d02dda8ba 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -8,6 +8,7 @@ ARG envarg
 ENV SOURCE_MAP_VERSION=0.7.4 \
     APP_NAME=chalice \
     LISTEN_PORT=8000 \
+    MAPPING_WASM=/work/sourcemap-reader/mappings.wasm \
     ENTERPRISE_BUILD=${envarg}
 
 ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
@@ -20,7 +21,8 @@ RUN cd /work_tmp && npm install
 
 WORKDIR /work
 COPY . .
-RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/. && chmod 644 /mappings.wasm
+RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/. \
+    && mv /mappings.wasm ${MAPPING_WASM} && chmod 644 ${MAPPING_WASM}
 
 RUN adduser -u 1001 openreplay -D
 USER 1001
diff --git a/ee/api/Dockerfile b/ee/api/Dockerfile
index dad5fa20d..1b23fc6d4 100644
--- a/ee/api/Dockerfile
+++ b/ee/api/Dockerfile
@@ -6,6 +6,7 @@ ARG envarg
 ENV SOURCE_MAP_VERSION=0.7.4 \
     APP_NAME=chalice \
     LISTEN_PORT=8000 \
+    MAPPING_WASM=/work/sourcemap-reader/mappings.wasm \
     ENTERPRISE_BUILD=${envarg}
 
 ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
@@ -18,7 +19,8 @@ RUN cd /work_tmp && npm install
 
 WORKDIR /work
 COPY . .
-RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/. && chmod 644 /mappings.wasm
+RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/. \
+    && mv /mappings.wasm ${MAPPING_WASM} && chmod 644 ${MAPPING_WASM}
 
 RUN adduser -u 1001 openreplay -D
 USER 1001
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql b/ee/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql
new file mode 100644
index 000000000..f6204aff5
--- /dev/null
+++ b/ee/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql
@@ -0,0 +1,8 @@
+BEGIN;
+CREATE OR REPLACE FUNCTION openreplay_version()
+    RETURNS text AS
+$$
+SELECT 'v1.8.1-ee'
+$$ LANGUAGE sql IMMUTABLE;
+
+COMMIT;
\ No newline at end of file
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index 91cb307eb..238cf3273 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -7,7 +7,7 @@ CREATE EXTENSION IF NOT EXISTS pgcrypto;
 CREATE OR REPLACE FUNCTION openreplay_version()
     RETURNS text AS
 $$
-SELECT 'v1.8.0-ee'
+SELECT 'v1.8.1-ee'
 $$ LANGUAGE sql IMMUTABLE;
 
 
diff --git a/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql b/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql
new file mode 100644
index 000000000..170851a80
--- /dev/null
+++ b/scripts/helm/db/init_dbs/postgresql/1.8.1/1.8.1.sql
@@ -0,0 +1,8 @@
+BEGIN;
+CREATE OR REPLACE FUNCTION openreplay_version()
+    RETURNS text AS
+$$
+SELECT 'v1.8.1'
+$$ LANGUAGE sql IMMUTABLE;
+
+COMMIT;
\ No newline at end of file
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index c172c1d76..4d6ad7657 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS events;
 CREATE OR REPLACE FUNCTION openreplay_version()
     RETURNS text AS
 $$
-SELECT 'v1.8.0'
+SELECT 'v1.8.1'
 $$ LANGUAGE sql IMMUTABLE;
 
 -- --- accounts.sql ---
diff --git a/sourcemap-reader/servers/sourcemaps-handler.js b/sourcemap-reader/servers/sourcemaps-handler.js
index 191267b5b..7277cef02 100644
--- a/sourcemap-reader/servers/sourcemaps-handler.js
+++ b/sourcemap-reader/servers/sourcemaps-handler.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 const sourceMap = require('source-map');
 const AWS = require('aws-sdk');
 const URL = require('url');
-const wasm = fs.readFileSync('/mappings.wasm');
+const wasm = fs.readFileSync(process.env.MAPPING_WASM || '/mappings.wasm');
 sourceMap.SourceMapConsumer.initialize({
     "lib/mappings.wasm": wasm
 });