Fix domain for GCP bucket, should be domain not prefix

quetz-al · Mar 11, 2020 · d4fca1d · d4fca1d
1 parent ac38eec
commit d4fca1d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/config.py b/config.py
@@ -208,8 +208,7 @@ class Config:
         'gs://quetzal-dev-data'
     QUETZAL_GCP_BACKUP_BUCKET = os.environ.get('QUETZAL_GCP_BACKUP_BUCKET') or \
         'gs://quetzal-dev-backups'
-    QUETZAL_GCP_BUCKET_PREFIX = os.environ.get('QUETZAL_GCP_BUCKET_PREFIX') or \
-        'quetzal-ws'
+    QUETZAL_GCP_BUCKET_DOMAIN = os.environ.get('QUETZAL_GCP_BUCKET_DOMAIN', None)
 
     # Quetzal-file storage configuration
     QUETZAL_FILE_DATA_DIR = os.environ.get('QUETZAL_FILE_DATA_DIR') or '/data'

diff --git a/helm/quetzal/Chart.yaml b/helm/quetzal/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: quetzal
-version: 0.1.2         # Chart version
+version: 0.1.3         # Chart version
 appVersion: 0.5.1      # Quetzal app version
 description: A RESTful API designed to store data files and manage their associated metadata.
 home: https://quetz.al

diff --git a/helm/quetzal/templates/app-deployment.yaml b/helm/quetzal/templates/app-deployment.yaml
@@ -50,8 +50,8 @@ spec:
               value: {{ .Values.general.dataBucket | quote }}
             - name: QUETZAL_GCP_BACKUP_BUCKET
               value: {{ .Values.general.backupBucket | quote }}
-            - name: QUETZAL_GCP_BUCKET_PREFIX
-              value: {{ .Values.general.bucketPrefix | quote }}
+            - name: QUETZAL_GCP_BUCKET_DOMAIN
+              value: {{ .Values.general.bucketDomain | quote }}
             - name: QUETZAL_BACKGROUND_JOBS
               value: "1"
             - name: USE_GUNICORN

diff --git a/helm/quetzal/templates/worker-deployment.yaml b/helm/quetzal/templates/worker-deployment.yaml
@@ -46,8 +46,8 @@ spec:
               value: {{ .Values.general.dataBucket | quote }}
             - name: QUETZAL_GCP_BACKUP_BUCKET
               value: {{ .Values.general.backupBucket | quote }}
-            - name: QUETZAL_GCP_BUCKET_PREFIX
-              value: {{ .Values.general.bucketPrefix | quote }}
+            - name: QUETZAL_GCP_BUCKET_DOMAIN
+              value: {{ .Values.general.bucketDomain | quote }}
             - name: DB_HOST
               value: "db"
             - name: DB_PORT

diff --git a/helm/quetzal/values.yaml b/helm/quetzal/values.yaml
@@ -12,7 +12,7 @@ general:
   credentialsSecret: sandbox-credentials-secrets
   dataBucket: gs://quetzal-sandbox-data
   backupBucket: gs://quetzal-sandbox-backups
-  bucketPrefix:
+  bucketDomain:
 
 ingress:
   tlsSecret: sandbox-tls-secret

diff --git a/quetzal/app/api/data/tasks.py b/quetzal/app/api/data/tasks.py
@@ -173,14 +173,16 @@ def init_data_bucket(wid):
         raise WorkerException('Workspace was not on the expected state')
 
     # Do the initialization task
-    # TODO: manage exceptions/errors
-    # TODO: manage location and storage class through configuration or workspace options
-    bucket_name = f'{workspace.id}-{workspace.owner.username}-{workspace.name}'
+    parts = ['ws', str(workspace.id), workspace.owner.username, workspace.name]
+    sep = '-'
+    if storage_backend == 'GCP' and current_app.config['QUETZAL_GCP_BUCKET_DOMAIN']:
+        sep = '.'
+        parts.append(current_app.config['QUETZAL_GCP_BUCKET_DOMAIN'])
+    bucket_name = sep.join(parts)
 
     try:
         if storage_backend == 'GCP':
-            prefix = current_app.config['QUETZAL_GCP_BUCKET_PREFIX']
-            bucket_name = f'{prefix}-{bucket_name}'
+            # TODO: manage location and storage class through configuration or workspace options
             data_url = _init_gcp_data_bucket(bucket_name)
         elif storage_backend == 'file':
             data_url = _init_local_data_bucket(bucket_name)