]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
manager: moved everything out of the directory
authorAleš Mrázek <ales.mrazek@nic.cz>
Tue, 6 Aug 2024 09:07:53 +0000 (11:07 +0200)
committerAleš Mrázek <ales.mrazek@nic.cz>
Fri, 6 Sep 2024 22:28:31 +0000 (00:28 +0200)
122 files changed:
.gitlab-ci.manager.yml [moved from manager/.gitlab-ci.yml with 88% similarity]
.gitlab-ci.yml
ARCHITECTURE.md [moved from manager/ARCHITECTURE.md with 100% similarity]
ERROR_HANDLING.md [moved from manager/ERROR_HANDLING.md with 100% similarity]
build_c_extensions.py
pyproject.toml
python/knot_resolver_manager/__init__.py [moved from manager/knot_resolver_manager/__init__.py with 100% similarity]
python/knot_resolver_manager/__main__.py [moved from manager/knot_resolver_manager/__main__.py with 100% similarity]
python/knot_resolver_manager/cli/__init__.py [moved from manager/knot_resolver_manager/cli/__init__.py with 100% similarity]
python/knot_resolver_manager/cli/__main__.py [moved from manager/knot_resolver_manager/cli/__main__.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/cache.py [moved from manager/knot_resolver_manager/cli/cmd/cache.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/completion.py [moved from manager/knot_resolver_manager/cli/cmd/completion.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/config.py [moved from manager/knot_resolver_manager/cli/cmd/config.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/convert.py [moved from manager/knot_resolver_manager/cli/cmd/convert.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/help.py [moved from manager/knot_resolver_manager/cli/cmd/help.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/metrics.py [moved from manager/knot_resolver_manager/cli/cmd/metrics.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/reload.py [moved from manager/knot_resolver_manager/cli/cmd/reload.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/schema.py [moved from manager/knot_resolver_manager/cli/cmd/schema.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/stop.py [moved from manager/knot_resolver_manager/cli/cmd/stop.py with 100% similarity]
python/knot_resolver_manager/cli/cmd/validate.py [moved from manager/knot_resolver_manager/cli/cmd/validate.py with 100% similarity]
python/knot_resolver_manager/cli/command.py [moved from manager/knot_resolver_manager/cli/command.py with 100% similarity]
python/knot_resolver_manager/cli/kresctl.py [moved from manager/knot_resolver_manager/cli/kresctl.py with 100% similarity]
python/knot_resolver_manager/cli/main.py [moved from manager/knot_resolver_manager/cli/main.py with 100% similarity]
python/knot_resolver_manager/compat/__init__.py [moved from manager/knot_resolver_manager/compat/__init__.py with 100% similarity]
python/knot_resolver_manager/compat/asyncio.py [moved from manager/knot_resolver_manager/compat/asyncio.py with 100% similarity]
python/knot_resolver_manager/config_store.py [moved from manager/knot_resolver_manager/config_store.py with 100% similarity]
python/knot_resolver_manager/constants.py [moved from manager/knot_resolver_manager/constants.py with 100% similarity]
python/knot_resolver_manager/datamodel/__init__.py [moved from manager/knot_resolver_manager/datamodel/__init__.py with 100% similarity]
python/knot_resolver_manager/datamodel/cache_schema.py [moved from manager/knot_resolver_manager/datamodel/cache_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/config_schema.py [moved from manager/knot_resolver_manager/datamodel/config_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/design-notes.yml [moved from manager/knot_resolver_manager/datamodel/design-notes.yml with 100% similarity]
python/knot_resolver_manager/datamodel/dns64_schema.py [moved from manager/knot_resolver_manager/datamodel/dns64_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/dnssec_schema.py [moved from manager/knot_resolver_manager/datamodel/dnssec_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/forward_schema.py [moved from manager/knot_resolver_manager/datamodel/forward_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/globals.py [moved from manager/knot_resolver_manager/datamodel/globals.py with 100% similarity]
python/knot_resolver_manager/datamodel/local_data_schema.py [moved from manager/knot_resolver_manager/datamodel/local_data_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/logging_schema.py [moved from manager/knot_resolver_manager/datamodel/logging_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/lua_schema.py [moved from manager/knot_resolver_manager/datamodel/lua_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/management_schema.py [moved from manager/knot_resolver_manager/datamodel/management_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/monitoring_schema.py [moved from manager/knot_resolver_manager/datamodel/monitoring_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/network_schema.py [moved from manager/knot_resolver_manager/datamodel/network_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/options_schema.py [moved from manager/knot_resolver_manager/datamodel/options_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/policy_schema.py [moved from manager/knot_resolver_manager/datamodel/policy_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/rpz_schema.py [moved from manager/knot_resolver_manager/datamodel/rpz_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/slice_schema.py [moved from manager/knot_resolver_manager/datamodel/slice_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/static_hints_schema.py [moved from manager/knot_resolver_manager/datamodel/static_hints_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/stub_zone_schema.py [moved from manager/knot_resolver_manager/datamodel/stub_zone_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/templates/__init__.py [moved from manager/knot_resolver_manager/datamodel/templates/__init__.py with 100% similarity]
python/knot_resolver_manager/datamodel/templates/cache.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/cache.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/dns64.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/forward.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/forward.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/local_data.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/local_data.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/logging.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/logging.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/network.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/network.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/options.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/options.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/views.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/views.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 [moved from manager/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 with 100% similarity]
python/knot_resolver_manager/datamodel/types/__init__.py [moved from manager/knot_resolver_manager/datamodel/types/__init__.py with 100% similarity]
python/knot_resolver_manager/datamodel/types/base_types.py [moved from manager/knot_resolver_manager/datamodel/types/base_types.py with 100% similarity]
python/knot_resolver_manager/datamodel/types/enums.py [moved from manager/knot_resolver_manager/datamodel/types/enums.py with 100% similarity]
python/knot_resolver_manager/datamodel/types/files.py [moved from manager/knot_resolver_manager/datamodel/types/files.py with 100% similarity]
python/knot_resolver_manager/datamodel/types/generic_types.py [moved from manager/knot_resolver_manager/datamodel/types/generic_types.py with 100% similarity]
python/knot_resolver_manager/datamodel/types/types.py [moved from manager/knot_resolver_manager/datamodel/types/types.py with 100% similarity]
python/knot_resolver_manager/datamodel/view_schema.py [moved from manager/knot_resolver_manager/datamodel/view_schema.py with 100% similarity]
python/knot_resolver_manager/datamodel/webmgmt_schema.py [moved from manager/knot_resolver_manager/datamodel/webmgmt_schema.py with 100% similarity]
python/knot_resolver_manager/exceptions.py [moved from manager/knot_resolver_manager/exceptions.py with 100% similarity]
python/knot_resolver_manager/kres_manager.py [moved from manager/knot_resolver_manager/kres_manager.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/__init__.py [moved from manager/knot_resolver_manager/kresd_controller/__init__.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/interface.py [moved from manager/knot_resolver_manager/kresd_controller/interface.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/registered_workers.py [moved from manager/knot_resolver_manager/kresd_controller/registered_workers.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/__init__.py [moved from manager/knot_resolver_manager/kresd_controller/supervisord/__init__.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/config_file.py [moved from manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py [moved from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py [moved from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c [moved from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py [moved from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py [moved from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py with 100% similarity]
python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 [moved from manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 with 100% similarity]
python/knot_resolver_manager/log.py [moved from manager/knot_resolver_manager/log.py with 100% similarity]
python/knot_resolver_manager/main.py [moved from manager/knot_resolver_manager/main.py with 100% similarity]
python/knot_resolver_manager/server.py [moved from manager/knot_resolver_manager/server.py with 100% similarity]
python/knot_resolver_manager/statistics.py [moved from manager/knot_resolver_manager/statistics.py with 100% similarity]
python/knot_resolver_manager/utils/__init__.py [moved from manager/knot_resolver_manager/utils/__init__.py with 100% similarity]
python/knot_resolver_manager/utils/async_utils.py [moved from manager/knot_resolver_manager/utils/async_utils.py with 100% similarity]
python/knot_resolver_manager/utils/custom_atexit.py [moved from manager/knot_resolver_manager/utils/custom_atexit.py with 100% similarity]
python/knot_resolver_manager/utils/etag.py [moved from manager/knot_resolver_manager/utils/etag.py with 100% similarity]
python/knot_resolver_manager/utils/functional.py [moved from manager/knot_resolver_manager/utils/functional.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/README.md [moved from manager/knot_resolver_manager/utils/modeling/README.md with 100% similarity]
python/knot_resolver_manager/utils/modeling/__init__.py [moved from manager/knot_resolver_manager/utils/modeling/__init__.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py [moved from manager/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/base_schema.py [moved from manager/knot_resolver_manager/utils/modeling/base_schema.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/base_value_type.py [moved from manager/knot_resolver_manager/utils/modeling/base_value_type.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/exceptions.py [moved from manager/knot_resolver_manager/utils/modeling/exceptions.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/json_pointer.py [moved from manager/knot_resolver_manager/utils/modeling/json_pointer.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/parsing.py [moved from manager/knot_resolver_manager/utils/modeling/parsing.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/query.py [moved from manager/knot_resolver_manager/utils/modeling/query.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/renaming.py [moved from manager/knot_resolver_manager/utils/modeling/renaming.py with 100% similarity]
python/knot_resolver_manager/utils/modeling/types.py [moved from manager/knot_resolver_manager/utils/modeling/types.py with 100% similarity]
python/knot_resolver_manager/utils/requests.py [moved from manager/knot_resolver_manager/utils/requests.py with 100% similarity]
python/knot_resolver_manager/utils/systemd_notify.py [moved from manager/knot_resolver_manager/utils/systemd_notify.py with 100% similarity]
python/knot_resolver_manager/utils/which.py [moved from manager/knot_resolver_manager/utils/which.py with 100% similarity]
scripts/meson/make-doc.sh
scripts/poe-tasks/check
scripts/poe-tasks/format
scripts/poe-tasks/run
scripts/poe-tasks/test
setup.py
utils/shell-completion/client.bash [moved from manager/shell-completion/client.bash with 100% similarity]
utils/shell-completion/client.fish [moved from manager/shell-completion/client.fish with 100% similarity]
utils/shell-completion/meson.build [moved from manager/shell-completion/meson.build with 100% similarity]

similarity index 88%
rename from manager/.gitlab-ci.yml
rename to .gitlab-ci.manager.yml
index 369035c8b0f6eb3d7e3561bad90f6bda9c9b3426..cc94c0bf33d5ff1c30073fc5d00869db6b2c2a75 100644 (file)
@@ -4,7 +4,6 @@ stages:
 default:
   image: $IMAGE_PREFIX/manager:$IMAGE_TAG
   before_script:
-    - cd manager
     - poetry --version
     - poetry env use $PYTHON_INTERPRETER
   tags:
@@ -36,15 +35,15 @@ lint:py3.12:
     - mkdir -p /var/cache/knot-resolver
     - poe test
     # the following command makes sure that the source root of the coverage file is at $gitroot
-    - poetry run bash -c "cd ..; coverage combine manager/.coverage; coverage xml"
+    - poetry run bash -c "coverage combine .coverage; coverage xml"
   artifacts:
     reports:
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
-      junit: manager/unit.junit.xml
+      junit: unit.junit.xml
     paths:
-      - manager/unit.junit.xml
+      - unit.junit.xml
 
 unit:py3.8:
   <<: *unit
index e34ba7e093532150869f014b156949093148968f..12222fe26ae7eedf529c55a8eccb27fae2136488 100644 (file)
@@ -381,7 +381,7 @@ manager:
   stage: test
   needs: []
   trigger:
-    include: manager/.gitlab-ci.yml
+    include: .gitlab-ci.manager.yml
     strategy: depend
   except:
     refs:
similarity index 100%
rename from manager/ARCHITECTURE.md
rename to ARCHITECTURE.md
similarity index 100%
rename from manager/ERROR_HANDLING.md
rename to ERROR_HANDLING.md
index 40d281f5aeb07b1149a8cc0587d298793590a34d..ad63013a3a748a19e90c2cdf552764750b961007 100644 (file)
@@ -9,7 +9,7 @@ def build(setup_kwargs: Dict[Any, Any]) -> None:
             "ext_modules": [
                 Extension(
                     name="knot_resolver_manager.kresd_controller.supervisord.plugin.notify",
-                    sources=["manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c"],
+                    sources=["python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c"],
                 ),
             ]
         }
index 2a4bedf26c6cc6f824aaf6ba4eaa74ea8891c7e2..013b300d03dec26938b10177def680190b42e711 100644 (file)
@@ -16,7 +16,7 @@ repository = "https://gitlab.nic.cz/knot/knot-resolver"
 documentation = "https://www.knot-resolver.cz/documentation"
 
 packages = [
-    {include = "knot_resolver_manager", from = "manager"}
+    {include = "knot_resolver_manager", from = "python"}
 ]
 
 # See currently open issue about building C extensions here:
index aecf041078c68a344bc5eb42b9418858f947bac0..a472d4cba8fabb3b25d464e93f7d69840e63c00b 100755 (executable)
@@ -4,7 +4,7 @@ set -o errexit -o nounset
 cd "$(dirname "${0}")/../.."
 
 # generate JSON schema for the manager's declarative config
-pushd manager
+pushd python
 ## the following python command should hopefully run without any dependencies except for standard python
 mkdir -p ../doc/_static/
 python3 -m knot_resolver_manager.cli schema > ../doc/_static/config.schema.json
index ff7bdf9fd62437ebb177c4232c9284288b4415ad..49491c11e5e033203a13a768cfa4530c433bdc0b 100755 (executable)
@@ -32,25 +32,25 @@ fi
 
 # check formatting using black
 echo -e "${yellow}Checking formatting using black...${reset}"
-black manager/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff
+black python/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff
 check_rv $?
 echo
 
 # check code with pylint
 echo -e "${yellow}Linting using pylint...${reset}"
-pylint manager/knot_resolver_manager
+pylint python/knot_resolver_manager
 check_rv $?
 echo
 
 # check code with flake8
 echo -e "${yellow}Linting using flake8...${reset}"
-flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 manager/knot_resolver_manager
+flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 python/knot_resolver_manager
 check_rv $?
 echo
 
 # check types with mypy
 echo -e "${yellow}Type checking using mypy...${reset}"
-mypy manager/knot_resolver_manager
+mypy python/knot_resolver_manager
 check_rv $?
 echo
 
index 80b2da0d740567a8b78cf42446bb3fca91d3162c..e9e192871db7c9cb469edc386602a4abe1004d7b 100755 (executable)
@@ -4,7 +4,7 @@
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/utils/_env.sh
 
-dirs="manager/knot_resolver_manager/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py"
+dirs="python/knot_resolver_manager/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py"
 
 # run black code formater
 black $dirs
index 23a3395953ae74625f6b0a89cbbe72994bdebcf7..a3f08177b2a186c0976f24853df3cda3cb696abe 100755 (executable)
@@ -14,8 +14,8 @@ poetry build
 shopt -s globstar
 shopt -s nullglob
 for d in build/lib*; do
-    for f in "manager/$d/"**/*.so; do
-        cp -v "$f" ${f#"manager/$d/"}
+    for f in "python/$d/"**/*.so; do
+        cp -v "$f" ${f#"python/$d/"}
     done
 done
 shopt -u globstar
index 43aa403acb06c5e6de876fc8db539dd5f287ea86..6b37dff74805c6df5d8f66f8757b1d040e1a4c75 100755 (executable)
@@ -5,4 +5,4 @@ src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/utils/_env.sh
 
 # run pytest
-env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=manager/knot_resolver_manager --show-capture=all tests/manager
+env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=python/knot_resolver_manager --show-capture=all tests/manager
index 16b3c3a12feabbcd0d15fd06d87f8e8ab6f2c784..04eb40ee4e28a2d39dc65aef90a2eafee9a2c9bb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 package_dir = \
-{'': 'manager'}
+{'': 'python'}
 
 packages = \
 ['knot_resolver_manager',