Merge branch 'fusion-data-multicrs-fix' into 'staging'

multiple crs fix for single-file scheme

Closes #105

See merge request !73

.gitlab-ci.yml

@@ -205,6 +205,7 @@ stop_review_app:
   except:
     - master
     - staging
+  when: manual
 
 pages:
   image: python:3.8-slim

core/configure.sh

@@ -50,6 +50,7 @@
     echo "USE_X_FORWARDED_HOST = True" >> pvs_instance/settings.py
     echo "SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')" >> pvs_instance/settings.py
 
+    sed -e "s/SECRET_KEY = '.*'/SECRET_KEY = '${DJANGO_SECRET_KEY}'/" -i pvs_instance/settings.py
     chmod g+w -R .
     chgrp users -R .
 } 1>&2

core/entrypoint.sh

@@ -44,6 +44,7 @@ EOF
 }
 
 file_env "OS_PASSWORD"
+file_env "DJANGO_SECRET_KEY"
 file_env "DJANGO_PASSWORD"
 
 eval "/opt/eoxserver/eoxserver-entrypoint.sh $@" >&2

core/registrar/scheme.py

@@ -316,11 +316,13 @@ class STACItemScheme(RegistrationScheme):
 class SingleFileRegistrationScheme(RegistrationScheme):
     name = "single-file"
 
-    def __init__(self, footprint: str, product_type: str, level: str, date_format: str):
+    def __init__(self, footprint: str, product_type: str, level: str, 
+                 date_format: str, id_template: str=None):
         self.footprint = footprint
         self.product_type = product_type
         self.level = level
         self.date_format = date_format
+        self.id_template = id_template
 
     def get_context(self, source: Source, path: str) -> List[Context]:
 
@@ -346,10 +348,16 @@ class SingleFileRegistrationScheme(RegistrationScheme):
         ]
 
     def _get_identifier(self, path: str, begin_time: datetime, end_time: datetime) -> str:
-        return f"{self.product_type}_{isoformat(begin_time)}_{isoformat(end_time)}"
+        begin_time=isoformat(begin_time)
+        end_time=isoformat(end_time)
+        if not self.id_template:
+            return f"{self.product_type}_{begin_time}_{end_time}"
+        return self.id_template.format(product_type=self.product_type, begin_time=begin_time, end_time=end_time)
 
     def _get_datetimes(self, path: str) -> Tuple[datetime, datetime]:
         dt = path.split("/")[-1].split(".")[0]
+        dt = re.search(r'\d{4}-\d{2}-\d{2}', dt).group()
+
         begin = datetime.strptime(dt, self.date_format)
         end = begin.replace(hour=23, minute=59, second=59)
 

testing/gitlab_test.sh

@@ -21,6 +21,7 @@ sed -i -e 's/emg-cache/pvs_testing/g' ../env/emg_obs.env
 sed -i -e 's/vhr18-cache/pvs_testing/g' ../env/vhr18_obs.env
 
 # source the env file
+echo "DJANGO_SECRET_KEY=${DJANGO_SECRET_KEY}" >> ../env/emg.env
 set -o allexport
 source ../env/emg.env
 set +o allexport
@@ -32,6 +33,7 @@ docker network create -d overlay emg-extnet
 # create the docker secrets
 printf $OS_PASSWORD_DOWNLOAD | docker secret create OS_PASSWORD_DOWNLOAD -
 printf $DJANGO_PASSWORD | docker secret create DJANGO_PASSWORD -
+printf $DJANGO_SECRET_KEY | docker secret create DJANGO_SECRET_KEY -
 printf $OS_PASSWORD | docker secret create OS_PASSWORD -
 
 # create docker configs