Skip to content

Update osmt_cli.sh to check for mysql client before loading static CI dataset #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnKallies merged 1 commit into from
Mar 10, 2023
Merged

Update osmt_cli.sh to check for mysql client before loading static CI dataset #325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions osmt_cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ _validate_git() {
echo_err "$(basename "${0}") requires git to run commands for the correct directories."
return 1
fi

}

_validate_docker_version() {
Expand Down Expand Up @@ -159,6 +158,22 @@ _validate_java_version() {
fi
}

_validate_mysql_client() {
echo
echo_info "Checking for mysql client..."

# no specific version of mysql is required
which mysql &> /dev/null
if [[ $? -eq 0 ]]; then
echo_info "MySQL client detected at $(which mysql)"
mysql --version
else
echo_err "mysql not found on path. Use 'which mysql' to confirm."
echo_err "$(basename "${0}") requires the mysql client to run commands for loading the static CI dataset."
return 1
fi
}

_validate_osmt_dev_dependencies() {
local -i is_dependency_valid=0
_validate_java_version || is_dependency_valid+=1
Expand Down Expand Up @@ -243,6 +258,7 @@ validate_osmt_environment() {
_validate_git || is_environment_valid+=1
_validate_docker_version || is_environment_valid+=1
_validate_osmt_dev_dependencies || is_environment_valid+=1
_validate_mysql_client || is_environment_valid+=1

echo
echo_info "Checking environment files used in local OSMT instances..."
Expand Down Expand Up @@ -368,17 +384,19 @@ start_osmt_dev_spring_app() {
}

load_static_ci_dataset(){
local -i rc
echo
echo_info "Loading static CI dataset into MySQL database ${DB_NAME} at ${DB_HOST}:${DB_PORT}"
echo
_validate_mysql_client || return 1

local -i db_container_count; db_container_count="$(docker ps -q --filter name=${OSMT_STACK_NAME}_db_1 | wc -l)"
if [[ "${db_container_count}" -ne 1 ]]; then
echo_err "Development Docker stack MySQL container is not running. Exiting..."
return 1
fi

local sql_file="${project_dir}/test/sql/fixed_ci_dataset.sql"
local -i rc

mysql \
--host="${DB_HOST}" \
Expand Down