tracer
/
bindAPI
3
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 15 Wiki Activity

moved check:version to dev enviroment, for regular check use -v

This commit is contained in:
tracer 2024-05-03 20:06:06 +02:00
parent b147cda096
commit ac0d8c776e
3 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TODO
View File

@ -1,8 +1,3 @@
check:bootstrap
check:version remove option update, we have -v as option
move stuff to dev:xxx which is not needed for endusers
make use of environment, somehow, dev, prod, test
check log file location
check:config *validate if all required fields are set, sanity checks. check:config *validate if all required fields are set, sanity checks.
API Endpoint cleanup API Endpoint cleanup
check keytype of panel/bindApi check keytype of panel/bindApi

4
composer.json
View File

@ -1,8 +1,8 @@
{ {
"name": "tracer/bindapi", "name": "tracer/bindapi",
"description": "manage Bind9 client zones for KeyHelp", "description": "manage Bind9 client zones for KeyHelp",
"version": "1.0.9", "version": "1.1.0",
"build_number": "377", "build_number": "378",
"authors": [ "authors": [
{ {
"name": "Micha Espey", "name": "Micha Espey",

38
src/Controller/CLIController.php
View File

@ -61,6 +61,9 @@ class CLIController
private readonly bool $quiet private readonly bool $quiet
) )
{ {
$env = $this->configController->getConfig(configKey: 'env');
$devEnvs = ['dev', 'test'];
$this->baseDir = dirname(path: __DIR__, levels: 2) . '/'; $this->baseDir = dirname(path: __DIR__, levels: 2) . '/';
$apikeyGroup = (new CommandGroup(name: 'apikeys', description: 'API keys to access this bindAPI')) $apikeyGroup = (new CommandGroup(name: 'apikeys', description: 'API keys to access this bindAPI'))
@ -273,14 +276,18 @@ class CLIController
$this->checkSetup(); $this->checkSetup();
}, },
mandatoryParameters: ['username'], mandatoryParameters: ['username'],
description: 'Adapt filesystem permissions (requires elaborated permissions)')) description: 'Adapt filesystem permissions (requires elaborated permissions)'));
->addCommand(command: new Command(
if (in_array(needle: $env, haystack: $devEnvs)) {
$checkVersionCommand = new Command(
name: 'version', name: 'version',
callback: function () { callback: function () {
$this->checkVersion(); $this->checkVersion();
}, },
optionalParameters: ['update'], description: 'Sync the versions from composer to the database');
description: 'Read or set the bindApi version in the database')); $checkGroup->addCommand(command: $checkVersionCommand);
}
$migrationsGroup = (new CommandGroup(name: 'migrations', description: 'maintain database migrations')) $migrationsGroup = (new CommandGroup(name: 'migrations', description: 'maintain database migrations'))
->addCommand(command: new Command( ->addCommand(command: new Command(
name: 'status', name: 'status',
@ -297,10 +304,8 @@ class CLIController
description: 'Apply a new migration file' description: 'Apply a new migration file'
)); ));
$env = $this->configController->getConfig(configKey: 'env');
$makeEnvs = ['dev', 'test'];
if (in_array(needle: $env, haystack: $makeEnvs)) { if (in_array(needle: $env, haystack: $devEnvs)) {
$makeMigrationsCommand = new Command( $makeMigrationsCommand = new Command(
name: 'make', name: 'make',
callback: function () { callback: function () {
@ -2236,16 +2241,6 @@ const VERSION = '{$versionSting}';
private function checkVersion(): void private function checkVersion(): void
{ {
$update = false; $update = false;
if (isset($this->arguments[1])) {
$action = $this->arguments[1];
if ($action !== 'update') {
if (!$this->quiet) {
echo 'The only allowed argument is "' . Colors::YELLOW . 'update' . Colors::DEFAULT . '.' . PHP_EOL;
}
exit(1);
}
$update = true;
}
$composerFile = $this->baseDir . DIRECTORY_SEPARATOR . 'composer.json'; $composerFile = $this->baseDir . DIRECTORY_SEPARATOR . 'composer.json';
$composerJson = json_decode(json: file_get_contents(filename: $composerFile), associative: false); $composerJson = json_decode(json: file_get_contents(filename: $composerFile), associative: false);
@ -2263,14 +2258,13 @@ const VERSION = '{$versionSting}';
echo "File version:\t\t$fileVersion" . PHP_EOL; echo "File version:\t\t$fileVersion" . PHP_EOL;
echo "File build number:\t$fileBuildNumber" . PHP_EOL; echo "File build number:\t$fileBuildNumber" . PHP_EOL;
if ($update) { $this->settingsRepository->set(name: 'version', value: $json);
$this->settingsRepository->set(name: 'version', value: $json); $this->settingsRepository->set(name: 'buildnumber', value: $fileBuildNumber);
$this->settingsRepository->set(name: 'buildnumber', value: $fileBuildNumber);
}
$currentDBVersion = $this->settingsRepository->findByName(name: 'version'); $currentDBVersion = $this->settingsRepository->findByName(name: 'version');
$dbVersion = json_decode(json: $currentDBVersion); $dbVersion = json_decode(json: $currentDBVersion);
$currentDBBuildnumber = $this->settingsRepository->findByName(name: 'buildnumber'); $currentDBBuildnumber = $this->settingsRepository->findByName(name: 'buildnumber');
echo "DB version:\t\t"; echo "DB version:\t\t";
echo $dbVersion->version->major . '.'; echo $dbVersion->version->major . '.';
echo $dbVersion->version->minor . '.'; echo $dbVersion->version->minor . '.';