address feedback

Author: idanovinda

ENVIRONMENT.rst

@@ -116,7 +116,8 @@ wal-g
 -----
 
 wal-g is used everywhere in Spilo to perform backups and restore from them. **Support for wal-e has been removed**.
-For backward compatibility, Spilo will still recognize environment variables containing **WALE**.
+Backward compatibility is ensured for environment variables containing **WALE**, the env-dir layout, and bootstrap method names.
+This allows existing configurations and clusters to continue working without requiring immediate changes.
 Regardless of which variable is set, all backups and restores will be performed using wal-g.
 However, if both **WALE** and **WALG** variables are present, the latter will take precedence.
 - **WALG_DELTA_MAX_STEPS**, **WALG_DELTA_ORIGIN**, **WALG_DOWNLOAD_CONCURRENCY**, **WALG_UPLOAD_CONCURRENCY**, **WALG_UPLOAD_DISK_CONCURRENCY**, **WALG_DISK_RATE_LIMIT**, **WALG_NETWORK_RATE_LIMIT**, **WALG_COMPRESSION_METHOD**, **WALG_BACKUP_COMPRESSION_METHOD**, **WALG_BACKUP_FROM_REPLICA**, **WALG_SENTINEL_USER_DATA**, **WALG_PREVENT_WAL_OVERWRITE**: (optional) configuration options for wal-g.

postgres-appliance/bootstrap/clone_with_walg.py

@@ -119,6 +119,7 @@ def get_possible_versions():
 
 def get_walg_environments(env):
     prefix = 'WALG_'
+    # len('WALG_PREFIX') = 12
     names = [name for name in env.keys() if name.endswith('_PREFIX') and name.startswith(prefix) and len(name) > 12]
     if len(names) != 1:
         raise Exception('Found find {0} {1}*_PREFIX environment variables, expected 1'

postgres-appliance/scripts/configure_spilo.py

@@ -527,7 +527,7 @@ def get_placeholders(provider):
     placeholders = {}
     for key, value in os.environ.items():
         if "WALE" in key:
-            new_key = key.replace("WALE", "WALG")
+            new_key = key.replace("WALE", "WALG")  # backward compatibility
             if new_key in os.environ:
                 # skip, because a real WALG env already exists
                 continue
@@ -616,6 +616,7 @@ def get_placeholders(provider):
     else:
         placeholders['LOG_SHIP_HOURLY'] = ''
 
+    # use namespaces to set WAL bucket prefix scope naming the folder namespace-clustername for non-default namespace
     placeholders.setdefault('LOG_BUCKET_SCOPE_PREFIX', '{0}-'.format(placeholders['NAMESPACE'])
                             if placeholders['NAMESPACE'] not in ('default', '') else '')
 
@@ -654,7 +655,7 @@ def get_placeholders(provider):
 
     # check if we have enough parameters to enable WAL-G
     placeholders['USE_WALG'] = any(placeholders.get(n) for n in AUTO_ENABLE_WALG_RESTORE +
-                                   ('WAL_SWIFT_BUCKET', 'WAL_GCS_BUCKET', 'WAL_GS_BUCKET', 'WALG_GS_PREFIX'))
+                                   ('WAL_SWIFT_BUCKET', 'WAL_GS_BUCKET', 'WALG_GS_PREFIX'))
 
     if placeholders.get('WALG_BACKUP_FROM_REPLICA'):
         placeholders['WALG_BACKUP_FROM_REPLICA'] = str(placeholders['WALG_BACKUP_FROM_REPLICA']).lower()
@@ -857,7 +858,7 @@ def write_walg_environment(placeholders, prefix, overwrite):
 
     walg = defaultdict(lambda: '')
     for name in ['PGVERSION', 'PGPORT', 'WALG_ENV_DIR', 'SCOPE', 'WAL_BUCKET_SCOPE_PREFIX', 'WAL_BUCKET_SCOPE_SUFFIX',
-                 'WAL_S3_BUCKET', 'WAL_GCS_BUCKET', 'WAL_GS_BUCKET', 'WAL_SWIFT_BUCKET', 'BACKUP_NUM_TO_RETAIN',
+                 'WAL_S3_BUCKET', 'WAL_GS_BUCKET', 'WAL_SWIFT_BUCKET', 'BACKUP_NUM_TO_RETAIN',
                  'ENABLE_WAL_PATH_COMPAT'] + s3_names + swift_names + gs_names + walg_names + azure_names + \
             azure_auth_names + ssh_names:
         walg[name] = placeholders.get(prefix + name, '')
@@ -910,12 +911,9 @@ def write_walg_environment(placeholders, prefix, overwrite):
                 walg[name] = placeholders.get(name)
 
         write_envdir_names = s3_names + walg_names + aws_imds_names
-    elif walg.get('WAL_GCS_BUCKET') or walg.get('WAL_GS_BUCKET') or\
-            walg.get('WALG_GS_PREFIX'):
-        if walg.get('WAL_GCS_BUCKET'):
-            walg['WAL_GS_BUCKET'] = walg['WAL_GCS_BUCKET']
+    elif walg.get('WAL_GS_BUCKET') or walg.get('WALG_GS_PREFIX'):
         write_envdir_names = gs_names + walg_names
-    elif walg.get('WAL_SWIFT_BUCKET'):
+    elif walg.get('WAL_SWIFT_BUCKET') or walg.get('WALG_SWIFT_BUCKET'):
         write_envdir_names = swift_names
     elif walg.get("WALG_AZ_PREFIX"):
         azure_auth = []

postgres-appliance/tests/test_spilo.sh

@@ -136,8 +136,7 @@ function test_successful_inplace_upgrade_to_14() {
 }
 
 function test_envdir_suffix() {
-    docker_exec "$1" "cat /run/etc/wal-e.d/env/WALG_S3_PREFIX" | grep -q "$2$" \
-        && docker_exec "$1" "cat /run/etc/wal-e.d/env/WALG_S3_PREFIX" | grep -q "$2$"
+    docker_exec "$1" "cat /run/etc/wal-e.d/env/WALG_S3_PREFIX" | grep -q "$2$"
 }
 
 function test_envdir_updated_to_x() {