Merge pull request #2 from someengineering/lloesche/envprefix

Add env prefix to backup files
someengineering · Dec 13, 2023 · 4b8132d · 4b8132d
2 parents 17b60a9 + 4e202b1
commit 4b8132d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/fixbackup/args.py b/fixbackup/args.py
@@ -12,6 +12,13 @@ def parse_args(add_args: List[Callable[[ArgumentParser], None]]) -> Namespace:
         type=str,
         default=os.getenv("BACKUP_DIRECTORY", "."),
     )
+    arg_parser.add_argument(
+        "-n",
+        "--name",
+        dest="environment",
+        help="Name of the environment",
+        default=os.getenv("FIX_ENVIRONMENT", "dev"),
+    )
 
     for add_arg in add_args:
         add_arg(arg_parser)

diff --git a/fixbackup/backup/__init__.py b/fixbackup/backup/__init__.py
@@ -13,13 +13,14 @@
 def backup(args: Namespace, backup_directory: Path) -> Tuple[List[Path], bool]:
     result: List[Path] = []
     all_success = True
+    environment = args.environment
     date_prefix = datetime.utcnow().strftime("%Y%m%d%H%M")
 
     if args.redis_host and (valid_hostname(args.redis_host) or valid_ip(args.redis_host)):
         db = str(args.redis_database_number)
         if not valid_dbname(db):
             raise ValueError(f"Invalid database name: {db}")
-        redis_backup_file = backup_directory / f"{date_prefix}-redis-{args.redis_host}-{db}.rdb.gz"
+        redis_backup_file = backup_directory / f"{environment}-{date_prefix}-redis-{args.redis_host}-{db}.rdb.gz"
         if redis_backup(args, redis_backup_file):
             result.append(redis_backup_file)
         else:
@@ -32,7 +33,7 @@ def backup(args: Namespace, backup_directory: Path) -> Tuple[List[Path], bool]:
                 raise ValueError(f"Invalid database name: {db}")
         else:
             db = "all"
-        mysql_backup_file = backup_directory / f"{date_prefix}-mysql-{args.mysql_host}-{db}.sql.gz"
+        mysql_backup_file = backup_directory / f"{environment}-{date_prefix}-mysql-{args.mysql_host}-{db}.sql.gz"
         if mysql_backup(args, mysql_backup_file):
             result.append(mysql_backup_file)
         else:
@@ -45,7 +46,7 @@ def backup(args: Namespace, backup_directory: Path) -> Tuple[List[Path], bool]:
                 raise ValueError(f"Invalid database name: {db}")
         else:
             db = "all"
-        arangodb_backup_file = backup_directory / f"{date_prefix}-arangodb-{args.arangodb_host}-{db}.tar.gz"
+        arangodb_backup_file = backup_directory / f"{environment}-{date_prefix}-arangodb-{args.arangodb_host}-{db}.tar.gz"
         if arangodb_backup(args, arangodb_backup_file):
             result.append(arangodb_backup_file)
         else: