k2hr3-api 1.0.27 → 1.0.29

package/ChangeLog

@@ -1,3 +1,15 @@
+k2hr3-api (1.0.29) unstable; urgency=low
+
+  * Fixed bugs about publishing packages and images - #108
+
+ -- Takeshi Nakatani <ggtakec@gmail.com>  Wed, 06 Sep 2023 16:58:40 +0900
+
+k2hr3-api (1.0.28) unstable; urgency=low
+
+  * Updated support NodeJS version - #106
+
+ -- Takeshi Nakatani <ggtakec@gmail.com>  Wed, 06 Sep 2023 15:25:25 +0900
+
 k2hr3-api (1.0.27) unstable; urgency=low
 
   * Updated TENANT API and fixed bugs in TENANT API - #104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k2hr3-api",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "dependencies": {
     "@kubernetes/client-node": "^0.18.1",
     "body-parser": "^1.20.2",
@@ -9,8 +9,8 @@
     "dateformat": "^4.6.3",
     "debug": "~4.3.4",
     "express": "^4.18.2",
-    "jose": "^4.14.4",
-    "k2hdkc": "^1.0.5",
+    "jose": "^4.14.6",
+    "k2hdkc": "^1.0.6",
     "morgan": "~1.10.0",
     "rotating-file-stream": "^3.1.1"
   },
@@ -28,9 +28,9 @@
     "test": "test"
   },
   "devDependencies": {
-    "chai": "^4.3.7",
+    "chai": "^4.3.8",
     "chai-http": "^4.4.0",
-    "eslint": "^8.45.0",
+    "eslint": "^8.48.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0"
   },

package/tests/auto_init_config_json.sh

@@ -19,8 +19,8 @@
 #
 
 #----------------------------------------------------------
-# This script is checking/creating/Restoring config/local.json
-# (and local-development.json) for test environment
+# This script is checking/creating/Restoring config/local.json5
+# (and local-development.json5) for test environment
 #----------------------------------------------------------
 
 #==========================================================
@@ -35,11 +35,11 @@ SRCTOP=$(cd "${SCRIPTDIR}/.." || exit 1; pwd)
 # Variables
 #
 CONFIGDIR="${SRCTOP}/config"
-LOCAL_JSON="${CONFIGDIR}/local.json"
-LOCAL_JSON_BUP="${LOCAL_JSON}_AUTOTEST_BUP"
-LOCALDEVELOP_JSON="${CONFIGDIR}/local-development.json"
-LOCALDEVELOP_JSON_BUP="${LOCALDEVELOP_JSON}_AUTOTEST_BUP"
-DUMMY_JSON="${CONFIGDIR}/dummyuser.json"
+LOCAL_JSON5="${CONFIGDIR}/local.json5"
+LOCAL_JSON5_BUP="${LOCAL_JSON5}_AUTOTEST_BUP"
+LOCALDEVELOP_JSON5="${CONFIGDIR}/local-development.json5"
+LOCALDEVELOP_JSON5_BUP="${LOCALDEVELOP_JSON5}_AUTOTEST_BUP"
+DUMMY_JSON5="${CONFIGDIR}/dummyuser.json5"
 
 #==============================================================
 # Utility functions
@@ -102,74 +102,74 @@ if [ "${PROC_MODE}" = "set" ]; then
 	#
 
 	#
-	# Check local.json
+	# Check local.json5
 	#
-	if [ -f "${LOCAL_JSON}" ]; then
-		if [ ! -L "${LOCAL_JSON}" ]; then
-			echo "[ERROR] ${LOCAL_JSON} is existed as real file."
+	if [ -f "${LOCAL_JSON5}" ]; then
+		if [ ! -L "${LOCAL_JSON5}" ]; then
+			echo "[ERROR] ${LOCAL_JSON5} is existed as real file."
 			exit 1
 		fi
 
-		if ! SLINK_FILE=$(readlink "${LOCAL_JSON}"); then
-			echo "[ERROR] Could not read link as ${LOCAL_JSON}"
+		if ! SLINK_FILE=$(readlink "${LOCAL_JSON5}"); then
+			echo "[ERROR] Could not read link as ${LOCAL_JSON5}"
 			exit 1
 		fi
 
-		if [ "${SLINK_FILE}" = "${DUMMY_JSON}" ]; then
+		if [ "${SLINK_FILE}" = "${DUMMY_JSON5}" ]; then
 			#
-			# local.json is already linked to dummyuser.json
+			# local.json5 is already linked to dummyuser.json5
 			#
-			echo "[INFO] Already ${LOCAL_JSON} file is linked ${DUMMY_JSON}"
+			echo "[INFO] Already ${LOCAL_JSON5} file is linked ${DUMMY_JSON5}"
 
 		else
 			#
 			# Make backup and create new symbolic link file
 			#
-			if [ -f "${LOCAL_JSON_BUP}" ]; then
-				echo "[ERROR] Could not rename file ${LOCAL_JSON} to ${LOCAL_JSON_BUP}, because ${LOCAL_JSON_BUP} already exists."
+			if [ -f "${LOCAL_JSON5_BUP}" ]; then
+				echo "[ERROR] Could not rename file ${LOCAL_JSON5} to ${LOCAL_JSON5_BUP}, because ${LOCAL_JSON5_BUP} already exists."
 				exit 1
 			fi
 
 			#
 			# Rename
 			#
-			if ! mv "${LOCAL_JSON}" "${LOCAL_JSON_BUP}" >/dev/null 2>&1; then
-				echo "[ERROR] Could not rename file ${LOCAL_JSON} to ${LOCAL_JSON_BUP}"
+			if ! mv "${LOCAL_JSON5}" "${LOCAL_JSON5_BUP}" >/dev/null 2>&1; then
+				echo "[ERROR] Could not rename file ${LOCAL_JSON5} to ${LOCAL_JSON5_BUP}"
 				exit 1
 			fi
 
 			#
-			# Make symbolic link local.json
+			# Make symbolic link local.json5
 			#
-			if ! ln -s "${DUMMY_JSON}" "${LOCAL_JSON}" >/dev/null 2>&1; then
-				echo "[ERROR] Could not create symbolic file ${DUMMY_JSON} to ${LOCAL_JSON}"
+			if ! ln -s "${DUMMY_JSON5}" "${LOCAL_JSON5}" >/dev/null 2>&1; then
+				echo "[ERROR] Could not create symbolic file ${DUMMY_JSON5} to ${LOCAL_JSON5}"
 				exit 1
 			fi
 		fi
 	else
 		#
-		# There is no local.json, thus only make symbolic link local.json
+		# There is no local.json5, thus only make symbolic link local.json5
 		#
-		if ! ln -s "${DUMMY_JSON}" "${LOCAL_JSON}" >/dev/null 2>&1; then
-			echo "[ERROR] Could not create symbolic file ${DUMMY_JSON} to ${LOCAL_JSON}"
+		if ! ln -s "${DUMMY_JSON5}" "${LOCAL_JSON5}" >/dev/null 2>&1; then
+			echo "[ERROR] Could not create symbolic file ${DUMMY_JSON5} to ${LOCAL_JSON5}"
 			exit 1
 		fi
 	fi
 
 	#
-	# Check local-development.json
+	# Check local-development.json5
 	#
-	if [ -f "${LOCALDEVELOP_JSON}" ]; then
-		if [ -f "${LOCALDEVELOP_JSON_BUP}" ]; then
-			echo "[ERROR] Could not rename file ${LOCALDEVELOP_JSON} to ${LOCALDEVELOP_JSON_BUP}, because ${LOCALDEVELOP_JSON_BUP} already exists."
+	if [ -f "${LOCALDEVELOP_JSON5}" ]; then
+		if [ -f "${LOCALDEVELOP_JSON5_BUP}" ]; then
+			echo "[ERROR] Could not rename file ${LOCALDEVELOP_JSON5} to ${LOCALDEVELOP_JSON5_BUP}, because ${LOCALDEVELOP_JSON5_BUP} already exists."
 			exit 1
 		fi
 
 		#
 		# Rename
 		#
-		if ! mv "${LOCALDEVELOP_JSON}" "${LOCALDEVELOP_JSON_BUP}" >/dev/null 2>&1; then
-			echo "[ERROR] Could not rename file ${LOCALDEVELOP_JSON} to ${LOCALDEVELOP_JSON_BUP}"
+		if ! mv "${LOCALDEVELOP_JSON5}" "${LOCALDEVELOP_JSON5_BUP}" >/dev/null 2>&1; then
+			echo "[ERROR] Could not rename file ${LOCALDEVELOP_JSON5} to ${LOCALDEVELOP_JSON5_BUP}"
 			exit 1
 		fi
 	fi
@@ -179,55 +179,55 @@ else
 	#
 
 	#
-	# Restore local.json
+	# Restore local.json5
 	#
