k2hr3-api 1.0.38 → 1.0.40

package/lib/openstackapiv3.js

@@ -115,34 +115,34 @@ function rawGetUserUnscopedTokenV3(uname, passwd, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'identity': {
-									'password': {
-										'user': {
-											'domain': {
-												'id': 'default'
-											},
-											'password':	_passwd,
-											'name':		_uname
-										}
-									},
-									'methods': ['password']
-								}
-							}
-						};
+		var	body = {
+			'auth': {
+				'identity': {
+					'password': {
+						'user': {
+							'domain': {
+								'id': 'default'
+							},
+							'password':	_passwd,
+							'name':		_uname
+						}
+					},
+					'methods': ['password']
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v3/auth/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/auth/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -314,28 +314,28 @@ function rawGetUserUnscopedTokenByOstokenV3(ostoken, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'identity': {
-									'token': {
-										'id': _ostoken,
-									},
-									'methods': ['token']
-								}
-							}
-						};
+		var	body = {
+			'auth': {
+				'identity': {
+					'token': {
+						'id': _ostoken,
+					},
+					'methods': ['token']
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v3/auth/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/auth/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -558,35 +558,35 @@ function rawGetUserScopedTokenV3(unscopedtoken, tenantid, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'identity': {
-								'methods': [
-									'token'
-								],
-								'token': {
-									'id': _unscopedtoken
-								}
-							},
-							'scope': {
-								'project': {
-									'id': _tenantid
-								}
-							}
-						}
-					};
+		var	body = {
+			'auth': {
+				'identity': {
+					'methods': [
+						'token'
+					],
+					'token': {
+						'id': _unscopedtoken
+					}
+				},
+				'scope': {
+					'project': {
+						'id': _tenantid
+					}
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v3/auth/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/auth/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -871,19 +871,18 @@ function rawGetUserTenantListV3(unscopedtoken, userid, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	headers		= {
-							'Content-Type':		'application/json',
-							'X-Auth-Token':		_unscopedtoken,
-							'Content-Length':	0
-						  };
-		var	options		= {	'host':				keystone_ep.hostname,
-							'port':				keystone_ep.port,
-							'path': 			keystone_ep.pathname + '/v3/users/' + _userid + '/projects',
-							'method':			'GET',
-							'headers':			headers
-						  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		var	headers = {
+			'Content-Type':		'application/json',
+			'X-Auth-Token':		_unscopedtoken,
+			'Content-Length':	0
+		};
+		var	options = {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/users/' + _userid + '/projects',
+			'method':			'GET',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -1010,7 +1009,7 @@ exports.verifyUserTokenPublisher = function(token_seed)
 //
 // tenant is not used.
 //
-exports.verifyUserToken = function(user, tenant, token, token_seed)				// eslint-disable-line no-unused-vars
+exports.verifyUserToken = function(user, tenant, token, token_seed)
 {
 	return rawVerifyUserTokenV3(user, token, token_seed);
 };

package/lib/openstackep.js

@@ -178,56 +178,56 @@ function rawTestKeystoneEndpoint(epallmap, region, endpoint, is_v3, timeout, las
 	var	headers;
 	var	options;
 	if(!_is_v3){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		body	= {	'auth': {
-						'tenantName':	'',								// unscoped token for test
-						'passwordCredentials':	{
-							'username':	'',								// user name is empty for testing
-							'password':	''								// unauthorized passwd
-						}
-					}
-				  };
+		body = {
+			'auth': {
+				'tenantName': '',								// unscoped token for test
+				'passwordCredentials': {
+					'username':	'',								// user name is empty for testing
+					'password':	''								// unauthorized passwd
+				}
+			}
+		};
 		strbody	= JSON.stringify(body);
 		headers	= {
-					'Content-Type':		'application/json',
-					'Content-Length':	strbody.length
-				  };
-		options	= {	'host':				ep.hostname,
-					'port':				ep.port,
-					'path': 			'/v2.0/tokens',
-					'method':			'POST',
-					'headers':			headers
-				  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		options	= {
+			'host':				ep.hostname,
+			'port':				ep.port,
+			'path': 			'/v2.0/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 	}else{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		body	= {	'auth': {
-						'identity': {
-								'password': {
-									'user': {
-										'domain': {
-											'id': 'default'
-										},
-										'name':		'',					// user name is empty for testing
-										'password':	''					// unauthorized passwd
-									}
-								},
-								'methods': ['password']
-							}
+		body = {
+			'auth': {
+				'identity': {
+					'password': {
+						'user': {
+							'domain': {
+								'id': 'default'
+							},
+							'name':		'',					// user name is empty for testing
+							'password':	''					// unauthorized passwd
 						}
-					};
+					},
+					'methods': ['password']
+				}
+			}
+		};
 		strbody	= JSON.stringify(body);
 		headers	= {
-					'Content-Type':		'application/json',
-					'Content-Length':	strbody.length
-				  };
-		options	= {	'host':				ep.hostname,
-					'port':				ep.port,
-					'path': 			'/v3/auth/tokens',
-					'method':			'POST',
-					'headers':			headers
-				  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		options	= {
+			'host':				ep.hostname,
+			'port':				ep.port,
+			'path': 			'/v3/auth/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 	}
 
 	var	httpobj;
@@ -242,7 +242,7 @@ function rawTestKeystoneEndpoint(epallmap, region, endpoint, is_v3, timeout, las
 		httpobj			= http;
 	}
 
-	var	req = httpobj.request(options, function(res)					// eslint-disable-line no-unused-vars
+	var	req = httpobj.request(options, function(res)
 	{
 		var	body	= '';												// eslint-disable-line no-unused-vars
 		var	status	= res.statusCode;
@@ -254,7 +254,7 @@ function rawTestKeystoneEndpoint(epallmap, region, endpoint, is_v3, timeout, las
 		res.on('data', function(chunk)
 		{
 			//r3logger.dlog('response chunk: ' + chunk);
-			body += chunk;												// eslint-disable-line no-unused-vars
+			body += chunk;
 		});
 
 		res.on('end', function(res)										// eslint-disable-line no-unused-vars

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "k2hr3-api",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "dependencies": {
-    "@kubernetes/client-node": "^0.22.3",
+    "@kubernetes/client-node": "^1.0.0",
     "body-parser": "^1.20.3",
     "config": "^3.3.12",
     "cookie-parser": "~1.4.7",
     "dateformat": "^4.6.3",
-    "debug": "~4.3.7",
+    "debug": "~4.4.0",
     "express": "^4.21.2",
     "jose": "^5.9.6",
-    "k2hdkc": "^1.0.11",
+    "k2hdkc": "^1.0.13",
     "morgan": "~1.10.0",
-    "rotating-file-stream": "^3.2.5"
+    "rotating-file-stream": "^3.2.6"
   },
   "bin": {
     "k2hr3-api": "./bin/www",
@@ -30,8 +30,8 @@
   "devDependencies": {
     "chai": "^4.5.0",
     "chai-http": "^4.4.0",
-    "eslint": "^8.57.1",
-    "mocha": "^11.0.1",
+    "eslint": "^9.20.1",
+    "mocha": "^11.1.0",
     "nyc": "^17.1.0"
   },
   "scripts": {
@@ -162,7 +162,7 @@
     "Takeshi Nakatani <ggtakec@gmail.com> (https://github.com/ggtakec)"
   ],
   "contributors": [
-    "Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> (https://github.com/hiwakaba)"
+    "Hirotaka Wakabayashi <hiwakaba@lycorp.co.jp> (https://github.com/hiwakaba)"
   ],
   "license": "MIT"
 }