From fcd31a8da46f92303732c7fbbb61745a586265a9 Mon Sep 17 00:00:00 2001
From: Yury Brigadirenko <ybrigo@gmail.com>
Date: Thu, 22 Dec 2022 14:39:37 +0100
Subject: [PATCH] concord-server-db: pass secret salt as a base64 value (#694)

---
 .../com/walmartlabs/concord/server/db/v1.98.1.xml | 15 +++++++++++----
 .../dist/src/main/resources/concord-server.conf   |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.98.1.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.98.1.xml
index 8602612635..591ee9f46f 100644
--- a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.98.1.xml
+++ b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.98.1.xml
@@ -60,14 +60,21 @@
         </addColumn>
     </changeSet>
 
-    <changeSet id="1981031" author="ybrigo@gmail.com">
+    <changeSet id="1981031" author="ybrigo@gmail.com" context="!codegen">
         <validCheckSum>ANY</validCheckSum>
-        <addDefaultValue tableName="SECRETS" columnName="SECRET_SALT" defaultValue="${secretStoreSalt}"/>
+        <addDefaultValue tableName="SECRETS" columnName="SECRET_SALT" defaultValueComputed="decode('${secretStoreSalt}', 'base64')"/>
     </changeSet>
 
-    <changeSet id="1981032" author="ybrigo@gmail.com">
+    <changeSet id="1981032" author="ybrigo@gmail.com" context="!codegen">
         <validCheckSum>ANY</validCheckSum>
-        <addNotNullConstraint tableName="SECRETS" columnName="SECRET_SALT" defaultNullValue="${secretStoreSalt}"/>
+        <update tableName="SECRETS">
+            <column name="SECRET_SALT" valueComputed="decode('${secretStoreSalt}', 'base64')"/>
+            <where>SECRET_SALT is NULL</where>
+        </update>
+    </changeSet>
+
+    <changeSet id="1981033" author="ybrigo@gmail.com">
+        <addNotNullConstraint tableName="SECRETS" columnName="SECRET_SALT"/>
     </changeSet>
 
 </databaseChangeLog>
diff --git a/server/dist/src/main/resources/concord-server.conf b/server/dist/src/main/resources/concord-server.conf
index 74422e62f2..af4ab73eb2 100644
--- a/server/dist/src/main/resources/concord-server.conf
+++ b/server/dist/src/main/resources/concord-server.conf
@@ -112,7 +112,7 @@ concord-server {
             # requires "CREATE EXTENSION" privileges
             createExtensionAvailable = "true"
 
-            secretStoreSalt = "${secretStore.secretStoreSalt}"
+            secretStoreSalt = ${secretStore.secretStoreSalt}
         }
     }