feat: Add support for sem-service PostgreSQL 18.1 (#517)

Author: d-stefanovic

sem-service

@@ -18,7 +18,7 @@ sem_services['redis']="2.8.23 2.8 2 3.2.4 3.2.12 3.2 3 4.0.12 4.0.14 4.0 4 5.0.6
 sem_services['valkey']="7.2.6 7.2 7 8.1.2 8.1 8"
 sem_services['mongo']="3.2.1 3.2 3.6.20 3.6 3 4.0.20 4.0 4.1.13 4.1 4.2.10 4.2.13 4.2 4.4.1 4.4.4 4.4 4 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 5.0 5 6.0.8 6.0 6 7.0.18 7.0 7 8.0.6 8.0 8"
 sem_services['elasticsearch']="1.7.6 1.7 1 2.4.6 2.4 2 5.4.3 5.4 5.5.2 5.5 5.6.16 5.6 5 6.5.1 6.5.4 6.5 6.6 6.8.1 6.8.13 6.8 6 7.1.1 7.1 7.2.0 7.2 7.2.1 7.2 7.3.1 7.3.2 7.3 7.4.2 7.4 7.5.0 7.5.1 7.5.2 7.5 7.6.0 7.6.2 7.6 7.7.0 7.7.1 7.7 7.8.1 7.8 7.9.0 7.9.2 7.9.3 7.9 7.10.0 7.11.2 7.11 7.12.0 7.12 7.17.7 7 8.5.1 8.5.3 8.9.2 8.11.3"
-sem_services['postgres']="9.4.26 9.4 9.5.15 9.5.23 9.5 9.6.6 9.6.11 9.6.18 9.6.19 9.6 9 10.0 10.5 10.6 10.7 10.11 10.12 10.13 10.14 10.16 10 11.0 11.2 11.5 11.6 11.7 11.8 11.9 11.11 11 12.1 12.2 12.3 12.4 12.6 12 13.0 13.2 13 14 15.1 15 16 17.2 17.6 17"
+sem_services['postgres']="9.4.26 9.4 9.5.15 9.5.23 9.5 9.6.6 9.6.11 9.6.18 9.6.19 9.6 9 10.0 10.5 10.6 10.7 10.11 10.12 10.13 10.14 10.16 10 11.0 11.2 11.5 11.6 11.7 11.8 11.9 11.11 11 12.1 12.2 12.3 12.4 12.6 12 13.0 13.2 13 14 15.1 15 16 17.2 17.6 17 18.1 18"
 sem_services['rabbitmq']="3.6.16 3.6 3.8.2 3.8.9 3.8.14 3.8 3"
 sem_services['cassandra']="3.11.3 3.11.8 3.11 3"
 sem_services['rethinkdb']="2.3.6 2.3 2.4.1 2.4 2"

sem-service-check-params

@@ -49,33 +49,38 @@ params-check::mysql () {
   default_params="$default_params$username$password$db "
   echo "$service_version $default_params"
 }
-
 params-check::postgres () {
-  default_params='--net=host --rm -d -e POSTGRES_PASSWORD=semaphore --name postgres -v /var/tmp/postgres:/var/lib/postgresql/data -v /var/run/postgresql:/var/run/postgresql'
   service_version="9.6"
   sudo mkdir -p /var/run/postgresql && sudo chmod -R 0777 /var/run/postgresql
   sudo mkdir -p /var/tmp/postgres && sudo chmod -R 0777 /var/tmp/postgres
   params=""
-  if [ "${1:0:1}" == "-" ];then
+  if [ "${1:0:1}" == "-" ]; then
     params="$@"
   else
     service_version="${1:-$service_version}"
     tmp="${@:2}"
-    params="${tmp:-$default_params}"
+    params="$tmp"
   fi
-  if [ "$default_params" != "$params" ];then
+  version_major="$(printf '%s\n' "$service_version" | cut -d'.' -f1)"
+  version_major="${version_major:-0}"
+  default_params='--net=host --rm -d -e POSTGRES_PASSWORD=semaphore --name postgres -v /var/tmp/postgres:/var/lib/postgresql/data -v /var/run/postgresql:/var/run/postgresql'
+  if [ "$version_major" -ge 18 ]; then
+    default_params='--net=host --rm -d -e POSTGRES_PASSWORD=semaphore --name postgres -v /var/tmp/postgres:/var/lib/postgresql -v /var/run/postgresql:/var/run/postgresql'
+  fi
+  params="${params:-$default_params}"
+  if [ "$default_params" != "$params" ]; then
     username=""; password=""; db=""; dbname="";
     for words in $params; do
       case $words in
        --username=* )
-         username=" -e POSTGRES_USER=$(echo $words|cut -d'=' -f2) "
+         username=" -e POSTGRES_USER=$(echo "$words" | cut -d'=' -f2) "
        ;;
        --password=* )
-         password=$(echo $words|cut -d'=' -f2) 
+         password=$(echo "$words" | cut -d'=' -f2)
          password=" -e POSTGRES_PASSWORD=${password:-'postgres'}"
        ;;
        --db=* )
-         dbname=$(echo $words|cut -d'=' -f2)
+         dbname=$(echo "$words" | cut -d'=' -f2)
        ;;
        *)
        ;;
@@ -84,6 +89,7 @@ params-check::postgres () {
     [ "$dbname" ] && db=" -e POSTGRES_DB=$dbname"
     [ "$username$password" ] && default_params="$default_params$username$password$db "
   fi
+
   echo "$service_version $default_params"
 }
 params-check::postgis () {

tests/sem_service/postgres

@@ -65,4 +65,18 @@ psql -h 0.0.0.0 -U postgres -c "SELECT version()" | grep 17
 sem-service status postgres
 sem-service stop postgres
 
+sem-service start postgres 18.1
+createdb -U postgres -h 0.0.0.0 fooo
+psql -h 0.0.0.0 -U postgres -c "\l" | grep fooo
+psql -h 0.0.0.0 -U postgres -c "SELECT version()" | grep "18\.1"
+sem-service status postgres
+sem-service stop postgres
+
+sem-service start postgres 18
+createdb -U postgres -h 0.0.0.0 fooo
+psql -h 0.0.0.0 -U postgres -c "\l" | grep fooo
+psql -h 0.0.0.0 -U postgres -c "SELECT version()" | grep 18
+sem-service status postgres
+sem-service stop postgres
+
 cat /tmp/toolbox_semservice