add QA_ENV flag

opencrvs · Sep 11, 2024 · dbe0f70 · dbe0f70
1 parent b87e484
commit dbe0f70
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/infrastructure/clear-all-data.sh b/infrastructure/clear-all-data.sh
@@ -102,9 +102,9 @@ docker run --rm --network=$NETWORK appropriate/curl curl -X POST "http://influxd
 #-----------------------------
 docker run --rm --network=$NETWORK --entrypoint=/bin/sh minio/mc -c "\
   mc alias set myminio http://minio:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD && \
-  mc rm --recursive --force myminio/${STACK}__ocrvs && \
-  mc rb myminio/${STACK}__ocrvs && \
-  mc mb myminio/${STACK}__ocrvs"
+  mc rm --recursive --force myminio/${STACK}--ocrvs && \
+  mc rb myminio/${STACK}--ocrvs && \
+  mc mb myminio/${STACK}--ocrvs"
 
 # Delete all data from metabase
 #-----------------------------

diff --git a/infrastructure/docker-compose.app.yml b/infrastructure/docker-compose.app.yml
@@ -3,6 +3,7 @@ services:
   hearth:
     image: opencrvs/hearth:1.1.0
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - mongodb__url=mongodb://${STACK}__hearth:${HEARTH_MONGODB_PASSWORD}@mongo1/${STACK}__hearth-dev?replicaSet=rs0
       - logger__level=warn
@@ -31,6 +32,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - LANGUAGES=en,fr
@@ -84,6 +86,7 @@ services:
         - 'traefik.http.routers.${STACK}__block-dashboard-queries.middlewares=${STACK}__block-internal-routes'
       replicas: 1
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - FHIR_URL=http://hearth:3447/fhir
@@ -122,6 +125,7 @@ services:
   login:
     image: opencrvs/ocrvs-login:${VERSION}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - COUNTRY_CONFIG_URL=https://countryconfig.${STACK}.{{hostname}}
       - CONTENT_SECURITY_POLICY_WILDCARD=${CONTENT_SECURITY_POLICY_WILDCARD}
@@ -154,6 +158,7 @@ services:
   client:
     image: opencrvs/ocrvs-client:${VERSION}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - DECLARED_DECLARATION_SEARCH_QUERY_COUNT=100
       - COUNTRY_CONFIG_URL=https://countryconfig.${STACK}.{{hostname}}
@@ -194,6 +199,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - LANGUAGES=en,fr
@@ -250,6 +256,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - LANGUAGES=en,fr
@@ -284,6 +291,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN:-}
@@ -314,6 +322,7 @@ services:
     volumes:
       - /data/vsexport:/usr/src/app/packages/metrics/src/scripts
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN:-}
@@ -353,6 +362,7 @@ services:
       - jwt-public-key.{{STACK}}.{{ts}}
       - jwt-private-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN:-}
@@ -399,6 +409,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN:-}
@@ -429,6 +440,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN:-}
@@ -470,6 +482,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN:-}
@@ -525,6 +538,7 @@ services:
     secrets:
       - jwt-public-key.{{STACK}}.{{ts}}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - NODE_ENV=production
       - APN_SERVICE_URL=http://apm-server:8200
@@ -548,6 +562,7 @@ services:
   scheduler:
     image: opencrvs/ocrvs-scheduler:${VERSION}
     environment:
+      - QA_ENV=true
       - NODE_ENV=production
       - METRICS_URL=http://metrics:1050
     deploy:
@@ -566,6 +581,7 @@ services:
   migration:
     image: opencrvs/ocrvs-migration:${VERSION}
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - ELASTICSEARCH_INDEX_NAME=ocrvs--${STACK}
       - USER_MGNT_MONGO_URL=mongodb://${STACK}__user-mgnt:${USER_MGNT_MONGODB_PASSWORD}@mongo1/${STACK}__user-mgnt?replicaSet=rs0
@@ -614,6 +630,7 @@ services:
       restart_policy:
         condition: none
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       - REPLICAS=1
       - DATABASE_PREFIX=${STACK}
@@ -646,6 +663,7 @@ services:
       - overlay_net
       - dependencies_overlay_net
     environment:
+      - QA_ENV=true
       - HOST=0.0.0.0
       # Note that only mongo1 is used here on purpose for all environments
       # https://discourse.metabase.com/t/solved-add-mongodb-replicaset-database/7404/2

diff --git a/infrastructure/elasticsearch/roles/search_user.json b/infrastructure/elasticsearch/roles/search_user.json
@@ -2,7 +2,7 @@
   "cluster": ["manage"],
   "indices": [
     {
-      "names": ["ocrvs", "ocrvs-*"],
+      "names": ["*__ocrvs", "ocrvs", "ocrvs-*"],
       "privileges": [
         "write",
         "create",