Restore local mysql/postgresql DB credentials for bootRun and integration tests

application-mysql.properties/application-postgresql.properties no longer ship
database.username/password/url, since those are packaged into the WAR. bootRun,
the embedded integrationTest auto-start, and the CI external-Tomcat integration
tests (scripts/tomcat/integration_tests_tomcat.sh) all relied on those defaults
to reach the root/changeme database that lib_db_helper.sh boots locally/in CI.
Supply the same values via -D system properties instead, so those flows keep
working without reintroducing the credentials into the shipped artifact.

Author: duanemay

scripts/tomcat/integration_tests_tomcat.sh

@@ -30,6 +30,24 @@ function download_and_extract_tomcat() {
   tar -xzf "${cache}" -C "${build_dir}"
 }
 
+#######################################
+# local_database_catalina_opts
+# Local-dev-only DB credentials for the mysql/postgresql profiles, matching the database
+# booted by boot_db() in lib_db_helper.sh (root/changeme). application-mysql.properties /
+# application-postgresql.properties (packaged into the WAR) no longer ship these, so the
+# deployed WAR needs them supplied as -D system properties instead.
+# Arguments:
+#   $1 - comma-separated active Spring profiles (e.g. "postgresql,default")
+#######################################
+function local_database_catalina_opts() {
+  local profiles="$1"
+  if [[ ",${profiles}," == *,mysql,* ]]; then
+    echo "-Ddatabase.username=root -Ddatabase.password=changeme -Ddatabase.url=jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true"
+  elif [[ ",${profiles}," == *,postgresql,* ]]; then
+    echo "-Ddatabase.username=root -Ddatabase.password=changeme -Ddatabase.url=jdbc:postgresql:uaa"
+  fi
+}
+
 function wait_for_uaa_http() {
   local url="$1"
   local max_wait="${2:-300}"
@@ -152,13 +170,16 @@ function main() {
   export CATALINA_BASE="${tomcat_root}"
   export UAA_PORT="${uaa_port}"
 
+  local database_opts
+  database_opts="$(local_database_catalina_opts "${test_profile}")"
+
   # Do not use `set -u` in setenv.sh: Tomcat sources it, then setclasspath.sh tests unset
   # JRE_HOME with `[ -z "$JRE_HOME" ]`, which fails under nounset before Tomcat starts.
   # Match UaaBootApplication.main() and integration java -jar (uaa/build.gradle) for Spring context.
   cat > "${tomcat_root}/bin/setenv.sh" <<EOF
 #!/usr/bin/env sh
 export JAVA_OPTS="\${JAVA_OPTS:-}"
-export CATALINA_OPTS="\${CATALINA_OPTS:-} -DCLOUDFOUNDRY_CONFIG_PATH=${boot_dir} -DSECRETS_DIR=${boot_dir} -Dserver.servlet.context-path=/uaa -Dsmtp.host=localhost -Dsmtp.port=2525 -Dspring.profiles.active=${test_profile} -Djava.security.egd=file:/dev/./urandom -Dlogging.config=${log4j} -Dstatsd.enabled=true -Dzones.paths.enabled=true -Dspring.main.allow-bean-definition-overriding=true -Dspring.main.allow-circular-references=true"
+export CATALINA_OPTS="\${CATALINA_OPTS:-} -DCLOUDFOUNDRY_CONFIG_PATH=${boot_dir} -DSECRETS_DIR=${boot_dir} -Dserver.servlet.context-path=/uaa -Dsmtp.host=localhost -Dsmtp.port=2525 -Dspring.profiles.active=${test_profile} -Djava.security.egd=file:/dev/./urandom -Dlogging.config=${log4j} -Dstatsd.enabled=true -Dzones.paths.enabled=true -Dspring.main.allow-bean-definition-overriding=true -Dspring.main.allow-circular-references=true ${database_opts}"
 EOF
   chmod +x "${tomcat_root}/bin/setenv.sh"
 

uaa/build.gradle.kts

@@ -3,6 +3,28 @@ import javax.inject.Inject
 
 val identityServer = parent!!.subprojects.find { "cloudfoundry-identity-server" == it.name }!!
 
+// Local-dev-only DB credentials for the mysql/postgresql profiles, matching the database
+// bootstrapped by README.md / scripts/lib_db_helper.sh / scripts/docker-compose.yml.
+// These are intentionally not shipped in application-mysql.properties/application-postgresql.properties
+// (which are packaged into the WAR), so callers that boot a real mysql/postgresql locally must
+// supply them here instead. Override any of them with the matching -D system property.
+fun localDatabaseCredentialArgs(activeProfiles: String): Map<String, String> {
+    val profiles = activeProfiles.split(",").map { it.trim() }
+    return when {
+        profiles.contains("mysql") -> mapOf(
+            "database.username" to System.getProperty("database.username", "root"),
+            "database.password" to System.getProperty("database.password", "changeme"),
+            "database.url" to System.getProperty("database.url", "jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true"),
+        )
+        profiles.contains("postgresql") -> mapOf(
+            "database.username" to System.getProperty("database.username", "root"),
+            "database.password" to System.getProperty("database.password", "changeme"),
+            "database.url" to System.getProperty("database.url", "jdbc:postgresql:uaa"),
+        )
+        else -> emptyMap()
+    }
+}
+
 plugins {
     war
     alias(libs.plugins.springBoot)
@@ -266,6 +288,8 @@ tasks.register<Test>("integrationTest") {
         val springProfile = System.getProperty("spring.profiles.active", "hsqldb")
         val warFile = file("build/libs/cloudfoundry-identity-uaa-0.0.0.war")
         val bootDir = rootProject.file("scripts/boot")
+        val databaseArgsList = localDatabaseCredentialArgs(springProfile).map { (key, value) -> "-D$key=$value" }
+        val databaseArgs = if (databaseArgsList.isEmpty()) "" else databaseArgsList.joinToString(" \\\n            ") + " \\\n            "
 
         logger.lifecycle("Starting UAA application for integration tests...")
 
@@ -276,7 +300,7 @@ tasks.register<Test>("integrationTest") {
             -Dsmtp.host=localhost \
             -Dsmtp.port=2525 \
             -Dspring.profiles.active=$springProfile \
-            -jar ${warFile.absolutePath} > ${bootLogFile.absolutePath} 2>&1 & echo ${'$'}!"""
+            $databaseArgs-jar ${warFile.absolutePath} > ${bootLogFile.absolutePath} 2>&1 & echo ${'$'}!"""
 
         val proc = ProcessBuilder("bash", "-c", javaCmd).start()
         proc.waitFor()
@@ -319,7 +343,9 @@ tasks.named<org.springframework.boot.gradle.tasks.run.BootRun>("bootRun") {
     systemProperty("logging.level.org.springframework.security", "TRACE")
     systemProperty("logging.config", file("../scripts/boot/log4j2.properties").absolutePath)
     systemProperty("uaa.boot.location.tomcat", System.getProperty("uaa.boot.location.tomcat", file("../scripts/boot/tomcat").absolutePath))
-    systemProperty("spring.profiles.active", System.getProperty("spring.profiles.active", "hsqldb"))
+    val activeProfiles = System.getProperty("spring.profiles.active", "hsqldb")
+    systemProperty("spring.profiles.active", activeProfiles)
+    localDatabaseCredentialArgs(activeProfiles).forEach { (key, value) -> systemProperty(key, value) }
     systemProperty("metrics.perRequestMetrics", System.getProperty("metrics.perRequestMetrics", "true"))
     systemProperty("smtp.host", "localhost")
     systemProperty("smtp.port", 2525)