From d5bcb9ba5730b8297756b34ee7b53b071a3fb08e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mr=C3=A1zek?= Date: Thu, 11 Jul 2024 14:36:20 +0200 Subject: [PATCH] manager: scripts moved to the repository root --- {manager/scripts => scripts}/_env.sh | 13 +++++-------- {manager/scripts => scripts}/codecheck | 8 ++++---- {manager/scripts => scripts}/create_setup.py | 0 {manager/scripts => scripts}/docs | 4 ++-- {manager/scripts => scripts}/examples | 2 +- {manager/scripts => scripts}/install.sh | 0 {manager/scripts => scripts}/make-package.sh | 0 {manager/scripts => scripts}/man | 0 {manager/scripts => scripts}/meson-configure | 6 ++---- {manager/scripts => scripts}/run | 14 +++++++------- {manager/scripts => scripts}/run-debug | 0 11 files changed, 21 insertions(+), 26 deletions(-) rename {manager/scripts => scripts}/_env.sh (85%) rename {manager/scripts => scripts}/codecheck (87%) rename {manager/scripts => scripts}/create_setup.py (100%) rename {manager/scripts => scripts}/docs (65%) rename {manager/scripts => scripts}/examples (76%) rename {manager/scripts => scripts}/install.sh (100%) rename {manager/scripts => scripts}/make-package.sh (100%) rename {manager/scripts => scripts}/man (100%) rename {manager/scripts => scripts}/meson-configure (51%) rename {manager/scripts => scripts}/run (68%) rename {manager/scripts => scripts}/run-debug (100%) diff --git a/manager/scripts/_env.sh b/scripts/_env.sh similarity index 85% rename from manager/scripts/_env.sh rename to scripts/_env.sh index cabc0025c..5f38a27be 100644 --- a/manager/scripts/_env.sh +++ b/scripts/_env.sh @@ -15,7 +15,7 @@ if test -z "$gitroot"; then echo -e "${red}This command can be run only in a git repository tree.${reset}" exit 1 fi -cd $gitroot/manager +cd $gitroot # ensure consistent environment with virtualenv if test -z "$VIRTUAL_ENV" -a "$CI" != "true" -a -z "$KNOT_ENV"; then @@ -34,19 +34,17 @@ PATH="$PATH:$gitroot/node_modules/.bin" # fail even on unbound variables set -o nounset - function build_kresd { - pushd .. - if [ -d manager/.build_kresd ]; then + if [ -d .build_kresd ]; then echo echo Building Knot Resolver echo ---------------------- echo -e "${blue}In case of an compilation error, run this command to try to fix it:${reset}" echo -e "\t${blue}rm -r $(realpath .install_kresd) $(realpath .build_kresd)${reset}" echo - ninja -C manager/.build_kresd - ninja install -C manager/.build_kresd - export PYTHONPATH="$(realpath manager/.build_kresd/python):${PYTHONPATH:-}" + ninja -C .build_kresd + ninja install -C .build_kresd + export PYTHONPATH="$(realpath .build_kresd/python):${PYTHONPATH:-}" else echo echo Knot Resolver daemon is not configured. @@ -54,5 +52,4 @@ function build_kresd { echo exit 2 fi - popd } diff --git a/manager/scripts/codecheck b/scripts/codecheck similarity index 87% rename from manager/scripts/codecheck rename to scripts/codecheck index 3045d1562..08ce18a89 100755 --- a/manager/scripts/codecheck +++ b/scripts/codecheck @@ -32,25 +32,25 @@ fi # check formatting using black echo -e "${yellow}Checking formatting using black...${reset}" -black knot_resolver_manager tests scripts --check --diff +black manager/knot_resolver_manager tests/manager scripts/create_setup.py --check --diff check_rv $? echo # check code with pylint echo -e "${yellow}Linting using pylint...${reset}" -pylint knot_resolver_manager +pylint manager/knot_resolver_manager check_rv $? echo # check code with flake8 echo -e "${yellow}Linting using flake8...${reset}" -flake8 --ignore=E266,W503 knot_resolver_manager +flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 manager/knot_resolver_manager check_rv $? echo # check types with mypy echo -e "${yellow}Type checking using mypy...${reset}" -mypy knot_resolver_manager +mypy manager/knot_resolver_manager check_rv $? echo diff --git a/manager/scripts/create_setup.py b/scripts/create_setup.py similarity index 100% rename from manager/scripts/create_setup.py rename to scripts/create_setup.py diff --git a/manager/scripts/docs b/scripts/docs similarity index 65% rename from manager/scripts/docs rename to scripts/docs index 10c83d8fc..d15c074eb 100755 --- a/manager/scripts/docs +++ b/scripts/docs @@ -3,8 +3,8 @@ # ensure consistent behaviour src_dir="$(dirname "$(realpath "$0")")" source $src_dir/_env.sh -cd .. -echo Building documentation for Knot Resolver +echo Building Knot Resolver documentation +echo ------------------------------------ meson build_doc -Ddoc=enabled ninja -C build_doc doc diff --git a/manager/scripts/examples b/scripts/examples similarity index 76% rename from manager/scripts/examples rename to scripts/examples index a5de766eb..45f224368 100755 --- a/manager/scripts/examples +++ b/scripts/examples @@ -5,7 +5,7 @@ src_dir="$(dirname "$(realpath "$0")")" source $src_dir/_env.sh # validate all configuration examples -for example in $PWD/etc/knot-resolver/config.example.*.yaml; +for example in $PWD/etc/config/config.example.*.yaml; do poe kresctl validate --no-strict $example; done diff --git a/manager/scripts/install.sh b/scripts/install.sh similarity index 100% rename from manager/scripts/install.sh rename to scripts/install.sh diff --git a/manager/scripts/make-package.sh b/scripts/make-package.sh similarity index 100% rename from manager/scripts/make-package.sh rename to scripts/make-package.sh diff --git a/manager/scripts/man b/scripts/man similarity index 100% rename from manager/scripts/man rename to scripts/man diff --git a/manager/scripts/meson-configure b/scripts/meson-configure similarity index 51% rename from manager/scripts/meson-configure rename to scripts/meson-configure index 3bebe4d8c..452b1a3bc 100755 --- a/manager/scripts/meson-configure +++ b/scripts/meson-configure @@ -4,12 +4,10 @@ src_dir="$(dirname "$(realpath "$0")")" source $src_dir/_env.sh -pushd .. reconfigure='' -if [ -f manager/.build_kresd/ninja.build ]; then +if [ -f .build_kresd/ninja.build ]; then reconfigure='--reconfigure' fi -meson setup manager/.build_kresd "$reconfigure" --prefix=$(realpath manager/.install_kresd) "$@" -popd +meson setup .build_kresd "$reconfigure" --prefix=$(realpath .install_kresd) "$@" build_kresd diff --git a/manager/scripts/run b/scripts/run similarity index 68% rename from manager/scripts/run rename to scripts/run index 2080ce2a2..c1bdf78b8 100755 --- a/manager/scripts/run +++ b/scripts/run @@ -14,8 +14,8 @@ poetry build shopt -s globstar shopt -s nullglob for d in build/lib*; do - for f in "$d/"**/*.so; do - cp -v "$f" ${f#"$d/"} + for f in "manager/$d/"**/*.so; do + cp -v "$f" ${f#"manager/$d/"} done done shopt -u globstar @@ -26,17 +26,17 @@ echo Knot Manager API is accessible on http://localhost:5000 echo ------------------------------------------------------- # create runtime directories -if [ -z "${KRES_MANAGER_RUNTIME:-}" ]; then - KRES_MANAGER_RUNTIME="etc/knot-resolver" +if [ -z "${KRES_CONFIG_DIR:-}" ]; then + KRES_CONFIG_DIR="etc/config" fi -mkdir -p "$KRES_MANAGER_RUNTIME/runtime" "$KRES_MANAGER_RUNTIME/cache" +mkdir -p "$KRES_CONFIG_DIR/runtime" "$KRES_CONFIG_DIR/cache" if [ -z "${KRES_MANAGER_CONFIG:-}" ]; then - KRES_MANAGER_CONFIG="$KRES_MANAGER_RUNTIME/config.dev.yaml" + KRES_MANAGER_CONFIG="$KRES_CONFIG_DIR/config.dev.yaml" fi if [ -z "${KRES_MANAGER_API_SOCK:-}" ]; then - KRES_MANAGER_API_SOCK="$KRES_MANAGER_RUNTIME/manager.sock" + KRES_MANAGER_API_SOCK="$KRES_CONFIG_DIR/manager.sock" fi export KRES_MANAGER_CONFIG diff --git a/manager/scripts/run-debug b/scripts/run-debug similarity index 100% rename from manager/scripts/run-debug rename to scripts/run-debug -- 2.47.2