k2hr3-api 1.0.37 → 1.0.39

package/tests/k2hr3template_test_vars.js

@@ -27,32 +27,31 @@
 // for testing. You can specify these files for k2hr3template_test.sh
 //
 
-/* eslint-disable indent */
 module.exports = {
 	'statement_print_test_00':		'value_00',
 	'formula_variable_00':			'value_name_00',
-	'formula_variable_01':			[
-										'value_01[0]'
-									],
-	'formula_variable_02':			{
-										'value_name_00':	'value_02{value_name_00}'
-									},
-	'formula_variable_array_01':	[
-										'array_value_00',
-										'array_value_01'
-									],
-	'formula_variable_object_01':	{
-										'object_key_00':	'object_value_00',
-										'object_key_01':	'object_value_01',
-										'object_key_02':	[
-											'object_value_02_01',
-											'object_value_02_02'
-										],
-										'object_key_03':	{
-											'object_valkey_03_00':	true,
-											'object_valkey_03_01':	'object_valval_03_01'
-										}
-									},
+	'formula_variable_01': [
+		'value_01[0]'
+	],
+	'formula_variable_02': {
+		'value_name_00':			'value_02{value_name_00}'
+	},
+	'formula_variable_array_01': [
+		'array_value_00',
+		'array_value_01'
+	],
+	'formula_variable_object_01': {
+		'object_key_00':			'object_value_00',
+		'object_key_01':			'object_value_01',
+		'object_key_02': [
+			'object_value_02_01',
+			'object_value_02_02'
+		],
+		'object_key_03': {
+			'object_valkey_03_00':	true,
+			'object_valkey_03_01':	'object_valval_03_01'
+		}
+	},
 	'formula_calculate_not_00':		true,
 	'formula_calculate_not_01':		false,
 	'formula_calculate_inc_00':		0,
@@ -143,48 +142,47 @@ module.exports = {
 	'formula_syntax_for_03':		0,
 	'formula_syntax_for_04':		1,
 	'formula_syntax_for_05':		'string',
-	'formula_syntax_for_06':		[
-										'string00',
-										'string01'
-									],
-	'formula_syntax_for_07':		{
-										'key_1':	true,
-										'key_2':	false
-									},
+	'formula_syntax_for_06': [
+		'string00',
+		'string01'
+	],
+	'formula_syntax_for_07': {
+		'key_1':					true,
+		'key_2':					false
+	},
 	'formula_syntax_foreach_00':	[],
-	'formula_syntax_foreach_01':	[
-										null
-									],
-	'formula_syntax_foreach_02':	[
-										true,
-										false
-									],
-	'formula_syntax_foreach_03':	[
-										0,
-										1
-									],
-	'formula_syntax_foreach_04':	[
-										'string00',
-										'string01'
-									],
+	'formula_syntax_foreach_01': [
+		null
+	],
+	'formula_syntax_foreach_02': [
+		true,
+		false
+	],
+	'formula_syntax_foreach_03': [
+		0,
+		1
+	],
+	'formula_syntax_foreach_04': [
+		'string00',
+		'string01'
+	],
 	'formula_syntax_foreach_10':	{},
-	'formula_syntax_foreach_11':	{
-										'key':	null
-									},
-	'formula_syntax_foreach_12':	{
-										'key_1':	true,
-										'key_2':	false
-									},
-	'formula_syntax_foreach_13':	{
-										'key_1':	0,
-										'key_2':	1
-									},
-	'formula_syntax_foreach_14':	{
-										'key_1':	'string00',
-										'key_2':	'string01'
-									}
+	'formula_syntax_foreach_11': {
+		'key':						null
+	},
+	'formula_syntax_foreach_12': {
+		'key_1':					true,
+		'key_2':					false
+	},
+	'formula_syntax_foreach_13': {
+		'key_1':					0,
+		'key_2':					1
+	},
+	'formula_syntax_foreach_14': {
+		'key_1':					'string00',
+		'key_2':					'string01'
+	}
 };
-/* eslint-enable indent */
 
 /*
  * Local variables:

package/tests/manual_acr_delete.js

@@ -42,18 +42,17 @@ var	is_https	= apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function rawDeleteV1Acr(token, service)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'X-Auth-Token':		token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/acr/' + service,
-						'method':			'DELETE',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/acr/' + service,
+		'method':			'DELETE',
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_acr_get.js

@@ -62,16 +62,15 @@ function rawGetV1Acr(token, service, inputdata)
 		urlarg = encodeURI(urlarg);
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json'
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/acr/' + service + urlarg,
-						'method':			'GET'
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json'
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/acr/' + service + urlarg,
+		'method':			'GET'
+	};
 
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token']	= token;

package/tests/manual_acr_postput.js

@@ -55,19 +55,18 @@ function rawPutPostV1Acr(method, tenant, token, service)
 		}
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length,
-						'X-Auth-Token':		'U=' + token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/acr/' + service + urlarg,
-						'method':			method,
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	strbody.length,
+		'X-Auth-Token':		'U=' + token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/acr/' + service + urlarg,
+		'method':			method,
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_extdata_get.js

@@ -43,7 +43,6 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function getV1ExtData(uri, path, ua, is_gzip)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
 	var	headers				= {};
 	var	typehead			= 'Content-Type';
 	var	uahead				= 'User-Agent';
@@ -56,11 +55,11 @@ function getV1ExtData(uri, path, ua, is_gzip)
 	if(is_gzip){
 		headers[gziphead]	= 'gzip';
 	}
-	var	options				= {	'host':				hostname,
-								'port':				hostport,
-								'method':			'GET'
-							  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'method':			'GET'
+	};
 
 	options.headers	= headers;
 	options.path	= '/v1/extdata/' + uri + '/' + path;

package/tests/manual_list_gethead.js

@@ -60,19 +60,18 @@ function getV1ChildrenList(method, token, type, service, path, is_expand)
 		}
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-						'X-Auth-Token':		token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			entrypath,
-						'method':			method,
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			entrypath,
+		'method':			method,
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_policy_delete.js

@@ -42,19 +42,18 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function deleteV1Policy(token, name)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-						'X-Auth-Token':		token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/policy/' + name,
-						'method':			'DELETE',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/policy/' + name,
+		'method':			'DELETE',
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_policy_gethead.js

@@ -48,19 +48,18 @@ function getV1Policy(token, name, service)
 		urlarg		= encodeURI('?service=' + service);
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-						'X-Auth-Token':		token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/policy/' + name + urlarg,
-						'method':			'GET',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/policy/' + name + urlarg,
+		'method':			'GET',
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
@@ -109,22 +108,23 @@ function getV1Policy(token, name, service)
 
 function headV1Policy(tenant, name, action, resource)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0
-					  };
-	var	urlarg		= '?resource=' + resource + '&action=' + action;
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0
+	};
+
+	var	urlarg = '?resource=' + resource + '&action=' + action;
 	if(apiutil.isSafeString(tenant)){
-		urlarg		+= '&tenant=' + tenant;
+		urlarg += '&tenant=' + tenant;
 	}
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/policy/' + name + encodeURI(urlarg),
-						'method':			'HEAD',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/policy/' + name + encodeURI(urlarg),
+		'method':	'HEAD',
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_policy_postput.js

@@ -43,31 +43,29 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function postV1Policy(method, token, name, effect, action, resource, alias)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	strbody		= '';
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'X-Auth-Token':		token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/policy',
-						'method':			method
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	strbody = '';
+	var	headers = {
+		'Content-Type':		'application/json',
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/policy',
+		'method':			method
+	};
 
 	if(apiutil.compareCaseString('post', method)){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'policy':
-						{	'name':			name,
-							'effect':		effect,
-							'action':		action,
-							'resource':		resource,
-							'condition':	null,
-							'alias':		alias
-						}
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		var	body = {
+			'policy': {
+				'name':			name,
+				'effect':		effect,
+				'action':		action,
+				'resource':		resource,
+				'condition':	null,
+				'alias':		alias
+			}
+		};
 
 		strbody						= JSON.stringify(body);
 		headers['Content-Length']	= strbody.length;

package/tests/manual_resource_delete.js

@@ -43,12 +43,10 @@ var	is_https	= apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function deleteV1Resource(token_type, token, name, data_type, keynames, aliases, port, cuk, roleyrn)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+	};
 
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token'] = token;
@@ -121,15 +119,13 @@ function deleteV1Resource(token_type, token, name, data_type, keynames, aliases,
 		}
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	options		= {
-						'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/resource/' + name + encodeURI(urlarg),
-						'method':			'DELETE',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/resource/' + name + encodeURI(urlarg),
+		'method':	'DELETE',
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_resource_gethead.js

@@ -43,12 +43,10 @@ var	is_https	= apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function getV1Resource(is_get_req, token_type, token, name, service, is_expand, data_type, keyname, port, cuk, roleyrn)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+	};
 
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token'] = token;
@@ -112,14 +110,13 @@ function getV1Resource(is_get_req, token_type, token, name, service, is_expand,
 		}
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/resource/' + name + encodeURI(urlarg),
-						'method':			(is_get_req ? 'GET' : 'HEAD'),
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/resource/' + name + encodeURI(urlarg),
+		'method':	(is_get_req ? 'GET' : 'HEAD'),
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_resource_postput.js

@@ -42,20 +42,19 @@ var	is_https	= apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function postV1Resource(method, token, querypath, name, datatype, data, reskeys, alias, port, cuk, roleyrn)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	strbody		= '';
-	var	headers		= {
-						'Content-Type':		'application/json',
-					  };
+	var	strbody = '';
+	var	headers = {
+		'Content-Type':		'application/json',
+	};
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token']	= token;
 	}
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/resource' + apiutil.getSafeString(querypath),
-						'method':			method
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/resource' + apiutil.getSafeString(querypath),
+		'method':	method
+	};
 
 	if(!apiutil.compareCaseString('string', datatype) && !apiutil.compareCaseString('object', datatype)){
 		datatype = 'string';								// default data type is string
@@ -68,15 +67,13 @@ function postV1Resource(method, token, querypath, name, datatype, data, reskeys,
 			data = apiutil.parseJSON(data);
 		}
 
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'resource':
-						{
-							'type':			datatype,
-							'data':			data,			// if datatype is string, this includes control codes
-							'keys':			reskeys
-						}
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		var	body = {
+			'resource': {
+				'type':	datatype,
+				'data':	data,			// if datatype is string, this includes control codes
+				'keys':	reskeys
+			}
+		};
 
 		if(apiutil.isSafeString(name)){
 			body.resource.name	= name;
@@ -274,7 +271,7 @@ function rawGetInputKeys(str)
 		try{
 			// parse JSON
 			result = JSON.parse(str);
-		}catch(err){
+		}catch(err){										// eslint-disable-line no-unused-vars
 			// key=val,key=val...
 			result = {};
 			// parse ','