Add runAlways and link in both cromwell and metadata dbs

broadinstitute · Sep 18, 2023 · ce1ec07 · ce1ec07
1 parent c4c430f
commit ce1ec07
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/database/migration/src/main/resources/changelog.xml b/database/migration/src/main/resources/changelog.xml
@@ -3,7 +3,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">
 
-    <include file="changesets/assign_table_owner_for_workflows_app_cromwell.xml" relativeToChangelogFile="true" />
+    <include file="changesets/init_role.xml" relativeToChangelogFile="true" />
     <include file="changesets/db_schema.xml" relativeToChangelogFile="true" />
     <include file="changesets/symbol_iteration_null.xml" relativeToChangelogFile="true" />
     <include file="changesets/wdl_and_inputs.xml" relativeToChangelogFile="true" />

diff --git a/...able_owner_for_workflows_app_cromwell.xml → ...c/main/resources/changesets/init_role.xml b/...able_owner_for_workflows_app_cromwell.xml → ...c/main/resources/changesets/init_role.xml
@@ -8,11 +8,10 @@
     <property  name="sharedCromwellDbRole" value=""/>
 
     <!--
-        This changeset will be only applied when 'sharedCromwellDbRole' property is set.
-        Currently, it is only set for the shared Cromwell service in the WORKFLOWS app.
-        For all the other Cromwell servers this should be a no-op.
+        This changeset will be applied whenever the 'sharedCromwellDbRole' property is set.
+        It runs every time to ensure the role is set correctly before any other changesets.
      -->
-    <changeSet author="sshah" id="assign_table_owner_for_workflows_app_cromwell" dbms="postgresql">
+    <changeSet runAlways="true" author="sshah" id="init_role" dbms="postgresql">
         <preConditions onFail="MARK_RAN">
             <!-- check that 'sharedCromwellDbRole' role is set -->
             <not>

diff --git a/database/migration/src/main/resources/metadata_changesets/init_role.xml b/database/migration/src/main/resources/metadata_changesets/init_role.xml
@@ -0,0 +1 @@
+changesets/init_role.xml
diff --git a/database/migration/src/main/resources/sql_metadata_changelog.xml b/database/migration/src/main/resources/sql_metadata_changelog.xml
@@ -3,6 +3,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">
 
+    <include file="metadata_changesets/init_role.xml" relativeToChangelogFile="true" />
     <include file="metadata_changesets/move_sql_metadata_changelog.xml" relativeToChangelogFile="true" />
     <include file="changesets/change_max_size_label_entry.xml" relativeToChangelogFile="true" />
     <include file="metadata_changesets/delete_duplicate_custom_labels.xml" relativeToChangelogFile="true"/>