Skip to content

fix: [CPCAP-12074] add awscli to backup-daemon and streamline S3 stor… #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anikin-aa merged 1 commit into from
Aug 3, 2026
+4 −6
Merged

fix: [CPCAP-12074] add awscli to backup-daemon and streamline S3 stor… #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions services/backup-daemon/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions services/backup-daemon/docker/granular/storage_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions services/backup-daemon/docker/postgres/aws-s3-backup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading