feat: config migration and graph repo client

.dockerignore

@@ -1,40 +1,19 @@
-.metadata/
-.git
-.gitignore
-**/*.pbf
-
-.idea/
-*.iml
-.DS_Store
-nohup.out
-.python-version
-.project
-
-# Ignore all ors and app config files except for the sample ones
-ors-api/src/main/resources/ors-config*
+# Ignore all files
+**
+# Include the following files
+!pom.xml
+!ors-engine/pom.xml
+!ors-engine/src/main
+!ors-api/pom.xml
+!ors-api/src/main/
+!ors-report-aggregation/pom.xml
+!ors-test-scenarios/pom.xml
+# Special includes
+!ors-config.env
+!ors-config.yml
+!docker-entrypoint.sh
+!ors-test-scenarios/src/test/resources/maven-entrypoint.sh
+!ors-api/src/test/files/heidelberg.test.pbf
+!ors-api/src/test/files/elevation/srtm_38_03.gh
+!ors-api/src/test/files/vrn_gtfs_cut.zip
 !ors-api/src/main/resources/ors-config-sample.json
-
-# no tests
-ors-api/src/test
-!ors-api/src/test/files/heidelberg.osm.gz
-ors-engine/src/test
-
-# folders generated by integration test runs
-ors-api/graphs-apitests
-ors-api/logs
-
-ors-api/target/
-ors-engine/target/
-ors-docker/**
-
-cgiar_provider/
-cgiar_cache/
-graphs/
-build/
-logs/
-docker/
-docs/
-.github/
-Dockerfile
-envs/
-.jqwik-database

.github/utils/yml_config_to_ors_config_conversion.sh

@@ -8,37 +8,31 @@ fi
 input_file=$1
 output_file=$2
 
-echo ""
-echo "Copy $input_file to $output_file"
-cp $input_file $output_file
-
-###########################
-### Replace parameters ####
-###########################
-echo ""
-echo "Replace parameters:"
-
-echo "- enable ors.engine.profiles.car"
-yq -i '.ors.engine.profiles.car.enabled = true' "$output_file" || exit 1
-
-echo "- set ors.engine.source_file to ors-api/src/test/files/heidelberg.osm.gz"
-yq -i '.ors.engine.source_file = "ors-api/src/test/files/heidelberg.osm.gz"' "$output_file" || exit 1
-
-###########################
-### Convert input file ####
-###########################
-echo ""
-echo "Converting input file:"
-## Add # to the beginning of each line that is not empty or a comment
-echo "- Comment everything"
-sed -i '/^\s*[^#]/ s/^/#/' "$output_file" || exit 1
-
-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:/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"
+echo "Generate minimal sample configuration..."
+
+echo "\
+################################################################################################
+### Minimal configuration example file for openrouteservice. For a description please visit: ###
+### https://giscience.github.io/openrouteservice/run-instance/configuration/                 ###
+################################################################################################" > ${output_file}
+
+yq --null-input '
+(.ors.engine.profile_default.build.source_file = "ors-api/src/test/files/heidelberg.test.pbf" )|
+(.ors.engine.profiles.driving-car.enabled = true )
+' >> ${output_file}
+
+
+echo "Prepare all properties to be added as commented text..."
+tmpYml=$(mktemp "prepare.XXXXXXXXX.yml")
+cp ${input_file} ${tmpYml}
+echo "Copied ${input_file} to ${tmpYml}"
+echo "Remove config properties that should not be added.."
+yq -i 'del(.ors.engine.graph_management)' ${tmpYml} || exit 1
+yq -i 'del(.ors.engine.profile_default.repo)' ${tmpYml} || exit 1
+
+echo "Append commented application.yml..."
+echo "" >> ${output_file}
+sed '/^\s*[^#]/ s/^/#/' ${tmpYml} >> ${output_file}
+
+echo "Remove temporary file ${tmpYml}..."
+rm ${tmpYml}

.github/utils/yml_config_to_properties_conversion.sh

@@ -18,12 +18,17 @@ cp $input_file $output_file
 echo ""
 echo "Replace parameters:"
 
-echo "- enable ors.engine.profiles.car"
-yq -i '.ors.engine.profiles.car.enabled = true' "$output_file" || exit 1
+echo "- enable ors.engine.profiles.driving-car"
+yq -i '.ors.engine.profiles.driving-car.enabled = true' "$output_file" || exit 1
 
-echo "- set ors.engine.source_file to ors-api/src/test/files/heidelberg.osm.gz"
-yq -i '.ors.engine.source_file = "ors-api/src/test/files/heidelberg.osm.gz"' "$output_file" || exit 1
+echo "- set ors.engine.profile_default.build.source_file to ors-api/src/test/files/heidelberg.test.pbf"
+yq -i '.ors.engine.profile_default.build.source_file = "ors-api/src/test/files/heidelberg.test.pbf"' "$output_file" || exit 1
 
+echo "- remove .ors.engine.graph_management"
+yq -i 'del(.ors.engine.graph_management)' "$output_file" || exit 1
+
+echo "- remove .ors.engine.profile_default.repo"
+yq -i 'del(.ors.engine.profile_default.repo)' "$output_file" || exit 1
 
 ###########################
 ### Convert input file ####
@@ -37,24 +42,24 @@ yq -i -o=props --unwrapScalar=false '..  | select(tag != "!!map" and tag != "!!s
 echo "- Comment everything"
 sed -i '/^\s*[^#]/ s/^/#/' "$output_file" || exit 1
 
-echo "- Uncomment ors.engine.source_file and ors.engine.profiles.car.enabled"
-sed -i -e '/^#ors.engine.source_file/s/^#//' -e '/^#ors.engine.profiles.car.enabled/s/^#//' "$output_file" || exit 1
+echo "- Uncomment ors.engine.profile_default.build.source_file and ors.engine.profiles.driving-car.enabled"
+sed -i -e '/^#ors.engine.profile_default.build.source_file/s/^#//' -e '/^#ors.engine.profiles.driving-car.enabled/s/^#//' "$output_file" || exit 1
 
 ############################
 ### Validate output file ###
 ############################
 echo ""
 echo "Validate output file:"
-echo "- checking for ors.engine.source_file=ors-api/src/test/files/heidelberg.osm.gz"
-return_value=$(sed -n '/^ors.engine.source_file=ors-api\/src\/test\/files\/heidelberg.osm.gz/p' $output_file)|| exit 1
+echo "- checking for ors.engine.profile_default.source_file=ors-api/src/test/files/heidelberg.test.pbf"
+return_value=$(sed -n '/^ors.engine.profile_default.build.source_file=ors-api\/src\/test\/files\/heidelberg.test.pbf/p' $output_file)|| exit 1
 if [ -z "$return_value" ]; then
-  echo "ors.engine.source_file=ors-api/src/test/files/heidelberg.osm.gz not found"
+  echo "ors.engine.source_file=ors-api/src/test/files/heidelberg.test.pbf not found"
   exit 1
 fi
-echo "- checking for ors.engine.profiles.car.enabled=true"
-return_value=$(sed -n '/^ors.engine.profiles.car.enabled=true/p' $output_file) || exit 1
+echo "- checking for ors.engine.profiles.driving-car.enabled=true"
+return_value=$(sed -n '/^ors.engine.profiles.driving-car.enabled=true/p' $output_file) || exit 1
 if [ -z "$return_value" ]; then
-  echo "ors.engine.profiles.car.enabled=true not found"
+  echo "ors.engine.profiles.driving-car.enabled=true not found"
   exit 1
 fi
 

.github/utils/yml_config_validation.sh

@@ -14,8 +14,5 @@ echo "Validate input file:"
 echo "- checking if the input file is a valid yaml file"
 yq 'true' $input_file /dev/null || exit 1
 # Fail if ors.engine.profiles.car.enabled='false' can't be found access with schema .result    | select(.property_history != null)    | .property_history    | map(select(.event_name == "Sold"))[0].date'
-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.profile_default.build exists and has 'source_file' property"
+yq  --exit-status '.ors.engine.profile_default.build | has("source_file")' $input_file > /dev/null || exit 1