k2hr3-api 1.0.10 → 1.0.12

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "k2hr3-api",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "dependencies": {
-    "@kubernetes/client-node": "^0.16.3",
-    "body-parser": "^1.20.0",
-    "config": "^3.3.7",
+    "@kubernetes/client-node": "^0.17.1",
+    "body-parser": "^1.20.1",
+    "config": "^3.3.8",
     "cookie-parser": "~1.4.6",
     "dateformat": "^4.6.3",
     "debug": "~4.3.4",
-    "express": "^4.18.1",
-    "jose": "^4.8.1",
-    "k2hdkc": "^1.0.2",
+    "express": "^4.18.2",
+    "jose": "^4.11.0",
+    "k2hdkc": "^1.0.4",
     "morgan": "~1.10.0",
-    "rotating-file-stream": "^2.1.6"
+    "rotating-file-stream": "^3.0.4"
   },
   "bin": {
     "k2hr3-api": "./bin/www",
@@ -28,12 +28,11 @@
     "test": "test"
   },
   "devDependencies": {
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "chai-http": "^4.3.0",
-    "eslint": "^8.17.0",
-    "mocha": "^10.0.0",
-    "nyc": "^15.1.0",
-    "publish-please": "^5.5.2"
+    "eslint": "^8.27.0",
+    "mocha": "^10.1.0",
+    "nyc": "^15.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: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'",
@@ -65,72 +64,74 @@
     "stop": "bin/run.sh -stop && echo '' && echo 'Stop - Success' && echo ''",
     "stop:watcher": "bin/run.sh -stop --watcher && echo '' && echo 'Stop watcher - Success' && echo ''",
     "test": "npm run test:cover",
-    "test:lint": "eslint lib/*.js app.js bin/www bin/watcher routes/*.js test/*.js",
+    "test:lint": "eslint lib/*.js app.js bin/www bin/watcher routes/*.js tests/*.js",
     "test:cover": "echo 'Test with coverage' && nyc --reporter=lcov --reporter=text npm run test:auto:all",
     "test:auto": "echo 'Auto test : npm run test:auto:*\n      test:auto:all{:dbg}\n      test:auto:version{:dbg}\n      test:auto:usertokens{:dbg}\n      test:auto:list{:dbg}\n      test:auto:resource{:dbg}\n      test:auto:policy{:dbg}\n      test:auto:role{:dbg}\n      test:auto:service{:dbg}\n      test:auto:acr{:dbg}\n      test:auto:userdata{:dbg}\n      test:auto:extdata{:dbg}\n      test:auto:watcher{:dbg}\n      test:auto:templengine\n      test:auto:templengine:async\n'",
-    "test:auto:all": "echo 'All test' && npm run test:lint && test/auto_test.sh -t 8000 all && npm run test:auto:templengine && npm run test:auto:templengine:async && echo 'Succeed test' && echo ''",
-    "test:auto:all:dbg": "echo 'All test with debugging' && npm run test:lint && test/auto_test.sh -t 8000 -d dbg all && echo 'Succeed test' && echo ''",
-    "test:auto:version": "echo 'Test Version' && test/auto_test.sh -t 8000 version && echo 'Succeed test' && echo ''",
-    "test:auto:version:dbg": "echo 'Test Version with debugging' && test/auto_test.sh -t 8000 -d dbg version && echo 'Succeed test' && echo ''",
-    "test:auto:usertokens": "echo 'Test UserTokens' && test/auto_test.sh -t 8000 usertokens && echo 'Succeed test' && echo ''",
-    "test:auto:usertokens:dbg": "echo 'Test UserTokens with debugging' && test/auto_test.sh -t 8000 -d dbg usertokens && echo 'Succeed test' && echo ''",
-    "test:auto:list": "echo 'Test List' && test/auto_test.sh -t 8000 list && echo 'Succeed test' && echo ''",
-    "test:auto:list:dbg": "echo 'Test List with debugging' && test/auto_test.sh -t 8000 -d dbg list && echo 'Succeed test' && echo ''",
-    "test:auto:resource": "echo 'Test Resource' && test/auto_test.sh -t 8000 resource && echo 'Succeed test' && echo ''",
-    "test:auto:resource:dbg": "echo 'Test Resource with debugging' && test/auto_test.sh -t 8000 -d dbg resource && echo 'Succeed test' && echo ''",
-    "test:auto:policy": "echo 'Test Policy' && test/auto_test.sh -t 8000 policy && echo 'Succeed test' && echo ''",
-    "test:auto:policy:dbg": "echo 'Test Policy with debugging' && test/auto_test.sh -t 8000 -d dbg policy && echo 'Succeed test' && echo ''",
-    "test:auto:role": "echo 'Test Role' && test/auto_test.sh -t 8000 role && echo 'Succeed test' && echo ''",
-    "test:auto:role:dbg": "echo 'Test Role with debugging' && test/auto_test.sh -t 8000 -d dbg role && echo 'Succeed test' && echo ''",
-    "test:auto:service": "echo 'Test Service' && test/auto_test.sh -t 8000 service && echo 'Succeed test' && echo ''",
-    "test:auto:service:dbg": "echo 'Test Service with debugging' && test/auto_test.sh -t 8000 -d dbg service && echo 'Succeed test' && echo ''",
-    "test:auto:acr": "echo 'Test ACR' && test/auto_test.sh -t 8000 acr && echo 'Succeed test' && echo ''",
-    "test:auto:acr:dbg": "echo 'Test ACR with debugging' && test/auto_test.sh -t 8000 -d dbg acr && echo 'Succeed test' && echo ''",
-    "test:auto:userdata": "echo 'Test Userdata' && test/auto_test.sh -t 8000 userdata && echo 'Succeed test' && echo ''",
-    "test:auto:userdata:dbg": "echo 'Test Userdata with debugging' && test/auto_test.sh -t 8000 -d dbg userdata && echo 'Succeed test' && echo ''",
-    "test:auto:extdata": "echo 'Test Extdata' && test/auto_test.sh -t 8000 extdata && echo 'Succeed test' && echo ''",
-    "test:auto:extdata:dbg": "echo 'Test Extdata with debugging' && test/auto_test.sh -t 8000 -d dbg extdata && echo 'Succeed test' && echo ''",
-    "test:auto:watcher": "echo 'Test Watcher Process' && test/auto_test.sh -t 8000 watcher && echo 'Succeed test' && echo ''",
-    "test:auto:watcher:dbg": "echo 'Test Watcher Process with debugging' && test/auto_test.sh -t 8000 -d dbg watcher && echo 'Succeed test' && echo ''",
-    "test:auto:templengine": "echo 'Test template engine' && test/auto_template.sh && echo 'Succeed test' && echo ''",
-    "test:auto:templengine:async": "echo 'Test asynchronous template engine' && test/auto_template.sh -a && echo 'Succeed test' && echo ''",
+    "test:auto:all": "echo 'All test' && npm run test:lint && tests/test.sh -t 8000 all && npm run test:auto:templengine && npm run test:auto:templengine:async && echo 'Succeed test' && echo ''",
+    "test:auto:all:dbg": "echo 'All test with debugging' && npm run test:lint && tests/test.sh -t 8000 -d dbg all && echo 'Succeed test' && echo ''",
+    "test:auto:version": "echo 'Test Version' && tests/test.sh -t 8000 version && echo 'Succeed test' && echo ''",
+    "test:auto:version:dbg": "echo 'Test Version with debugging' && tests/test.sh -t 8000 -d dbg version && echo 'Succeed test' && echo ''",
+    "test:auto:usertokens": "echo 'Test UserTokens' && tests/test.sh -t 8000 usertokens && echo 'Succeed test' && echo ''",
+    "test:auto:usertokens:dbg": "echo 'Test UserTokens with debugging' && tests/test.sh -t 8000 -d dbg usertokens && echo 'Succeed test' && echo ''",
+    "test:auto:list": "echo 'Test List' && tests/test.sh -t 8000 list && echo 'Succeed test' && echo ''",
+    "test:auto:list:dbg": "echo 'Test List with debugging' && tests/test.sh -t 8000 -d dbg list && echo 'Succeed test' && echo ''",
+    "test:auto:resource": "echo 'Test Resource' && tests/test.sh -t 8000 resource && echo 'Succeed test' && echo ''",
+    "test:auto:resource:dbg": "echo 'Test Resource with debugging' && tests/test.sh -t 8000 -d dbg resource && echo 'Succeed test' && echo ''",
+    "test:auto:policy": "echo 'Test Policy' && tests/test.sh -t 8000 policy && echo 'Succeed test' && echo ''",
+    "test:auto:policy:dbg": "echo 'Test Policy with debugging' && tests/test.sh -t 8000 -d dbg policy && echo 'Succeed test' && echo ''",
+    "test:auto:role": "echo 'Test Role' && tests/test.sh -t 8000 role && echo 'Succeed test' && echo ''",
+    "test:auto:role:dbg": "echo 'Test Role with debugging' && tests/test.sh -t 8000 -d dbg role && echo 'Succeed test' && echo ''",
+    "test:auto:service": "echo 'Test Service' && tests/test.sh -t 8000 service && echo 'Succeed test' && echo ''",
+    "test:auto:service:dbg": "echo 'Test Service with debugging' && tests/test.sh -t 8000 -d dbg service && echo 'Succeed test' && echo ''",
+    "test:auto:acr": "echo 'Test ACR' && tests/test.sh -t 8000 acr && echo 'Succeed test' && echo ''",
+    "test:auto:acr:dbg": "echo 'Test ACR with debugging' && tests/test.sh -t 8000 -d dbg acr && echo 'Succeed test' && echo ''",
+    "test:auto:userdata": "echo 'Test Userdata' && tests/test.sh -t 8000 userdata && echo 'Succeed test' && echo ''",
+    "test:auto:userdata:dbg": "echo 'Test Userdata with debugging' && tests/test.sh -t 8000 -d dbg userdata && echo 'Succeed test' && echo ''",
+    "test:auto:extdata": "echo 'Test Extdata' && tests/test.sh -t 8000 extdata && echo 'Succeed test' && echo ''",
+    "test:auto:extdata:dbg": "echo 'Test Extdata with debugging' && tests/test.sh -t 8000 -d dbg extdata && echo 'Succeed test' && echo ''",
+    "test:auto:watcher": "echo 'Test Watcher Process' && tests/test.sh -t 8000 watcher && echo 'Succeed test' && echo ''",
+    "test:auto:watcher:dbg": "echo 'Test Watcher Process with debugging' && tests/test.sh -t 8000 -d dbg watcher && echo 'Succeed test' && echo ''",
+    "test:auto:templengine": "echo 'Test template engine' && tests/auto_template.sh && echo 'Succeed test' && echo ''",
+    "test:auto:templengine:async": "echo 'Test asynchronous template engine' && tests/auto_template.sh -a && echo 'Succeed test' && echo ''",
     "test:manual": "echo 'Manual test : npm run test:manual:*\n      test:manual:apis:version_get\n      test:manual:apis:usertoken_postput\n      test:manual:apis:usertoken_gethead\n      test:manual:apis:policy_postput\n      test:manual:apis:policy_gethead\n      test:manual:apis:policy_delete\n      test:manual:apis:resource_postput\n      test:manual:apis:resource_gethead\n      test:manual:apis:resource_delete\n      test:manual:apis:role_postput\n      test:manual:apis:role_gethead\n      test:manual:apis:role_delete\n      test:manual:apis:service_postput\n      test:manual:apis:service_gethead\n      test:manual:apis:service_delete\n      test:manual:apis:acr_postput\n      test:manual:apis:acr_get\n      test:manual:apis:acr_delete\n      test:manual:apis:list_gethead\n      test:manual:apis:userdata_get\n      test:manual:apis:extdata_get\n      test:manual:apis:allusertenant_get\n      test:manual:apis:k2hr3keys_get\n      test:manual:load:k2hdkcdata:auto\n      test:manual:load:k2hdkcdata:local\n      test:manual:templengine\n      test:manual:templengine:async\n'",
-    "test:manual:apis:version_get": "test/manual_test.sh version_get",
-    "test:manual:apis:usertoken_postput": "test/manual_test.sh usertoken_postput",
-    "test:manual:apis:usertoken_gethead": "test/manual_test.sh usertoken_gethead",
-    "test:manual:apis:policy_postput": "test/manual_test.sh policy_postput",
-    "test:manual:apis:policy_gethead": "test/manual_test.sh policy_gethead",
-    "test:manual:apis:policy_delete": "test/manual_test.sh policy_delete",
-    "test:manual:apis:resource_postput": "test/manual_test.sh resource_postput",
-    "test:manual:apis:resource_gethead": "test/manual_test.sh resource_gethead",
-    "test:manual:apis:resource_delete": "test/manual_test.sh resource_delete",
-    "test:manual:apis:role_postput": "test/manual_test.sh role_postput",
-    "test:manual:apis:role_gethead": "test/manual_test.sh role_gethead",
-    "test:manual:apis:role_delete": "test/manual_test.sh role_delete",
-    "test:manual:apis:service_postput": "test/manual_test.sh service_postput",
-    "test:manual:apis:service_gethead": "test/manual_test.sh service_gethead",
-    "test:manual:apis:service_delete": "test/manual_test.sh service_delete",
-    "test:manual:apis:acr_postput": "test/manual_test.sh acr_postput",
-    "test:manual:apis:acr_get": "test/manual_test.sh acr_get",
-    "test:manual:apis:acr_delete": "test/manual_test.sh acr_delete",
-    "test:manual:apis:list_gethead": "test/manual_test.sh list_gethead",
-    "test:manual:apis:userdata_get": "test/manual_test.sh userdata_get",
-    "test:manual:apis:extdata_get": "test/manual_test.sh extdata_get",
-    "test:manual:apis:allusertenant_get": "test/manual_test.sh allusertenant_get",
-    "test:manual:apis:k2hr3keys_get": "test/manual_test.sh k2hr3keys_get",
-    "test:manual:load:k2hdkcdata:auto": "test/k2hdkc_test_load.sh  --for_auto_test && echo '' && echo 'Load test data for automatically testing - Success' && echo ''",
-    "test:manual:load:k2hdkcdata:local": "test/k2hdkc_test_load.sh --main 33348 --sub 37146 && echo '' && echo 'Load test data for local testing - Success' && echo ''",
-    "test:manual:templengine": "test/auto_template.sh && echo '' && echo 'Test template engine - Success' && echo ''",
-    "test:manual:templengine:async": "test/auto_template.sh -a && echo '' && echo 'Test asynchronous template engine - Success' && echo ''",
-    "publish-please": "publish-please",
-    "prepublishOnly": "publish-please guard"
+    "test:manual:apis:version_get": "tests/manual_test.sh version_get",
+    "test:manual:apis:usertoken_postput": "tests/manual_test.sh usertoken_postput",
+    "test:manual:apis:usertoken_gethead": "tests/manual_test.sh usertoken_gethead",
+    "test:manual:apis:policy_postput": "tests/manual_test.sh policy_postput",
+    "test:manual:apis:policy_gethead": "tests/manual_test.sh policy_gethead",
+    "test:manual:apis:policy_delete": "tests/manual_test.sh policy_delete",
+    "test:manual:apis:resource_postput": "tests/manual_test.sh resource_postput",
+    "test:manual:apis:resource_gethead": "tests/manual_test.sh resource_gethead",
+    "test:manual:apis:resource_delete": "tests/manual_test.sh resource_delete",
+    "test:manual:apis:role_postput": "tests/manual_test.sh role_postput",
+    "test:manual:apis:role_gethead": "tests/manual_test.sh role_gethead",
+    "test:manual:apis:role_delete": "tests/manual_test.sh role_delete",
+    "test:manual:apis:service_postput": "tests/manual_test.sh service_postput",
+    "test:manual:apis:service_gethead": "tests/manual_test.sh service_gethead",
+    "test:manual:apis:service_delete": "tests/manual_test.sh service_delete",
+    "test:manual:apis:acr_postput": "tests/manual_test.sh acr_postput",
+    "test:manual:apis:acr_get": "tests/manual_test.sh acr_get",
+    "test:manual:apis:acr_delete": "tests/manual_test.sh acr_delete",
+    "test:manual:apis:list_gethead": "tests/manual_test.sh list_gethead",
+    "test:manual:apis:userdata_get": "tests/manual_test.sh userdata_get",
+    "test:manual:apis:extdata_get": "tests/manual_test.sh extdata_get",
+    "test:manual:apis:allusertenant_get": "tests/manual_test.sh allusertenant_get",
+    "test:manual:apis:k2hr3keys_get": "tests/manual_test.sh k2hr3keys_get",
+    "test:manual:load:k2hdkcdata:auto": "tests/k2hdkc_test_load.sh  --for_auto_test && echo '' && echo 'Load test data for automatically testing - Success' && echo ''",
+    "test:manual:load:k2hdkcdata:local": "tests/k2hdkc_test_load.sh --main 33348 --sub 37146 && echo '' && echo 'Load test data for local testing - Success' && echo ''",
+    "test:manual:templengine": "tests/auto_template.sh && echo '' && echo 'Test template engine - Success' && echo ''",
+    "test:manual:templengine:async": "tests/auto_template.sh -a && echo '' && echo 'Test asynchronous template engine - Success' && echo ''"
   },
   "repository": {
     "type": "git",
     "url": "git@github.com:yahoojapan/k2hr3_api.git"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "bugs": {
-    "url": "https://github.com/yahoojapan/k2hr3_api/issues"
+    "url": "https://github.com/yahoojapan/k2hr3_api/issues",
+    "email": "antpickax-support@mail.yahoo.co.jp"
   },
   "homepage": "https://k2hr3.antpick.ax/",
   "keywords": [
@@ -149,10 +150,10 @@
     "babel"
   ],
   "author": [
-    "Takeshi Nakatani <ggtakec@gmail.com>"
+    "Takeshi Nakatani <ggtakec@gmail.com> (https://github.com/ggtakec)"
   ],
   "contributors": [
-    "Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp>"
+    "Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> (https://github.com/hiwakaba)"
   ],
   "license": "MIT"
 }