-	if [ ! -f "${LOCAL_JSON_BUP}" ]; then
-		if [ -f "${LOCAL_JSON}" ]; then
-			if [ ! -L "${LOCAL_JSON}" ]; then
-				echo "[WARNING] Not found ${LOCAL_JSON_BUP} and exists ${LOCAL_JSON} as real file, so nothing to do"
+	if [ ! -f "${LOCAL_JSON5_BUP}" ]; then
+		if [ -f "${LOCAL_JSON5}" ]; then
+			if [ ! -L "${LOCAL_JSON5}" ]; then
+				echo "[WARNING] Not found ${LOCAL_JSON5_BUP} and exists ${LOCAL_JSON5} as real file, so nothing to do"
 			else
 				#
-				# local.json is symbolic link
+				# local.json5 is symbolic link
 				#
-				if ! SLINK_FILE=$(readlink "${LOCAL_JSON}"); then
-					echo "[ERROR] Could not read link as ${LOCAL_JSON}"
+				if ! SLINK_FILE=$(readlink "${LOCAL_JSON5}"); then
+					echo "[ERROR] Could not read link as ${LOCAL_JSON5}"
 					exit 1
 				fi
 
-				if [ "${SLINK_FILE}" = "${DUMMY_JSON}" ]; then
+				if [ "${SLINK_FILE}" = "${DUMMY_JSON5}" ]; then
 					#
-					# local.json is linked to dummyuser.json
+					# local.json5 is linked to dummyuser.json5
 					#
-					if ! rm -f "${LOCAL_JSON}"; then
-						echo "[ERROR] Could not remove file ${LOCAL_JSON}"
+					if ! rm -f "${LOCAL_JSON5}"; then
+						echo "[ERROR] Could not remove file ${LOCAL_JSON5}"
 						exit 1
 					fi
 				else
 					#
-					# local.json is not linked to dummyuser.json
+					# local.json5 is not linked to dummyuser.json5
 					#
-					echo "[WARNING] Not found ${LOCAL_JSON_BUP} and exists ${LOCAL_JSON} as symbolic link, but it is not linking to dummyuser.json"
+					echo "[WARNING] Not found ${LOCAL_JSON5_BUP} and exists ${LOCAL_JSON5} as symbolic link, but it is not linking to dummyuser.json5"
 				fi
 			fi
 		else
-			echo "[WARNING] Not found ${LOCAL_JSON_BUP} and ${LOCAL_JSON}."
+			echo "[WARNING] Not found ${LOCAL_JSON5_BUP} and ${LOCAL_JSON5}."
 		fi
 	else
-		if [ -f "${LOCAL_JSON}" ]; then
-			if [ ! -L "${LOCAL_JSON}" ]; then
-				echo "[WARNING] ${LOCAL_JSON} is not created by ${PRGNAME} program, because it is not symbolic link."
+		if [ -f "${LOCAL_JSON5}" ]; then
+			if [ ! -L "${LOCAL_JSON5}" ]; then
+				echo "[WARNING] ${LOCAL_JSON5} is not created by ${PRGNAME} program, because it is not symbolic link."
 			else
-				if ! SLINK_FILE=$(readlink "${LOCAL_JSON}"); then
-					echo "[ERROR] Could not read link as ${LOCAL_JSON}"
+				if ! SLINK_FILE=$(readlink "${LOCAL_JSON5}"); then
+					echo "[ERROR] Could not read link as ${LOCAL_JSON5}"
 					exit 1
 				fi
 
-				if [ "${SLINK_FILE}" != "${DUMMY_JSON}" ]; then
-					echo "[WARNING] ${LOCAL_JSON} is not created by ${PRGNAME} program, because it is not symbolic link to ${DUMMY_JSON}."
+				if [ "${SLINK_FILE}" != "${DUMMY_JSON5}" ]; then
+					echo "[WARNING] ${LOCAL_JSON5} is not created by ${PRGNAME} program, because it is not symbolic link to ${DUMMY_JSON5}."
 				else
 					# remove
-					if ! rm -f "${LOCAL_JSON}"; then
-						echo "[ERROR] Could not remove file ${LOCAL_JSON}"
+					if ! rm -f "${LOCAL_JSON5}"; then
+						echo "[ERROR] Could not remove file ${LOCAL_JSON5}"
 						exit 1
 					fi
 				fi
@@ -237,26 +237,26 @@ else
 		#
 		# Rename
 		#
-		if ! mv "${LOCAL_JSON_BUP}" "${LOCAL_JSON}" >/dev/null 2>&1; then
-			echo "[ERROR] Could not rename file ${LOCAL_JSON_BUP} to ${LOCAL_JSON}"
+		if ! mv "${LOCAL_JSON5_BUP}" "${LOCAL_JSON5}" >/dev/null 2>&1; then
+			echo "[ERROR] Could not rename file ${LOCAL_JSON5_BUP} to ${LOCAL_JSON5}"
 			exit 1
 		fi
 	fi
 
 	#
