tidy up

walmartlabs · Jan 3, 2025 · 50d3eb9 · 50d3eb9
1 parent 25542e2
commit 50d3eb9
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 38 deletions.
diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.69.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.69.0.xml
@@ -4,26 +4,30 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
-    <!-- concord agent user disabled from 2.21.x -->
-<!--    <property name="concordAgentUserId" value="d4f123c1-f8d4-40b2-8a12-b8947b9ce2d8"/>-->
+    <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
+    <!--
+    <property name="concordAgentUserId" value="d4f123c1-f8d4-40b2-8a12-b8947b9ce2d8"/>
+    -->
 
     <!-- moved to v1.86.0.xml (no more hard-coded default token) -->
-    <!-- concord agent user disabled from 2.21.x -->
-<!--    <changeSet id="69000" author="[email protected]">
-            <insert tableName="USERS">
-                <column name="USER_ID">${concordAgentUserId}</column>
-                <column name="USERNAME">concordAgent</column>
-                <column name="USER_TYPE">LOCAL</column>
-            </insert>
+    <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
+    <!--
+    <changeSet id="69000" author="[email protected]">
+        <insert tableName="USERS">
+            <column name="USER_ID">${concordAgentUserId}</column>
+            <column name="USERNAME">concordAgent</column>
+            <column name="USER_TYPE">LOCAL</column>
+        </insert>
 
-            <insert tableName="API_KEYS">
-                &lt;!&ndash; "O+JMYwBsU797EKtlRQYu+Q" &ndash;&gt;
-                <column name="API_KEY">1sw9eLZ41EOK4w/iV3jFnn6cqeAMeFtxfazqVY04koY</column>
-                <column name="USER_ID">${concordAgentUserId}</column>
-            </insert>
-        </changeSet> -->
+        <insert tableName="API_KEYS">
+            &lt;!&ndash; "O+JMYwBsU797EKtlRQYu+Q" &ndash;&gt;
+            <column name="API_KEY">1sw9eLZ41EOK4w/iV3jFnn6cqeAMeFtxfazqVY04koY</column>
+            <column name="USER_ID">${concordAgentUserId}</column>
+        </insert>
+    </changeSet>
+    -->
 
-    <!-- concord agent user disabled from 2.21.x -->
+    <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
     <!-- Create agent user when not exist -->
     <!--
     <changeSet id="69001" author="[email protected]">

diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.70.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.70.0.xml
@@ -4,21 +4,23 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
-<!--    <property name="concordRunnerUserId" value="2599c604-1384-4660-a767-8bc03baa7a31"/>
+    <!--
+    <property name="concordRunnerUserId" value="2599c604-1384-4660-a767-8bc03baa7a31"/>
 
-        <changeSet id="70000" author="[email protected]">
-            <insert tableName="USERS">
-                <column name="USER_ID">${concordRunnerUserId}</column>
-                <column name="USERNAME">concordRunner</column>
-                <column name="USER_TYPE">LOCAL</column>
-            </insert>
+    <changeSet id="70000" author="[email protected]">
+        <insert tableName="USERS">
+            <column name="USER_ID">${concordRunnerUserId}</column>
+            <column name="USERNAME">concordRunner</column>
+            <column name="USER_TYPE">LOCAL</column>
+        </insert>
 
-            <insert tableName="API_KEYS">
-                &lt;!&ndash; "Gz0q/DeGlH8Zs7QJMj1v8g" &ndash;&gt;
-                <column name="API_KEY">DrRt3j6G7b6GHY/Prddu4voyKyZa17iFkEj99ac0q/A</column>
-                <column name="USER_ID">${concordRunnerUserId}</column>
-            </insert>
-        </changeSet> -->
+        <insert tableName="API_KEYS">
+            &lt;!&ndash; "Gz0q/DeGlH8Zs7QJMj1v8g" &ndash;&gt;
+            <column name="API_KEY">DrRt3j6G7b6GHY/Prddu4voyKyZa17iFkEj99ac0q/A</column>
+            <column name="USER_ID">${concordRunnerUserId}</column>
+        </insert>
+    </changeSet>
+    -->
 
     <changeSet id="70100" author="[email protected]">
         <addColumn tableName="PROCESS_QUEUE">

diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.79.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.79.0.xml
@@ -4,7 +4,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
-    <!-- concord agent user disabled from 2.21.x -->
+    <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
     <!--
     <changeSet id="79000" author="[email protected]">
         <insert tableName="USER_ROLES">

diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.80.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v0.80.0.xml
@@ -14,7 +14,7 @@
             <column name="GLOBAL_WRITER">true</column>
         </insert>
 
-        <!-- concord agent user disabled from 2.21.x -->
+        <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
         <!--
         <insert tableName="USER_ROLES">
             <column name="ROLE_ID">${concordSystemWriterRoleId}</column>

diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.45.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.45.0.xml
@@ -4,8 +4,9 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
-<!-- moved to v1.86.0.xml -->
-<!--    <changeSet id="1450000" author="[email protected]" runInTransaction="false" context="!codegen">
+        <!-- moved to v1.86.0.xml -->
+        <!--
+        <changeSet id="1450000" author="[email protected]" runInTransaction="false" context="!codegen">
             <sql>
                 delete from API_KEYS where KEY_ID = 'd5165ca8-e8de-11e6-9bf5-136b5db23c32'
             </sql>
@@ -17,5 +18,6 @@
                 &lt;!&ndash; value from concord-server.conf &ndash;&gt;
                 <param name="token" value="${defaultAdminToken}"/>
             </customChange>
-        </changeSet> -->
+        </changeSet>
+       -->
 </databaseChangeLog>
diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.86.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v1.86.0.xml
@@ -5,8 +5,10 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
     <property name="concordAdminUserId" value="230c5c9c-d9a7-11e6-bcfd-bb681c07b26c"/>
-    <!-- concord agent user disabled from 2.21.x -->
-<!--    <property name="concordAgentUserId" value="d4f123c1-f8d4-40b2-8a12-b8947b9ce2d8"/>-->
+    <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
+    <!--
+    <property name="concordAgentUserId" value="d4f123c1-f8d4-40b2-8a12-b8947b9ce2d8"/>
+    -->
     <property name="concordRunnerUserId" value="2599c604-1384-4660-a767-8bc03baa7a31"/>
 
     <!-- delete old hard-coded default admin API token -->
@@ -39,7 +41,7 @@
     </changeSet>
 
     <!-- delete old hard-coded default agent API token -->
-    <!-- concord agent user disabled from 2.21.x -->
+    <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
     <!--
     <changeSet id="1860200" author="[email protected]" runInTransaction="false" context="!codegen">
         <sql>
@@ -51,7 +53,7 @@
     -->
 
     <!-- Set initial agent API token when not exist  -->
-    <!-- concord agent user disabled from 2.21.x -->
+    <!-- starting from 2.21.x, the default agent token is no longer associated with any user -->
     <!--
     <changeSet id="1860300" author="[email protected]" runInTransaction="false" context="!codegen">
         <validCheckSum>ANY</validCheckSum>