From e493772c05f7fac7b9ab7989aa7abadaaa18c7c6 Mon Sep 17 00:00:00 2001
From: KRAIEM Taha Yassine <tahayk2@gmail.com>
Date: Mon, 17 May 2021 12:58:23 +0200
Subject: [PATCH] Changes: - nginx: changed minio-bucket names - minio-script:
 added missing sourcempas bucket - minio-script: changed bucket names

---
 scripts/helm/app/chalice.yaml                          | 10 +++++-----
 scripts/helm/db/bucket_policy.sh                       |  4 ++--
 .../nginx-ingress/templates/configmap.yaml             |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/helm/app/chalice.yaml b/scripts/helm/app/chalice.yaml
index eccd3b785..9a02adfaa 100644
--- a/scripts/helm/app/chalice.yaml
+++ b/scripts/helm/app/chalice.yaml
@@ -36,14 +36,14 @@ env:
   assign_link: http://127.0.0.1:8000/async/email_assignment
   captcha_server: ''
   captcha_key: ''
-  sessions_bucket: asayer-mobs
+  sessions_bucket: mobs
   sessions_region: us-east-1
   put_S3_TTL: '20'
-  sourcemaps_bucket: asayer-sourcemaps
+  sourcemaps_bucket: sourcemaps
   sourcemaps_bucket_key: minios3AccessKeyS3cr3t
-    sourcemaps_bucket_secret: m1n10s3CretK3yPassw0rd
+  sourcemaps_bucket_secret: m1n10s3CretK3yPassw0rd
   sourcemaps_bucket_region: us-east-1
-  js_cache_bucket: asayer-sessions-assets
+  js_cache_bucket: sessions-assets
   async_Token: ''
   EMAIL_HOST: ''
   EMAIL_PORT: '587'
@@ -61,7 +61,7 @@ env:
   jwt_exp_delta_seconds: '2592000'
   # Override with your https://domain_name
   # eg: https://openreplay.mycompany.com
-  S3_HOST: ''
+  S3_HOST: 'http://minio.db.svc.cluster.local:9000'
   S3_KEY: minios3AccessKeyS3cr3t
   S3_SECRET: m1n10s3CretK3yPassw0rd
   # Enable logging for python app
diff --git a/scripts/helm/db/bucket_policy.sh b/scripts/helm/db/bucket_policy.sh
index fb2e5905a..67e6adb77 100644
--- a/scripts/helm/db/bucket_policy.sh
+++ b/scripts/helm/db/bucket_policy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-buckets=("asayer-mobs" "asayer-sessions-assets" "static")
+buckets=("mobs" "sessions-assets" "static" "sourcemaps")
 
 mc alias set minio http://localhost:9000 $1 $2
 
@@ -23,5 +23,5 @@ done
 # Creating frontend bucket
 mc mb minio/frontend
 mc policy set download minio/frontend
-mc policy set download minio/asayer-sessions-assets
+mc policy set download minio/sessions-assets
 mc policy set download minio/static
diff --git a/scripts/helm/nginx-ingress/nginx-ingress/templates/configmap.yaml b/scripts/helm/nginx-ingress/nginx-ingress/templates/configmap.yaml
index 5cb1ef188..d47e47255 100644
--- a/scripts/helm/nginx-ingress/nginx-ingress/templates/configmap.yaml
+++ b/scripts/helm/nginx-ingress/nginx-ingress/templates/configmap.yaml
@@ -8,7 +8,7 @@ data:
     location /healthz {
       return 200 'OK';
     }
-    location ~ ^/(asayer-mobs|asayer-sessions-assets|frontend|static|asayer-sourcemaps)/ {
+    location ~ ^/(mobs|sessions-assets|frontend|static|sourcemaps)/ {
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
@@ -55,7 +55,7 @@ data:
       proxy_pass http://chalice-openreplay.app.svc.cluster.local:8000;
     }
     location /assets/ {
-      rewrite ^/assets/(.*) /asayer-sessions-assets/$1 break;
+      rewrite ^/assets/(.*) /sessions-assets/$1 break;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "Upgrade";