k2hr3-api 1.0.19 → 1.0.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ChangeLog +12 -0
- package/config/k2hr3-init.sh.templ +7 -10
- package/package.json +13 -9
package/ChangeLog
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
k2hr3-api (1.0.21) unstable; urgency=low
|
|
2
|
+
|
|
3
|
+
* Changed partially scripts(command) in package.json - #92
|
|
4
|
+
|
|
5
|
+
-- Takeshi Nakatani <ggtakec@gmail.com> Mon, 29 May 2023 10:36:24 +0900
|
|
6
|
+
|
|
7
|
+
k2hr3-api (1.0.20) unstable; urgency=low
|
|
8
|
+
|
|
9
|
+
* Fixed a bug in OS determination processing - #90
|
|
10
|
+
|
|
11
|
+
-- Takeshi Nakatani <ggtakec@gmail.com> Fri, 19 May 2023 19:17:33 +0900
|
|
12
|
+
|
|
1
13
|
k2hr3-api (1.0.19) unstable; urgency=low
|
|
2
14
|
|
|
3
15
|
* Bumped up the version number to update the Docker image
|
|
@@ -112,13 +112,9 @@ check_os()
|
|
|
112
112
|
# PKGMGR_UPDATE_OPT
|
|
113
113
|
# PKGMGR_LIST_CMD
|
|
114
114
|
#
|
|
115
|
-
|
|
116
115
|
. /etc/os-release
|
|
117
116
|
|
|
118
|
-
if
|
|
119
|
-
exit_err "Unknown OS distribution."
|
|
120
|
-
fi
|
|
121
|
-
if [ "${ID}" = "centos" ]; then
|
|
117
|
+
if echo "${ID}" | grep -q -i "centos"; then
|
|
122
118
|
if [ -z "${VERSION_ID}" ] || [ "${VERSION_ID}" -eq 7 ]; then
|
|
123
119
|
IS_OS_DEBIAN=0
|
|
124
120
|
PKGMGR_BIN="yum"
|
|
@@ -130,31 +126,32 @@ check_os()
|
|
|
130
126
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
131
127
|
PKGMGR_LIST_CMD="dnf list installed"
|
|
132
128
|
fi
|
|
133
|
-
elif
|
|
129
|
+
elif echo "${ID}" | grep -q -i "rocky"; then
|
|
134
130
|
IS_OS_DEBIAN=0
|
|
135
131
|
PKGMGR_BIN="dnf"
|
|
136
132
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
137
133
|
PKGMGR_LIST_CMD="dnf list installed"
|
|
138
134
|
|
|
139
|
-
elif
|
|
135
|
+
elif echo "${ID}" | grep -q -i "fedora"; then
|
|
140
136
|
IS_OS_DEBIAN=0
|
|
141
137
|
PKGMGR_BIN="dnf"
|
|
142
138
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
143
139
|
PKGMGR_LIST_CMD="dnf list installed"
|
|
144
140
|
|
|
145
|
-
elif
|
|
141
|
+
elif echo "${ID}" | grep -q -i "ubuntu"; then
|
|
146
142
|
IS_OS_DEBIAN=1
|
|
147
143
|
PKGMGR_BIN="apt-get"
|
|
148
144
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
149
145
|
PKGMGR_LIST_CMD="apt list --installed"
|
|
150
146
|
|
|
151
|
-
elif
|
|
147
|
+
elif echo "${ID}" | grep -q -i "debian"; then
|
|
152
148
|
IS_OS_DEBIAN=1
|
|
153
149
|
PKGMGR_BIN="apt-get"
|
|
154
150
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
155
151
|
PKGMGR_LIST_CMD="apt list --installed"
|
|
152
|
+
|
|
156
153
|
else
|
|
157
|
-
exit_err "Unknown OS distribution."
|
|
154
|
+
exit_err "Unknown OS distribution(${ID})."
|
|
158
155
|
fi
|
|
159
156
|
output_info "OS is ${PRETTY_NAME}"
|
|
160
157
|
return 0
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "k2hr3-api",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.21",
|
|
4
4
|
"dependencies": {
|
|
5
5
|
"@kubernetes/client-node": "^0.18.1",
|
|
6
6
|
"body-parser": "^1.20.2",
|
|
@@ -30,21 +30,25 @@
|
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"chai": "^4.3.7",
|
|
32
32
|
"chai-http": "^4.3.0",
|
|
33
|
-
"eslint": "^8.
|
|
33
|
+
"eslint": "^8.41.0",
|
|
34
34
|
"mocha": "^10.2.0",
|
|
35
35
|
"nyc": "^15.1.0"
|
|
36
36
|
},
|
|
37
37
|
"scripts": {
|
|
38
|
-
"help": "echo 'command list:\n npm run start\n npm run start:prod\n npm run start:production\n npm run start:dev\n npm run start:develop\n npm run start:dbg\n npm run start:debug\n npm run start:debug:break\n npm run start: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: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: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'",
|
|
38
|
+
"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: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: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'",
|
|
39
39
|
"start": "npm run start:production",
|
|
40
40
|
"start:prod": "npm run start:production",
|
|
41
41
|
"start:production": "bin/run.sh -bg --production && echo '' && echo 'Start on production - Success' && echo ''",
|
|
42
|
+
"start:prod:dbg": "npm run start:prod:debug",
|
|
43
|
+
"start:prod:debug": "npm run start:prod:debug:break",
|
|
44
|
+
"start:prod:debug:break": "echo '' && echo 'Start on production with debugging' && echo '' && bin/run.sh --production --debug --debuglevel dbg",
|
|
45
|
+
"start:prod:debug:nobreak": "echo '' && echo 'Start on production with debugging no break' && echo '' && bin/run.sh --production --debug-nobrk --debuglevel dbg",
|
|
42
46
|
"start:dev": "npm run start:develop",
|
|
43
47
|
"start:develop": "echo '' && echo 'Start on development without debugging' && echo '' && bin/run.sh -bg --development",
|
|
44
|
-
"start:dbg": "npm run start:debug",
|
|
45
|
-
"start:debug": "npm run start:debug:break",
|
|
46
|
-
"start:debug:break": "echo '' && echo 'Start on development with debugging' && echo '' && bin/run.sh --development --debug --debuglevel dbg",
|
|
47
|
-
"start:debug:nobreak": "echo '' && echo 'Start on development with debugging no break' && echo '' && bin/run.sh --development --debug-nobrk --debuglevel dbg",
|
|
48
|
+
"start:dev:dbg": "npm run start:dev:debug",
|
|
49
|
+
"start:dev:debug": "npm run start:dev:debug:break",
|
|
50
|
+
"start:dev:debug:break": "echo '' && echo 'Start on development with debugging' && echo '' && bin/run.sh --development --debug --debuglevel dbg",
|
|
51
|
+
"start:dev:debug:nobreak": "echo '' && echo 'Start on development with debugging no break' && echo '' && bin/run.sh --development --debug-nobrk --debuglevel dbg",
|
|
48
52
|
"start:watcher:prod": "npm run start:watcher:production",
|
|
49
53
|
"start:watcher:production": "bin/run.sh -bg --production --watcher && echo '' && echo 'Start watcher on production - Success' && echo ''",
|
|
50
54
|
"start:watcher:dev": "npm run start:watcher:develop",
|
|
@@ -61,8 +65,8 @@
|
|
|
61
65
|
"start:watcher:oneshot:debug": "npm run start:watcher:oneshot:debug:break",
|
|
62
66
|
"start:watcher:oneshot:debug:break": "echo '' && echo 'Start watcher on development with debugging' && echo '' && bin/run.sh --development --watcher --oneshot --debug --debuglevel dbg",
|
|
63
67
|
"start:watcher:oneshot:debug:nobreak": "echo '' && echo 'Start watcher on development with debugging no break' && echo '' && bin/run.sh --development --watcher --oneshot --debug-nobrk --debuglevel dbg",
|
|
64
|
-
"stop": "bin/run.sh
|
|
65
|
-
"stop:watcher": "bin/run.sh
|
|
68
|
+
"stop": "bin/run.sh --stop && echo '' && echo 'Stop - Success' && echo ''",
|
|
69
|
+
"stop:watcher": "bin/run.sh --stop --watcher && echo '' && echo 'Stop watcher - Success' && echo ''",
|
|
66
70
|
"test": "npm run test:cover",
|
|
67
71
|
"test:lint": "eslint lib/*.js app.js bin/www bin/watcher routes/*.js tests/*.js",
|
|
68
72
|
"test:cover": "echo 'Test with coverage' && nyc --reporter=lcov --reporter=text npm run test:auto:all",
|