From e10e0fec9e41d4f6c25aa6ef3f06f8115c82d14d Mon Sep 17 00:00:00 2001
From: Jakub Warczarek <jakub.warczarek@gmail.com>
Date: Wed, 28 Oct 2020 10:56:50 +0100
Subject: [PATCH] Add support in UI for custom S3 endpoints for backups (#1152)

* Support custom S3 endpoint for backups

* Log info about AWS S3 endpoint during start up
---
 ui/operator_ui/main.py       | 3 +++
 ui/operator_ui/spiloutils.py | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/operator_ui/main.py b/ui/operator_ui/main.py
index dc2450b9f..d159bee2d 100644
--- a/ui/operator_ui/main.py
+++ b/ui/operator_ui/main.py
@@ -104,6 +104,8 @@ USE_AWS_INSTANCE_PROFILE = (
     getenv('USE_AWS_INSTANCE_PROFILE', 'false').lower() != 'false'
 )
 
+AWS_ENDPOINT = getenv('AWS_ENDPOINT')
+
 tokens.configure()
 tokens.manage('read-only')
 tokens.start()
@@ -1055,6 +1057,7 @@ def main(port, secret_key, debug, clusters: list):
     logger.info(f'Tokeninfo URL: {TOKENINFO_URL}')
     logger.info(f'Use AWS instance_profile: {USE_AWS_INSTANCE_PROFILE}')
     logger.info(f'WAL-E S3 endpoint: {WALE_S3_ENDPOINT}')
+    logger.info(f'AWS S3 endpoint: {AWS_ENDPOINT}')
 
     if TARGET_NAMESPACE is None:
         @on_exception(
diff --git a/ui/operator_ui/spiloutils.py b/ui/operator_ui/spiloutils.py
index ea347a84d..7a71f6dab 100644
--- a/ui/operator_ui/spiloutils.py
+++ b/ui/operator_ui/spiloutils.py
@@ -16,6 +16,8 @@ logger = getLogger(__name__)
 
 session = Session()
 
+AWS_ENDPOINT = getenv('AWS_ENDPOINT')
+
 OPERATOR_CLUSTER_NAME_LABEL = getenv('OPERATOR_CLUSTER_NAME_LABEL', 'cluster-name')
 
 COMMON_CLUSTER_LABEL = getenv('COMMON_CLUSTER_LABEL', '{"application":"spilo"}')
@@ -266,7 +268,7 @@ def read_stored_clusters(bucket, prefix, delimiter='/'):
     return [
         prefix['Prefix'].split('/')[-2]
         for prefix in these(
-            client('s3').list_objects(
+            client('s3', endpoint_url=AWS_ENDPOINT).list_objects(
                 Bucket=bucket,
                 Delimiter=delimiter,
                 Prefix=prefix,
@@ -287,7 +289,7 @@ def read_versions(
     return [
         'base' if uid == 'wal' else uid
         for prefix in these(
-            client('s3').list_objects(
+            client('s3', endpoint_url=AWS_ENDPOINT).list_objects(
                 Bucket=bucket,
                 Delimiter=delimiter,
                 Prefix=prefix + pg_cluster + delimiter,