Merge pull request #599 from geoadmin/develop

New Release v2.1.0 - #minor

Author: schtibe

.env.default

@@ -19,7 +19,7 @@ LEGACY_AWS_S3_CUSTOM_DOMAIN=127.0.0.1:9090/service-stac-local
 SECRET_KEY=dummy
 HEALTHCHECK_ENDPOINT=healthcheck
 ALLOWED_HOSTS=*
-MANAGED_BUCKET_COLLECTION_PATTERNS=ch\.meteoschweiz\.ogd-.*,ch\.bgdi-test\..*
+MANAGED_BUCKET_COLLECTION_PATTERNS=ch.meteoschweiz.ogd-,ch.bgdi-test.
 
 # these are just here for completeness
 AWS_ROLE_ARN=some-arn

README.md

@@ -535,7 +535,7 @@ The service is configured by Environment Variable:
 | AWS_S3_ENDPOINT_URL | `None` |  |
 | AWS_S3_CUSTOM_DOMAIN | `None` | |
 | AWS_PRESIGNED_URL_EXPIRES | 3600 | AWS presigned url for asset upload expire time in seconds |
-| MANAGED_BUCKET_COLLECTION_PATTERNS | - | A list of regex patterns for collections that go to the managed bucket |
+| MANAGED_BUCKET_COLLECTION_PATTERNS | - | A list of prefix patterns for collections that go to the managed bucket |
 | EXTERNAL_URL_REACHABLE_TIMEOUT | `5` | How long the external asset URL validator should try to connect to given asset in seconds |
 
 #### **Development settings (only for local environment and DEV staging)**

app/config/settings_dev.py

@@ -54,7 +54,7 @@
 
 # Regex patterns of collections that should go to the managed bucket
 MANAGED_BUCKET_COLLECTION_PATTERNS = env.list(
-    'MANAGED_BUCKET_COLLECTION_PATTERNS', default=[r"^ch\.meteoschweiz\.ogd-*"]
+    'MANAGED_BUCKET_COLLECTION_PATTERNS', default=["ch.meteoschweiz.ogd-"]
 )
 
 # Since it's impossible to recreate the service-account situation with minio

app/stac_api/utils.py

@@ -3,7 +3,6 @@
 import json
 import logging
 import os
-import re
 from base64 import b64decode
 from datetime import datetime
 from datetime import timezone
@@ -571,8 +570,7 @@ def select_s3_bucket(collection_name) -> AVAILABLE_S3_BUCKETS:
     patterns = settings.MANAGED_BUCKET_COLLECTION_PATTERNS
 
     for pattern in patterns:
-        match = re.fullmatch(pattern, collection_name)
-        if match is not None:
+        if collection_name.startswith(pattern):
             return AVAILABLE_S3_BUCKETS.managed
 
     return AVAILABLE_S3_BUCKETS.legacy

app/tests/test_multiple_bucket_setup.py

@@ -163,7 +163,7 @@ class TestBucketSelector(TestCase):
     ])
     def test_bucket_selection(self, collection_name, expected_bucket):
         """Test if the pattern selection works"""
-        patterns = [r'ch\.meteoschweiz\.ogd-.*', r'ch\.swisstopo\.bgdi.*', r'ch\.are\..*']
+        patterns = ['ch.meteoschweiz.ogd-', 'ch.swisstopo.bgdi', 'ch.are.']
         with self.settings(MANAGED_BUCKET_COLLECTION_PATTERNS=patterns):
             bucket_name = select_s3_bucket(collection_name)