diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebfa9ad..1c759ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: fail-fast: false matrix: - node-version: [18, 20] + node-version: [18, 20, 22] steps: # @@ -123,8 +123,8 @@ jobs: # : If you want to use the created Docker image as the default image, specify "default". # imageinfo: - - alpine:3.19,alpine:3.19,alpine,default - - ubuntu:22.04,ubuntu:22.04,ubuntu + - alpine:3.20,alpine:3.20,alpine,default + - ubuntu:24.04,ubuntu:24.04,ubuntu # # Run building and pushing helper diff --git a/.github/workflows/docker_helper.sh b/.github/workflows/docker_helper.sh index c7e0d0a..1a18e18 100755 --- a/.github/workflows/docker_helper.sh +++ b/.github/workflows/docker_helper.sh @@ -661,7 +661,7 @@ fi if echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "ubuntu" -e "debian"; then SETUP_PC_SCRIPT_NAME="script.deb.sh" SETUP_PC_SCRIPT_EXEC="bash" -elif echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "rocky" -e "centos" -e "fedora"; then +elif echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "rocky" -e "fedora"; then SETUP_PC_SCRIPT_NAME="script.rpm.sh" SETUP_PC_SCRIPT_EXEC="bash" elif echo "${CI_DOCKER_IMAGE_OSTYPE}" | grep -q -i -e "alpine"; then diff --git a/.github/workflows/nodejs_helper.sh b/.github/workflows/nodejs_helper.sh index e4ac89a..8309906 100755 --- a/.github/workflows/nodejs_helper.sh +++ b/.github/workflows/nodejs_helper.sh @@ -736,7 +736,7 @@ PRNSUCCESS "Start to check options and environments" CPPCHECK_TARGET="." CPPCHECK_BASE_OPT="--quiet --error-exitcode=1 --inline-suppr -j 4 --std=c++03 --xml --enable=warning,style,information,missingInclude" CPPCHECK_ENABLE_VALUES="warning style information missingInclude" -CPPCHECK_IGNORE_VALUES="unmatchedSuppression" +CPPCHECK_IGNORE_VALUES="unmatchedSuppression missingIncludeSystem normalCheckLevelMaxBranches" CPPCHECK_BUILD_DIR="/tmp/cppcheck" SHELLCHECK_TARGET_DIRS="." diff --git a/.github/workflows/nodejstypevars.sh b/.github/workflows/nodejstypevars.sh index bf83d99..b62f82b 100644 --- a/.github/workflows/nodejstypevars.sh +++ b/.github/workflows/nodejstypevars.sh @@ -62,25 +62,20 @@ if [ -z "${CI_NODEJS_MAJOR_VERSION}" ]; then # Unknown NodeJS Major version : Nothing to do # : -elif [ "${CI_NODEJS_MAJOR_VERSION}" = "14" ]; then - INSTALL_PKG_LIST="git gcc g++ make k2hdkc-dev" - INSTALLER_BIN="apt-get" - INSTALL_QUIET_ARG="-qq" - IS_PUBLISHER=0 -elif [ "${CI_NODEJS_MAJOR_VERSION}" = "16" ]; then +elif [ "${CI_NODEJS_MAJOR_VERSION}" = "18" ]; then INSTALL_PKG_LIST="git gcc g++ make k2hdkc-dev" INSTALLER_BIN="apt-get" INSTALL_QUIET_ARG="-qq" IS_PUBLISHER=0 -elif [ "${CI_NODEJS_MAJOR_VERSION}" = "18" ]; then +elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then INSTALL_PKG_LIST="git gcc g++ make k2hdkc-dev" INSTALLER_BIN="apt-get" INSTALL_QUIET_ARG="-qq" IS_PUBLISHER=1 -elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then +elif [ "${CI_NODEJS_MAJOR_VERSION}" = "22" ]; then INSTALL_PKG_LIST="git gcc g++ make k2hdkc-dev" INSTALLER_BIN="apt-get" INSTALL_QUIET_ARG="-qq" @@ -131,7 +126,7 @@ RUN_BUILD=0 # CPPCHECK_TARGET "." # CPPCHECK_BASE_OPT "--quiet --error-exitcode=1 --inline-suppr -j 4 --std=c++03 --xml" # CPPCHECK_ENABLE_VALUES "warning style information missingInclude" -# CPPCHECK_IGNORE_VALUES "unmatchedSuppression" +# CPPCHECK_IGNORE_VALUES "unmatchedSuppression missingIncludeSystem normalCheckLevelMaxBranches" # CPPCHECK_BUILD_DIR "/tmp/cppcheck" # # SHELLCHECK_TARGET_DIRS "." diff --git a/package.json b/package.json index 9633a2f..f3dc915 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,17 @@ "name": "k2hr3-api", "version": "1.0.34", "dependencies": { - "@kubernetes/client-node": "^0.20.0", - "body-parser": "^1.20.2", - "config": "^3.3.11", - "cookie-parser": "~1.4.6", + "@kubernetes/client-node": "^0.22.3", + "body-parser": "^1.20.3", + "config": "^3.3.12", + "cookie-parser": "~1.4.7", "dateformat": "^4.6.3", - "debug": "~4.3.4", - "express": "^4.18.3", - "jose": "^5.2.3", - "k2hdkc": "^1.0.10", + "debug": "~4.3.7", + "express": "^4.21.2", + "jose": "^5.9.6", + "k2hdkc": "^1.0.11", "morgan": "~1.10.0", - "rotating-file-stream": "^3.2.1" + "rotating-file-stream": "^3.2.5" }, "bin": { "k2hr3-api": "./bin/www", @@ -28,11 +28,11 @@ "test": "test" }, "devDependencies": { - "chai": "^4.4.1", + "chai": "^4.5.0", "chai-http": "^4.4.0", - "eslint": "^8.57.0", - "mocha": "^10.3.0", - "nyc": "^15.1.0" + "eslint": "^8.57.1", + "mocha": "^11.0.1", + "nyc": "^17.1.0" }, "scripts": { "help": "echo 'command list:\n npm run start\n npm run start:prod\n npm run start:production\n npm run start:prod:dbg\n npm run start:prod:debug\n npm run start:prod:debug:break\n npm run start:prod:debug:nobreak\n npm run start:dev\n npm run start:develop\n npm run start:dev:dbg\n npm run start:dev:debug\n npm run start:dev:debug:break\n npm run start:dev:debug:nobreak\n npm run start:watcher:prod\n npm run start:watcher:production\n npm run start:watcher:dev\n npm run start:watcher:develop\n npm run start:watcher:dbg\n npm run start:watcher:debug\n npm run start:watcher:debug:break\n npm run start:watcher:debug:nobreak\n npm run start:watcher:oneshot:prod\n npm run start:watcher:oneshot:production\n npm run start:watcher:oneshot:dev\n npm run start:watcher:oneshot:develop\n npm run start:watcher:oneshot:dbg\n npm run start:watcher:oneshot:debug\n npm run start:watcher:oneshot:debug:break\n npm run start:watcher:oneshot:debug:nobreak\n npm run stop\n npm run stop:watcher\n npm run test\n npm run test:lint\n npm run test:cover\n npm run test:auto:all{:dbg}\n npm run test:auto:version{:dbg}\n npm run test:auto:usertokens{:dbg}\n npm run test:auto:list{:dbg}\n npm run test:auto:resource{:dbg}\n npm run test:auto:policy{:dbg}\n npm run test:auto:role{:dbg}\n npm run test:auto:tenant{:dbg}\n npm run test:auto:service{:dbg}\n npm run test:auto:acr{:dbg}\n npm run test:auto:userdata{:dbg}\n npm run test:auto:extdata{:dbg}\n npm run test:auto:watcher{:dbg}\n npm run test:auto:templengine\n npm run test:auto:templengine:async\n npm run test:manual:apis:version_get\n npm run test:manual:apis:usertoken_postput\n npm run test:manual:apis:usertoken_gethead\n npm run test:manual:apis:policy_postput\n npm run test:manual:apis:policy_gethead\n npm run test:manual:apis:policy_delete\n npm run test:manual:apis:resource_postput\n npm run test:manual:apis:resource_gethead\n npm run test:manual:apis:resource_delete\n npm run test:manual:apis:role_postput\n npm run test:manual:apis:role_gethead\n npm run test:manual:apis:role_delete\n npm run test:manual:apis:tenant_postput\n npm run test:manual:apis:tenant_gethead\n npm run test:manual:apis:tenant_delete\n npm run test:manual:apis:service_postput\n npm run test:manual:apis:service_gethead\n npm run test:manual:apis:service_delete\n npm run test:manual:apis:acr_postput\n npm run test:manual:apis:acr_get\n npm run test:manual:apis:acr_delete\n npm run test:manual:apis:list_gethead\n npm run test:manual:apis:userdata_get\n npm run test:manual:apis:extdata_get\n npm run test:manual:apis:allusertenant_get\n npm run test:manual:apis:k2hr3keys_get\n npm run test:manual:load:k2hdkcdata:auto\n npm run test:manual:load:k2hdkcdata:local\n npm run test:manual:templengine\n npm run test:manual:templengine:async\n'",