fix: evaluate profile_default (#1767)

Author: jhaeu

.github/utils/yml_config_to_ors_config_conversion.sh

@@ -37,6 +37,8 @@ echo "- Uncomment ors, engine and source_file"
 sed -i -e '/^#ors:/s/^#//' -e '/^#.*engine:/s/^#//' -e '/^#.*source_file:/s/^#//' "$output_file"
 
 echo "- Uncomment subsequent lines for profiles.car.enabled in ors.engine"
-sed -i -e '/^#    profiles:/,/^#        enabled:/ s/^#//' "$output_file"
+sed -i -e '/^#    profiles:/s/^#//' "$output_file"
+sed -i -e '/^#      car:.*/s/^#//' "$output_file"
+sed -i -e '/^#        enabled: true/s/^#//' "$output_file"
 
 echo "Parsing complete. Result saved to $output_file"

.github/utils/yml_config_validation.sh

@@ -17,5 +17,5 @@ yq 'true' $input_file /dev/null || exit 1
 echo "- checking if ors.engine.source_file exists and has 'source_file' property"
 yq  --exit-status '.ors.engine | has("source_file")' $input_file > /dev/null || exit 1
 # For profiles section for car with enabled using yq and contains
-echo "- checking if ors.engine.profiles.car exists and has 'enabled' property"
-yq  --exit-status '.ors.engine.profiles.car | has("enabled")' $input_file > /dev/null || exit 1
+#echo "- checking if ors.engine.profiles.car exists and has 'enabled' property"
+#yq  --exit-status '.ors.engine.profiles.car | has("enabled")' $input_file > /dev/null || exit 1

.github/workflows/integration-tests.yml

@@ -62,7 +62,7 @@ jobs:
     strategy:
       matrix:
         runtype: [ '-m' , '-j' ]
-        testgroup: [ build-all-graphs*, arg-overrides*, check*, config*, lookup*, missing*, specify* ]
+        testgroup: [ build-all-graphs*, arg-overrides*, check*, config-json*, config-yml*, lookup*, missing*, ors-config*, specify-json*, specify-yml*, profile-default* ]
     steps:
       - uses: actions/checkout@v4
         with:

.integration-scenarios/debian-12-jar-mvn/files/testfunctions.sh

@@ -85,20 +85,46 @@ function expectOrsStartupFails() {
   fi
 }
 
+function assertSortedWordsEquals() {
+  expected=$1
+  received=$2
+  sorted_expected=$(echo "$expected" | tr ' ' '\n' | sort | tr '\n' ' ')
+  sorted_received=$(echo "$received" | tr ' ' '\n' | sort | tr '\n' ' ')
+  assertEquals "$sorted_expected" "$sorted_received"
+}
+
 function assertEquals() {
   expected=$1
   received=$2
+  check=$3
+  if [ -n "$check" ]; then checkMsg="Checking '$check': "; fi
   if [ "$expected" != "$received" ]; then
-    echo -e "${FG_RED}ASSERTION ERROR:${N}"
+    echo -e "${FG_RED}ASSERTION ERROR:${N} ${checkMsg}"
     echo -e "expected: '${FG_GRN}${expected}${N}'"
     echo -e "received: '${FG_RED}${received}${N}'"
     exit 1
   else
-    echo -e "${FG_GRN}received '$received' as expected${N}"
-    exit 0
+    echo -e "${FG_GRN}${checkMsg}Received '${received}' as expected${N}"
+  fi
+}
+
+function assertContains() {
+  expected=$1
+  received=$2
+  num=$(echo "${received}" | grep -c "${expected}")
+  if [[ $num -eq 0 ]]; then
+    echo -e "${FG_RED}ASSERTION ERROR:${N}: '${expected}' not contained as expected${N} $num"
+    exit 1
+  else
+    echo -e "${FG_GRN}'${expected}' is contained as expected${N}"
   fi
 }
 
+function requestStatusString() {
+  port=$1
+  echo $(curl --silent $(getOrsUrl $port)/status | jq . )
+}
+
 function requestEnabledProfiles() {
   port=$1
   echo $(curl --silent $(getOrsUrl $port)/status | jq -r '.profiles[].profiles')
@@ -153,7 +179,7 @@ function prepareTest() {
   if [ -z "$IMAGE" ]; then printError "missing param 2: docker image"; exit 1; fi
 
   CONTAINER=${runType}-$(removeExtension "$(basename $script)")
-  HOST_PORT=$(findFreePort 8082)
+  HOST_PORT=$(findFreePort 8083)
 
   mkdir -p ~/.m2
   M2_FOLDER="$(realpath ~/.m2)"
@@ -183,5 +209,5 @@ function makeTempFile() {
 
 function deleteTempFiles() {
   script=$1
-  rm "${TESTROOT}/tmp/${script}".*
+  rm "${TESTROOT}/tmp/${script}"*
 }

.integration-scenarios/debian-12-jar-mvn/run.sh

@@ -11,7 +11,7 @@ mvn=0
 verbose=0
 pattern=""
 
-function printCliHelp() { # TODO adapt
+function printCliHelp() {
   echo -e "\
 ${B}$SCRIPT${N} - run ors tests in containers
 
@@ -69,12 +69,15 @@ function runTest() {
     else
       $testscript "${runType}" "${imageName}" 1>/dev/null 2>&1
     fi
-
-    if (($?)); then
+    testStatus=$?
+    if [ $testStatus -eq 1 ]; then
       hasErrors=1
       ((failed++))
       echo -e "${FG_RED}${B}failed${N}"
       (($failFast)) && exit 1
+    elif [ $testStatus -eq 2 ]; then
+      ((skipped++))
+      echo -e "${FG_ORA}${B}skipped${N}"
     else
       ((passed++))
       echo -e "${FG_GRN}passed${N}"
@@ -142,6 +145,7 @@ mkdir -p "${TESTROOT}/graphs_volume"
 
 hasErrors=0
 passed=0
+skipped=0
 failed=0
 
 for word in $pattern; do
@@ -152,8 +156,9 @@ for word in $pattern; do
 done
 
 (($passed)) && passedText=", ${FG_GRN}${B}${passed} passed${N}"
+(($skipped)) && skippedText=", ${FG_ORA}${B}${skipped} skipped${N}"
 (($failed)) && failedText=", ${FG_RED}${B}${failed} failed${N}"
 
-total=$(($passed + $failed))
-echo -e "${FG_BLU}$(date +%Y-%m-%dT%H:%M:%S)${N} ${B}done, ${total} test$( (($total-1)) && echo "s") executed${passedText}${failedText}"
+total=$(($passed + $skipped + $failed))
+echo -e "${FG_BLU}$(date +%Y-%m-%dT%H:%M:%S)${N} ${B}done, ${total} test$( (($total-1)) && echo "s") executed${passedText}${skippedText}${failedText}"
 exit $hasErrors

.integration-scenarios/debian-12-jar-mvn/tests/arg-overrides-default-prop.sh

@@ -27,4 +27,4 @@ awaitOrsReady 60 "${HOST_PORT}"
 profiles=$(requestEnabledProfiles ${HOST_PORT})
 cleanupTest
 
-assertEquals 'driving-hgv driving-car' "${profiles}"
+assertSortedWordsEquals 'driving-hgv driving-car' "${profiles}"

.integration-scenarios/debian-12-jar-mvn/tests/build-all-graphs.sh

@@ -43,4 +43,4 @@ awaitOrsReady 300 "${HOST_PORT}"
 profiles=$(requestEnabledProfiles ${HOST_PORT})
 cleanupTest
 
-assertEquals "foot-walking wheelchair foot-hiking public-transport cycling-electric cycling-mountain driving-car driving-hgv cycling-regular cycling-road" "${profiles}"
+assertSortedWordsEquals "foot-walking wheelchair foot-hiking public-transport cycling-electric cycling-mountain driving-car driving-hgv cycling-regular cycling-road" "${profiles}"

…config-but-profile-enabled-as-env-dot.sh …t-profile-enabled-as-env-dot-jar-only.sh.integration-scenarios/debian-12-jar-mvn/tests/_only-jar-missing-config-but-profile-enabled-as-env-dot.sh renamed to .integration-scenarios/debian-12-jar-mvn/tests/missing-config-but-profile-enabled-as-env-dot-jar-only.sh .integration-scenarios/debian-12-jar-mvn/tests/_only-jar-missing-config-but-profile-enabled-as-env-dot.sh renamed to .integration-scenarios/debian-12-jar-mvn/tests/missing-config-but-profile-enabled-as-env-dot-jar-only.sh

@@ -5,6 +5,11 @@ source $TESTROOT/files/testfunctions.sh
 source $TESTROOT/files/test.conf
 prepareTest $(basename $0) $*
 
+if [ "$runType" = "mvn" ]; then
+  echo "skipping - mvn does not support env variables with dot notation"
+  exit 2;
+fi
+
 # Even if no yml config file is present, the ors is runnable
 # if at least one routing profile is enabled with a environment variable.
 podman run --replace --name "${CONTAINER}" -p "${HOST_PORT}":8082 \