Merge pull request #160 from neuroforgede/s4ke-patch-5

Update environment_secret.py to allow *_EXTERNAL_ENDPOINT_URL to be ""

skipper/skipper/environment_secret.py

@@ -75,18 +75,16 @@
 SKIPPER_S3_STATIC_ADDRESSING_STYLE = os.environ.get('SKIPPER_S3_STATIC_ADDRESSING_STYLE', 'path')
 
 def check_s3_settings() -> None:
-    # Collect all variables we assigned earlier for MEDIA and STATIC
+    # Collect all variables we assigned earlier for MEDIA and STATIC, don't check *_EXTERNAL_ENDPOINT_URL as that is allowed to be empty
     variables_to_check = {
         'SKIPPER_S3_MEDIA_ACCESS_KEY_ID': SKIPPER_S3_MEDIA_ACCESS_KEY_ID,
         'SKIPPER_S3_MEDIA_SECRET_ACCESS_KEY': SKIPPER_S3_MEDIA_SECRET_ACCESS_KEY,
         'SKIPPER_S3_MEDIA_ENDPOINT_URL': SKIPPER_S3_MEDIA_ENDPOINT_URL,
-        'SKIPPER_S3_MEDIA_EXTERNAL_ENDPOINT_URL': SKIPPER_S3_MEDIA_EXTERNAL_ENDPOINT_URL,
         'SKIPPER_S3_MEDIA_BUCKET_NAME': SKIPPER_S3_MEDIA_BUCKET_NAME,
         'SKIPPER_S3_MEDIA_REGION_NAME': SKIPPER_S3_MEDIA_REGION_NAME,
         'SKIPPER_S3_STATIC_ACCESS_KEY_ID': SKIPPER_S3_STATIC_ACCESS_KEY_ID,
         'SKIPPER_S3_STATIC_SECRET_ACCESS_KEY': SKIPPER_S3_STATIC_SECRET_ACCESS_KEY,
         'SKIPPER_S3_STATIC_ENDPOINT_URL': SKIPPER_S3_STATIC_ENDPOINT_URL,
-        'SKIPPER_S3_STATIC_EXTERNAL_ENDPOINT_URL': SKIPPER_S3_STATIC_EXTERNAL_ENDPOINT_URL,
         'SKIPPER_S3_STATIC_BUCKET_NAME': SKIPPER_S3_STATIC_BUCKET_NAME,
         'SKIPPER_S3_STATIC_REGION_NAME': SKIPPER_S3_STATIC_REGION_NAME,
     }
@@ -103,4 +101,4 @@ def check_s3_settings() -> None:
 SKIPPER_FLOW_DEFAULT_SYSTEM_SECRET = os.environ["SKIPPER_FLOW_DEFAULT_SYSTEM_SECRET"]
 
 SKIPPER_REDIS_URL = os.environ.get('SKIPPER_REDIS_URL', 'redis://redis.local:6379')
-SKIPPER_CELERY_BROKER_URL = os.environ.get('SKIPPER_CELERY_BROKER_URL', 'redis://redis.local:6379')
+SKIPPER_CELERY_BROKER_URL = os.environ.get('SKIPPER_CELERY_BROKER_URL', 'redis://redis.local:6379')