Removed AGENT_CONFIG from config.js and some changes

Signed-off-by: Aayush Chouhan <[email protected]>

Author: aayushchouhan09

config.js

@@ -242,12 +242,6 @@ if (process.env.CONTAINER_PLATFORM || process.env.LOCAL_MD_SERVER) {
 
 config.ROOT_KEY_MOUNT = '/etc/noobaa-server/root_keys';
 
-//////////////////
-// AGENT CONFIG //
-//////////////////
-config.AGENT_CONFIG_PATH = process.env.AGENT_CONFIG_PATH || '/etc/agent-config/agent_config';
-config.AGENT_CONFIG = process.env.AGENT_CONFIG || _get_data_from_file(config.AGENT_CONFIG_PATH);
-
 ///////////////
 // DB CONFIG //
 ///////////////

src/deploy/NVA_build/noobaa_init.sh

@@ -123,26 +123,24 @@ run_internal_process() {
 prepare_agent_conf() {
   AGENT_CONF_FILE="/noobaa_storage/agent_conf.json"
 
-  # get AGENT_CONFIG from env var or config.js (volume mount)
-  if [ -z ${AGENT_CONFIG} ]; then
-    cd /root/node_modules/noobaa-core/
-    AGENT_CONFIG=$(node -p 'require("./config").AGENT_CONFIG || ""')
-  fi
+  [ -f "$AGENT_CONF_FILE" ] && return 0
+
+  # get AGENT_CONFIG from env var or file
+  AGENT_CONFIG_PATH=${AGENT_CONFIG_PATH:-"/etc/agent-config/agent_config"}
+  AGENT_CONFIG=${AGENT_CONFIG:-$(cat "$AGENT_CONFIG_PATH" 2>/dev/null || echo "")}
 
   if [ -z "${AGENT_CONFIG}" ]; then
-    echo "AGENT_CONFIG is required. AGENT_CONFIG is missing. Exit"
+    echo "AGENT_CONFIG is required. AGENT_CONFIG is not found in env or $AGENT_CONFIG_PATH. Exit"
     exit 1
   fi
 
-  echo "Got agent_conf"
-  if [ ! -f $AGENT_CONF_FILE ]; then
-    if echo "${AGENT_CONFIG}" | jq . >/dev/null 2>&1; then
-      echo "${AGENT_CONFIG}" >${AGENT_CONF_FILE}
-    else
-      openssl enc -base64 -d -A <<<${AGENT_CONFIG} >${AGENT_CONF_FILE}
-    fi
+  # write agent config - decode base64 if not a valid JSON format
+  if ! echo "${AGENT_CONFIG}" | jq . >"$AGENT_CONF_FILE" 2>/dev/null; then
+    openssl enc -base64 -d -A <<<"${AGENT_CONFIG}" >"$AGENT_CONF_FILE" || {
+      echo "AGENT_CONFIG format is invalid. AGENT_CONFIG must be valid JSON or base64 encoded JSON. Exit"
+      exit 1
+    }
   fi
-  echo "Written agent_conf.json"
 }
 
 prepare_server_pvs() {