package/routes/acr.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -773,7 +773,10 @@ router.delete('/', function(req, res, next)								// eslint-disable-line no-unu
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/debugVerify.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -256,7 +256,10 @@ router.get('/', function(req, res, next)
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/extdata.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2018 Yahoo! Japan Corporation.
+ * Copyright 2018 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -239,7 +239,10 @@ router.get('/', function(req, res, next)
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/list.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -273,7 +273,10 @@ router.head('/', function(req, res, next)
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/policy.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -908,7 +908,10 @@ router.delete('/', function(req, res, next)					// eslint-disable-line no-unused
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/resource.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -1487,7 +1487,10 @@ router.delete('/', function(req, res, next)					// eslint-disable-line no-unused
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/role.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -2773,7 +2773,10 @@ function rawDeleteRoleToken(req, res)
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/service.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -921,7 +921,10 @@ router.delete('/', function(req, res, next)								// eslint-disable-line no-unu
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/userTokens.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -551,7 +551,10 @@ router.head('/', function(req, res, next)						// eslint-disable-line no-unused-
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/userdata.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2018 Yahoo! Japan Corporation.
+ * Copyright 2018 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -217,7 +217,10 @@ router.get('/', function(req, res, next)
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/routes/version.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -83,7 +83,10 @@ router.get('/v1', function(req, res, next)						// eslint-disable-line no-unused
 module.exports = router;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/templ/Dockerfile.templ

@@ -2,7 +2,7 @@
 #
 # K2HR3 REST API
 #
-# Copyright 2017 Yahoo! Japan Corporation.
+# Copyright 2017 Yahoo Japan Corporation.
 #
 # K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
 # common management information for the cloud.
@@ -19,70 +19,53 @@
 #
 
 # [NOTE]
-# This file expects the following variables to replace.
-#	GIT_DOMAIN_URL				(ex. "https://github.com" from GITHUB_SERVER_URL environment)
-#	DOCKER_IMAGE_NAME			(ex. "k2hr3-api")
-#	DOCKER_IMAGE_BASE			(ex. "antpickax/k2hdkc:latest")
-#	DOCKER_IMAGE_DEV_BASE		(ex. "antpickax/k2hdkc-dev:latest")
-#	DOCKER_GIT_ORGANIZATION		(ex. "antpickax")
-#	DOCKER_GIT_REPOSITORY		(ex. "xxxxx")
-#	DOCKER_GIT_BRANCH			(ex. "yyyyy")
+# This file expects the following variables to be expanded by autoconf.
+#	PACKAGE_NAME
+#
+# Also, replace the following variables.
+#	DOCKER_IMAGE_BASE			(ex. "alpine:latest")
+#	PRE_PROCESS					(ex. ":")
+#	POST_PROCESS				(ex. ":")
+#	IMAGE_CMD_BASE				(ex. "['/bin/sh', '-c', 'tail -f /dev/null']" as default)
 #	PKG_UPDATE					(ex. "apk update -q --no-progress")
-#	PKG_INSTALL_BUILDER			(ex. "apk add -q --no-progress --no-cache git build-base openssl libtool automake autoconf procps")
-#	PKG_INSTALL_BIN				(ex. "apk add -q --no-progress --no-cache libstdc++")
-#	PKG_REPO_SETUP_NODEJS		(ex. "curl -sL https://deb.nodesource.com/setup_14.x | bash")
-#	PKG_INSTALL_NODEJS			(ex. "apk add -q --no-progress --no-cache nodejs npm")
-#	BUILD_ENV					(ex, "ENV DEBIAN_FRONTEND=noninteractive")
+#	PKG_INSTALL_CURL			(ex. "apk add -q --no-progress --no-cache git build-base openssl libtool automake autoconf procps")
+#	PKG_INSTALL_BASE			(ex. "apk add -q --no-progress --no-cache antpickax-package...")
+#	SETUP_PC_REPO				(ex. "curl -s https://packagecloud.io/install/repositories/yahoojapan/stable/script.alpine.sh | sh")
+#	SETUP_ENV					(ex. "ENV DEBIAN_FRONTEND=noninteractive")
 #	UPDATE_LIBPATH				(ex. "ldconfig", if want no-operation, specify ":")
-#
-
-#
-# Builder
-#
-FROM %%DOCKER_IMAGE_DEV_BASE%% AS %%DOCKER_IMAGE_NAME%%-builder
-
-MAINTAINER antpickax
-WORKDIR /
-
-%%BUILD_ENV%%
-
-RUN set -x && \
-	%%PKG_UPDATE%% && \
-	%%PKG_INSTALL_BUILDER%% && \
-	%%PKG_REPO_SETUP_NODEJS%% && \
-	%%PKG_INSTALL_NODEJS%% && \
-	npm install -g npm && \
-	git clone %%GIT_DOMAIN_URL%%/%%DOCKER_GIT_ORGANIZATION%%/%%DOCKER_GIT_REPOSITORY%%.git && \
-	cd %%DOCKER_GIT_REPOSITORY%% && \
-	git checkout %%DOCKER_GIT_BRANCH%% && \
-	npm install --save-dev && \
-	rm -rf .eslintrc.js .git .github .gitignore .npmignore .publishrc .auditignore templ/Dockerfile.templ test config/development.json config/dummyuser.json config/extdata-dummy.sh.templ && \
-	cd / && \
-	tar cvzf %%DOCKER_IMAGE_NAME%%.tgz %%DOCKER_GIT_REPOSITORY%%
+#	PKG_UNINSTALL_BASE			(ex. "apk del package...")
+#	PKG_REPO_SETUP_NODEJS		(ex. "curl -sL https://deb.nodesource.com/setup_18.x | bash" for ubuntu)
+#	NPM_INSTALL_BASE			(ex. "npm install -g k2hr3-api")
 
 #
 # Image for main
 #
-FROM %%DOCKER_IMAGE_BASE%% AS %%DOCKER_IMAGE_NAME%%
+FROM %%DOCKER_IMAGE_BASE%% AS %%PACKAGE_NAME%%
 
 MAINTAINER antpickax
 WORKDIR /
 
+%%SETUP_ENV%%
+
 RUN set -x && \
+	%%PRE_PROCESS%% && \
 	%%PKG_UPDATE%% && \
-	%%PKG_INSTALL_BIN%% && \
+	%%PKG_INSTALL_CURL%% && \
+	%%SETUP_PC_REPO%% && \
 	%%PKG_REPO_SETUP_NODEJS%% && \
-	%%PKG_INSTALL_NODEJS%% && \
-	npm install -g npm
-
-COPY --from=%%DOCKER_IMAGE_NAME%%-builder /%%DOCKER_IMAGE_NAME%%.tgz /%%DOCKER_IMAGE_NAME%%.tgz
+	%%PKG_INSTALL_BASE%% && \
+	%%NPM_INSTALL_BASE%% && \
+	%%UPDATE_LIBPATH%% && \
+	%%PKG_UNINSTALL_BASE%% && \
+	%%POST_PROCESS%%
 
-RUN cd /usr/lib/node_modules && \
-	tar xvzf /%%DOCKER_IMAGE_NAME%%.tgz && \
-	rm /%%DOCKER_IMAGE_NAME%%.tgz && \
-	%%UPDATE_LIBPATH%%
+CMD %%IMAGE_CMD_BASE%%
 
-# [NOTE]
-# Rplace command : /usr/lib/node_modules/k2hr3_api/bin/run.sh -fg --production
 #
-CMD ["/bin/sh"]
+# Local variables:
+# tab-width: 4
+# c-basic-offset: 4
+# End:
+# vim600: noexpandtab sw=4 ts=4 fdm=marker
+# vim<600: noexpandtab sw=4 ts=4
+#

package/{test → tests}/auto_acr.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -1092,7 +1092,10 @@ describe('API : ACR', function(){						// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_acr_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: ACR', function(){				// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */