From 6eba8cc45a675265e3882b55b376abc3a184ed03 Mon Sep 17 00:00:00 2001
From: mahanth <22050509+gnmahanth@users.noreply.github.com>
Date: Thu, 30 May 2024 10:22:30 +0530
Subject: [PATCH] fix neo4j commands failing while executing backup (#2172)

fix neo4j commands failing while executiing backup

(https://github.com/deepfence/ThreatMapper/issues/2171)
---
 deepfence_neo4j/backup.sh            | 1 -
 deepfence_neo4j/backup_neo4j.sh      | 2 +-
 deepfence_neo4j/df.sh                | 4 ++--
 deepfence_neo4j/load_backup_neo4j.sh | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deepfence_neo4j/backup.sh b/deepfence_neo4j/backup.sh
index 3fa06be7a3..1dad075def 100755
--- a/deepfence_neo4j/backup.sh
+++ b/deepfence_neo4j/backup.sh
@@ -1,3 +1,2 @@
 #!/bin/bash
 docker run --rm --volumes-from deepfence-neo4j -v $(pwd):/backup ubuntu tar cvf /backup/backup.tar /data
-
diff --git a/deepfence_neo4j/backup_neo4j.sh b/deepfence_neo4j/backup_neo4j.sh
index 8fbad242e7..128a785e54 100755
--- a/deepfence_neo4j/backup_neo4j.sh
+++ b/deepfence_neo4j/backup_neo4j.sh
@@ -14,7 +14,7 @@ if [ $retVal -ne 0 ]; then
     exit
 fi
 
-neo4j-admin dump --database='neo4j' --to=$BACKUP_FILE
+neo4j-admin database dump neo4j --to-stdout > $BACKUP_FILE
 retVal=$?
 if [ $retVal -ne 0 ]; then
     echo "Failed to create the backup file"
diff --git a/deepfence_neo4j/df.sh b/deepfence_neo4j/df.sh
index 844ebbef24..55e4ccf6b8 100755
--- a/deepfence_neo4j/df.sh
+++ b/deepfence_neo4j/df.sh
@@ -46,7 +46,7 @@ backup_db() {
     touch /backups/.inprogress
     neo4j stop
     NOW=$(date +"%Y-%m-%d_%H-%M-%S")
-    neo4j-admin dump --database=neo4j --to="/backups/neo4j_$NOW.dump"
+    neo4j-admin database dump neo4j --to-stdout > /backups/neo4j_$NOW.dump
     ls -tr /backups/*.dump | head -n -${MAX_NUM_BACKUPS:-5} | xargs --no-run-if-empty rm
     start_db
     rm /backups/.inprogress
@@ -75,7 +75,7 @@ else
         echo "Backup already loaded, skipping"
     else
         echo "Start using backup: $USE_BACKUP"
-        neo4j-admin load --database=neo4j --from=$USE_BACKUP --force
+        cat $USE_BACKUP | neo4j-admin database load --from-stdin neo4j --overwrite-destination=true
         mv $USE_BACKUP $USE_BACKUP.used
     fi
 fi
diff --git a/deepfence_neo4j/load_backup_neo4j.sh b/deepfence_neo4j/load_backup_neo4j.sh
index 8f149731aa..a2d3a3e2a2 100755
--- a/deepfence_neo4j/load_backup_neo4j.sh
+++ b/deepfence_neo4j/load_backup_neo4j.sh
@@ -16,7 +16,7 @@ if [ $retVal -ne 0 ]; then
     exit
 fi
 
-neo4j-admin load --from=$BACKUP_FILE --database='neo4j' --force
+cat $BACKUP_FILE | neo4j-admin database load --from-stdin neo4j --overwrite-destination=true
 retVal=$?
 if [ $retVal -ne 0 ]; then
     echo "Failed to load the db file"