-	# Restore local-development.json
+	# Restore local-development.json5
 	#
-	if [ ! -f "${LOCALDEVELOP_JSON_BUP}" ]; then
-		echo "[INFO] Not found ${LOCALDEVELOP_JSON_BUP}, skip restoring ${LOCALDEVELOP_JSON}."
+	if [ ! -f "${LOCALDEVELOP_JSON5_BUP}" ]; then
+		echo "[INFO] Not found ${LOCALDEVELOP_JSON5_BUP}, skip restoring ${LOCALDEVELOP_JSON5}."
 	else
-		if [ -f "${LOCALDEVELOP_JSON}" ]; then
-			echo "[WARNING] ${LOCALDEVELOP_JSON} already exists, could not restoring from ${LOCALDEVELOP_JSON_BUP}."
+		if [ -f "${LOCALDEVELOP_JSON5}" ]; then
+			echo "[WARNING] ${LOCALDEVELOP_JSON5} already exists, could not restoring from ${LOCALDEVELOP_JSON5_BUP}."
 		else
 			#
 			# Rename
 			#
-			if ! mv "${LOCALDEVELOP_JSON_BUP}" "${LOCALDEVELOP_JSON}" >/dev/null 2>&1; then
-				echo "[ERROR] Could not rename file ${LOCALDEVELOP_JSON_BUP} to ${LOCALDEVELOP_JSON}"
+			if ! mv "${LOCALDEVELOP_JSON5_BUP}" "${LOCALDEVELOP_JSON5}" >/dev/null 2>&1; then
+				echo "[ERROR] Could not rename file ${LOCALDEVELOP_JSON5_BUP} to ${LOCALDEVELOP_JSON5}"
 				exit 1
 			fi
 		fi

package/tests/k2hr3template_test.js

@@ -100,6 +100,9 @@ fs.readFile(templfile, 'utf8', function(err, templString)
 	if('' === varfile){
 		r3logger.dlog('variable file(' + varfile + ') is not specified.');
 		is_varfile_json = false;
+	}else if(apiutil.compareCaseString('.json5', varfile.substr(-6))){
+		r3logger.dlog('variable file(' + varfile + ') is JSON5 type.');
+		is_varfile_json = true;
 	}else if(apiutil.compareCaseString('.json', varfile.substr(-5))){
 		r3logger.dlog('variable file(' + varfile + ') is JSON type.');
 		is_varfile_json = true;

package/tests/k2hr3template_test_async.js

@@ -125,6 +125,9 @@ fs.readFile(templfile, 'utf8', function(err, templString)
 	if('' === varfile){
 		r3logger.dlog('variable file(' + varfile + ') is not specified.');
 		is_varfile_json = false;
+	}else if(apiutil.compareCaseString('.json5', varfile.substr(-6))){
+		r3logger.dlog('variable file(' + varfile + ') is JSON5 type.');
+		is_varfile_json = true;
 	}else if(apiutil.compareCaseString('.json', varfile.substr(-5))){
 		r3logger.dlog('variable file(' + varfile + ') is JSON type.');
 		is_varfile_json = true;

package/tests/test.sh

@@ -304,20 +304,20 @@ if [ "${DEBUG_ENV_LEVEL}" -ge 4 ]; then
 fi
 
 if ! "${AUTO_INIT_SH}" --set; then
-	echo "[ERROR] Could not initialize local.json(symbolic link to dummy)"
+	echo "[ERROR] Could not initialize local.json5(symbolic link to dummy)"
 	exit 1
 fi
 
 if ! NODE_PATH="${NODE_PATH}" NODE_ENV="${NODE_ENV_VALUE}" NODE_DEBUG="${DEBUG_ENV_PARAM}" NODE_LOGGER="${NODE_LOGGER}" NODE_CONFIG_DIR='' node_modules/.bin/mocha --timeout "${TIMEOUT}" "tests/${CMD_PREFIX}${COMMAND}${CMD_SUFFIX}"; then
 	echo "[ERROR] Failed test."
 	if ! "${AUTO_INIT_SH}" --restore; then
-		echo "[ERROR] Could not restore local.json"
+		echo "[ERROR] Could not restore local.json5"
 	fi
 	exit 1
 fi
 
 if ! "${AUTO_INIT_SH}" --restore; then
-	echo "[ERROR] Could not restore local.json"
+	echo "[ERROR] Could not restore local.json5"
 	exit 1
 fi