From ef5553c696ed75648439601eb8c38e69d36c894e Mon Sep 17 00:00:00 2001
From: Tvion <snakersu@gmail.com>
Date: Mon, 3 Aug 2026 18:47:17 +0500
Subject: [PATCH] fix: [CPCAP-12074] add awscli to backup-daemon and streamline
 S3 storage functions

---
 services/backup-daemon/Dockerfile                       | 1 +
 services/backup-daemon/docker/granular/storage_s3.py    | 8 ++------
 services/backup-daemon/docker/postgres/aws-s3-backup.sh | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/services/backup-daemon/Dockerfile b/services/backup-daemon/Dockerfile
index 830021cd..f639a616 100644
--- a/services/backup-daemon/Dockerfile
+++ b/services/backup-daemon/Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get --no-install-recommends install -y comerr-dev \
                        postgresql-13 postgresql-14 postgresql-15 postgresql-16 postgresql-17 postgresql-18 \
                        jq \
                        openssl curl \
+                       awscli \
                        vim \
                        locales
 RUN python3 -m pip install -U setuptools==82.0.1 wheel==0.47.0
diff --git a/services/backup-daemon/docker/granular/storage_s3.py b/services/backup-daemon/docker/granular/storage_s3.py
index 37764f4f..81fd5636 100644
--- a/services/backup-daemon/docker/granular/storage_s3.py
+++ b/services/backup-daemon/docker/granular/storage_s3.py
@@ -194,9 +194,7 @@ def get_granular_namespaces(self, storage):
                 namespace = vault.split("/", 2)[1]
                 if namespace not in namespaces:
                     namespaces.append(namespace)
-                else:
-                    pass
-            return namespaces
+        return namespaces
 
     def get_backup_ids(self, storage, namespace):
         namespaced_path = self.get_prefixed_path(storage + "/" + namespace)
@@ -208,9 +206,7 @@ def get_backup_ids(self, storage, namespace):
                 backup_id = vault.split("/", 3)[2]
                 if backup_id not in backup_ids:
                     backup_ids.append(backup_id)
-                else:
-                    pass
-            return backup_ids
+        return backup_ids
 
     def get_prefixed_path(self, path):
         if self.aws_prefix:
diff --git a/services/backup-daemon/docker/postgres/aws-s3-backup.sh b/services/backup-daemon/docker/postgres/aws-s3-backup.sh
index f2c5a3a9..82017616 100755
--- a/services/backup-daemon/docker/postgres/aws-s3-backup.sh
+++ b/services/backup-daemon/docker/postgres/aws-s3-backup.sh
@@ -53,6 +53,7 @@ POSTGRES_USER=$(read_secret_file "${PG_USER_CREDS_PATH}username" "postgres")
 POSTGRES_PASSWORD=$(read_secret_file "${PG_USER_CREDS_PATH}password" "")
 AWS_ACCESS_KEY_ID=$(read_secret_file "${AWS_CREDS_PATH}key_id" "")
 AWS_SECRET_ACCESS_KEY=$(read_secret_file "${AWS_CREDS_PATH}access_key" "")
+export AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY
 
 function log() {
   log_module "$1" "aws-s3-backup" "$2"