Browse Source

fix: dev: [odoo-tecnativa] prefer ``relation:get``

pull/48/head
Valentin Lab 2 weeks ago
parent
commit
1f06bd1d34
  1. 23
      odoo-tecnativa/actions/load
  2. 23
      odoo-tecnativa/actions/save

23
odoo-tecnativa/actions/load

@ -64,26 +64,9 @@ version:lt() { ! version:ge "$@"; }
if [ -z "$dbname" ]; then
##
## Fetch default dbname in relation to postgres-database
##
## XXXvlab: can't get real config here
if ! read-0 ts _ _ < <(get_service_relation "$SERVICE_NAME" "postgres-database"); then
err "Couldn't find relation ${DARKCYAN}postgres-database${NORMAL}."
exit 1
fi
relation_file=$(get_relation_data_dir "$SERVICE_NAME" "$ts" "postgres-database") || {
err "Failed to find relation file"
exit 1
}
postgres_config=$(cat "$relation_file"/data) || exit 2
dbname="$(e "$postgres_config" | shyaml get-value dbname)" || {
err "Couldn't retrieve information of ${DARKCYAN}postgres-database${NORMAL}'s relation."
dbname=$(relation:get "$SERVICE_NAME:postgres-database" dbname) || {
err "Couldn't retrieve information of" \
"${DARKYELLOW}$SERVICE_NAME${NORMAL}-->${DARKCYAN}postgres-database${NORMAL}."
exit 1
}
fi

23
odoo-tecnativa/actions/save

@ -56,26 +56,9 @@ done
if [ -z "$dbname" ]; then
##
## Fetch default dbname in relation to postgres-database
##
## XXXvlab: can't get real config here
if ! read-0 ts _ _ < <(get_service_relation "$SERVICE_NAME" "postgres-database"); then
err "Couldn't find relation ${DARKCYAN}postgres-database${NORMAL}."
exit 1
fi
relation_file=$(get_relation_data_dir "$SERVICE_NAME" "$ts" "postgres-database") || {
err "Failed to find relation file"
exit 1
}
postgres_config=$(cat "$relation_file"/data) || exit 2
dbname="$(e "$postgres_config" | shyaml get-value dbname)" || {
err "Couldn't retrieve information of ${DARKCYAN}mysql-database${NORMAL}'s relation."
dbname=$(relation:get "$SERVICE_NAME:postgres-database" dbname) || {
err "Couldn't retrieve information of" \
"${DARKYELLOW}$SERVICE_NAME${NORMAL}-->${DARKCYAN}postgres-database${NORMAL}."
exit 1
}
fi

Loading…
Cancel
Save