Improve robustness in scripts

- Standardize PostgreSQL commands with `-h localhost` for clarity.
- Improve robustness in scripts: add checks for file writability and existence.
- Adjust Gradle logging for better visibility and lifecycle tracking.
- Minor enhancements to integration and helper scripts for better error handling and output tracing.

Author: duanemay

build.gradle

@@ -1,8 +1,5 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
-import java.nio.file.Files
-import java.nio.file.Path
-
 buildscript {
     apply(from: "dependencies.gradle")
 
@@ -115,7 +112,7 @@ subprojects {
         ]
 
         testLogging {
-            events("failed")
+            events("started", "passed", "skipped", "failed")
             exceptionFormat = "full"
             // Uncomment the following line to see all standard output from tests (there's a ton of it!)
             //showStandardStreams = true
@@ -131,7 +128,7 @@ subprojects {
         }
 
         testLogging {
-            events("failed")
+            events("started", "passed", "skipped", "failed")
             exceptionFormat = "full"
             // Uncomment the following line to see all standard output from tests (there's a ton of it!)
             //showStandardStreams = true

scripts/integration_tests.sh

@@ -17,7 +17,7 @@ function main() {
   local test_profile="${1:-hsqldb}"
 
   setup_hosts_file
-  boot_db "${DB}" # DB is set in the Dockerfile for each image
+  boot_db "${DB:-hsqldb}" # DB is set in the Dockerfile for each image
 
   pushd "$(dirname ${script_dir})"
     start_ldap

scripts/lib_db_helper.sh

@@ -120,13 +120,17 @@ function boot_db() {
     boot_log_location="/var/log/postgres-boot.log"
     launch_db="(POSTGRES_HOST_AUTH_METHOD=trust docker-entrypoint.sh postgres -c 'max_connections=250' &> ${boot_log_location}) &"
     test_connection="psql -h localhost -U postgres -c '\conninfo' &>/dev/null"
-    init_db="psql -c 'drop database if exists uaa;' -U postgres; psql -c 'create database uaa;' -U postgres; psql -c 'drop user if exists root;' --dbname=uaa -U postgres; psql -c \"create user root with superuser password '${db_password}';\" --dbname=uaa -U postgres; psql -c 'show max_connections;' --dbname=uaa -U postgres;"
+    init_db="psql -c 'drop database if exists uaa;' -h localhost -U postgres
+      psql -c 'create database uaa;' -h localhost -U postgres;
+      psql -c 'drop user if exists root;' -h localhost --dbname=uaa -U postgres;
+      psql -c \"create user root with superuser password '${db_password}';\" -h localhost --dbname=uaa -U postgres;
+      psql -c 'show max_connections;' -h localhost --dbname=uaa -U postgres;"
 
     # Override create_db function for PostgreSQL
     function create_db() {
       local database_name="uaa_${1}"
       echo "Creating PostgreSQL database: ${database_name}"
-      psql -c "create database ${database_name};" -U postgres
+      psql -c "create database ${database_name};" -h localhost -U postgres
     }
 
   elif [[ "${db}" = "mysql" ]]; then

scripts/lib_ldap_helper.sh

@@ -57,7 +57,7 @@ function start_ldap() {
     update_ldif_paths_oracle
   else
     echo "LDAP setup could not be detected"
-    exit 1
+    return
   fi
   initialize_ldap
 }

scripts/lib_util_helper.sh

@@ -13,7 +13,7 @@ function is_boot_running() {
   start_time=$(date +%s)
 
   while true; do
-    if grep -q "$target_line" "$log_file"; then
+    if grep "$target_line" "$log_file"; then
       echo "Boot Start was found in the log file."
       return 0
     fi
@@ -37,7 +37,8 @@ function is_boot_running() {
 ##########################################
 function setup_hosts_file() {
 
-  cat <<EOF >>/etc/hosts
+  if [[ -w "/etc/hosts" ]]; then
+    cat <<EOF >>/etc/hosts || true
 127.0.0.1 testzone1.localhost
 127.0.0.1 testzone2.localhost
 127.0.0.1 testzone3.localhost
@@ -47,12 +48,15 @@ function setup_hosts_file() {
 127.0.0.1 testzoneinactive.localhost
 127.0.0.1 ldap01.example.com
 EOF
+  fi
 }
 
 ########################################
 # Display memory of container
 ##########################################
 function display_memory() {
-  grep MemTotal /proc/meminfo || true
+  if [[ -f "/proc/meminfo" ]]; then
+    grep MemTotal /proc/meminfo || true
+  fi
 }
 

scripts/start_docker_database.sh

@@ -35,6 +35,7 @@ main() {
   "
 
   docker pull "${DOCKER_IMAGE}"
+  set -x
   docker run \
     --privileged \
     --tty \

uaa/build.gradle

@@ -230,18 +230,12 @@ integrationTest {
         project.logger.warn("UAA - Overriding SAML Url:"+samlUrl)
     }
 
-    testLogging {
-        events("started", "passed", "skipped", "failed")
-        showStandardStreams = false
-        exceptionFormat = "full"
-    }
-    
     doFirst {
         if (System.getProperty("skipUaaAutoStart", "false").toBoolean()) {
             logger.lifecycle("Skipping UAA auto-start (skipUaaAutoStart=true)")
             return
         }
-        
+        logger.lifecycle("Killing UAA before auto-start")
         rootProject.tasks.named('killUaa').get().exec()
 
         def bootPidFile = rootProject.file('build/boot.pid')
@@ -278,7 +272,8 @@ integrationTest {
             }
             Thread.sleep(1000)
         }
-        
+
+        logger.lifecycle("Killing UAA after auto-start")
         rootProject.tasks.named('killUaa').get().exec()
         throw new GradleException("UAA failed to start within ${maxWaitSeconds} seconds. Check ${bootLogFile.absolutePath}")
     }
@@ -290,6 +285,7 @@ integrationTest {
         }
 
         logger.lifecycle("Stopping UAA application...")
+        logger.lifecycle("Killing UAA after tests")
         rootProject.tasks.named('killUaa').get().exec()
         rootProject.file('build/boot.pid').delete()
     }