fix: Fix some bugs in precheck.sh (#33)

* fix: Fix some bugs in precheck.sh
1. Remove redundant logs
2. Fix some execution errors
3. Fix the logic of checking console configurations

* Fix up

Author: CH3CHO

compose/scripts/precheck.sh

@@ -28,10 +28,12 @@ checkConfigExists() {
   # $3 configName
   case $CONFIG_STORAGE in
     nacos)
-      return checkNacosConfigExists "$@"
+      checkNacosConfigExists "$@"
+      return $?
       ;;
     file)
-      return checkFileConfigExists "$@"
+      checkFileConfigExists "$@"
+      return $?
       ;;
     *)
       printf "  Unknown storage type: %s\n" "$CONFIG_STORAGE"
@@ -52,7 +54,7 @@ checkNacosConfigExists() {
   elif [ $statusCode -eq 404 ]; then
     return -1
   else
-    echo ${1:-"  Checking config ${group}/${dataId} in namespace ${NACOS_NS} failed with $retVal"}
+    echo "  Checking config ${group}/${dataId} in namespace ${NACOS_NS} failed with ${statusCode}"
     exit -1
   fi
 }
@@ -62,7 +64,11 @@ checkFileConfigExists() {
   # $2 configType: plural
   # $3 configName
   local configFile="${FILE_ROOT_DIR}/$2/$3.yaml"
-  return [ -f "$configFile" ]
+  if [ -f "$configFile" ]; then
+    return 0
+  else
+    return 1
+  fi
 }
 
 getConfig() {
@@ -90,8 +96,6 @@ getNacosConfig() {
   local group="$1"
   local dataId="$2.$3"
 
-  echo "Group=$group  DataId=$dataId"
-
   config=""
   tmpFile=$(mktemp /tmp/higress-precheck-nacos.XXXXXXXXX.cfg)
   statusCode=$(curl -s -o "$tmpFile" -w "%{http_code}" "${NACOS_SERVER_URL}/v1/cs/configs?accessToken=${NACOS_ACCESS_TOKEN}&tenant=${NACOS_NS}&dataId=${dataId}&group=${group}")
@@ -251,7 +255,6 @@ checkPilot() {
   IFS=$'\n'
   for fileName in $fileNames
   do
-    echo "FileName: $fileName"
     if [ -z "$fileName" ]; then
       continue
     fi
@@ -282,12 +285,12 @@ checkConsole() {
   echo "Checking console configurations..."
 
   checkConfigExists "higress-system" "configmaps" "higress-console"
-  if [ ! $?  ]; then
+  if [ $? -ne 0 ]; then
     echo "  The ConfigMap resource of Higress Console doesn't exist."
     exit -1
   fi
   checkConfigExists "higress-system" "secrets" "higress-console"
-  if [ ! $? ]; then
+  if [ $? -ne 0 ]; then
     echo "  The Secret resource of Higress Console doesn't exist."
     exit -1
   fi