From 2173cde940cb44ec3fbca7c80d65b4a74b5ab976 Mon Sep 17 00:00:00 2001 From: sofyalaski Date: Mon, 6 May 2024 09:54:39 +0200 Subject: [PATCH 1/6] deployment to test API --- dev/config/backend_next/.test_env | 38 ++++++++ dev/docker-compose.test.yaml | 146 ++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 dev/config/backend_next/.test_env create mode 100644 dev/docker-compose.test.yaml diff --git a/dev/config/backend_next/.test_env b/dev/config/backend_next/.test_env new file mode 100644 index 0000000..83340f8 --- /dev/null +++ b/dev/config/backend_next/.test_env @@ -0,0 +1,38 @@ +MONGODB_URI = mongodb://mongodb:27017/be_next +EXPRESS_SESSION_SECRET = a_scicat_secret +JWT_SECRET = a_scicat_secret +PORT = 3000 +HTTP_MAX_REDIRECTS = 5 +HTTP_TIMEOUT = 5000 +JWT_EXPIRES_IN = 3600 +LOGGING_DISABLED = True +# NOTE = The SITE variable is set to PSI because of the PublishedData test. +# Testing /register endpoint expects to have it as PSI for that specific scenario. +# Old backend was modifying this at runtime but with NestJS we need to investigate little bit more if there is a bit better and more elegant solution. +SITE = PSI +PID_PREFIX = "API_testing" +DOI_PREFIX = DOI.SAMPLE.PREFIX +METADATA_KEYS_RETURN_LIMIT = 100 +METADATA_PARENT_INSTANCES_RETURN_LIMIT = 100 +ADMIN_GROUPS = "admin,adminingestor" +DELETE_GROUPS = "archivemanager" +CREATE_DATASET_GROUPS = group1,group2,group3 +CREATE_DATASET_WITH_PID_GROUPS = "group2" +CREATE_DATASET_PRIVILEGED_GROUPS = "datasetIngestor,group3" +ACCESS_GROUPS_STATIC_VALUES = "ess" +PROPOSAL_GROUPS = "proposalingestor" +SAMPLE_PRIVILEGED_GROUPS = "sampleingestor" +SAMPLE_GROUPS = "group1" +DATASET_CREATION_VALIDATION_ENABLED = true +DATASET_CREATION_VALIDATION_REGEX = "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$" +ES_HOST = https://localhost:9200 +ES_USERNAME = elastic +ES_PASSWORD = duo-password +MONGODB_COLLECTION = Dataset +ES_MAX_RESULT = 210000 +ES_FIELDS_LIMIT = 400000 +ES_INDEX = "dataset" +ES_REFRESH = "wait_for" +STACK_VERSION = 8.8.2 +CLUSTER_NAME = es-cluster +MEM_LIMIT = 4G diff --git a/dev/docker-compose.test.yaml b/dev/docker-compose.test.yaml new file mode 100644 index 0000000..a69f905 --- /dev/null +++ b/dev/docker-compose.test.yaml @@ -0,0 +1,146 @@ +version: "3.9" +services: + + mongodb: + image: mongo + profiles: + - be + - be_next + - oi + + be: + build: ../backend/. + depends_on: + - mongodb + volumes: + - ../backend:/home/node/app + - ../backend/CI/ESS/envfiles/settings.sample.json:/home/node/app/test/config/settings.json + - /home/node/app/node_modules + - ./config/backend/config.local.js:/home/node/app/server/config.local.js + - ./config/backend/datasources.json:/home/node/app/server/datasources.json + - ./config/backend/providers.json:/home/node/app/server/providers.json + environment: + NODE_ENV: development + command: /bin/sh -c "npm ci && while true; do sleep 600; done" + ports: + - 3000:3000 + profiles: + - be + + fe: + build: + context: ../frontend/. + dockerfile: ../dev/config/frontend/Dockerfile + target: installer + volumes: + - ../frontend:/frontend + - ./config/frontend/config.json:/frontend/src/assets/config.json + - /frontend/node_modules + - /frontend/dist + command: /bin/sh -c "while true; do sleep 600; done" + ports: + - 4200:4200 + profiles: + - fe + + be_next: + build: + context: ../scicat-backend-next/. + target: dev + depends_on: + - mongodb + ports: + - 3000:3000 + volumes: + - ../scicat-backend-next:/home/node/app + - /home/node/app/node_modules + - /home/node/app/dist + - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json + env_file: ./config/backend_next/.test_env + command: /bin/sh -c "while true; do sleep 600; done" + profiles: + - be_next + + jupyter: + image: python:3.10 + ports: + - 8888:8888 + volumes: + - ../curation/requirements.txt:/requirements.txt + - ../curation/notebooks:/notebooks + - ./config/jupyter/.env:/.env + command: /bin/sh -c "pip install --no-cache-dir -r requirements.txt && pip install jupyterlab && jupyter-lab --LabApp.token='' --allow-root --port=8888 --ip=0.0.0.0 --notebook-dir=/notebooks" + profiles: + - jupyter + + search: + build: + context: ../search-api/. + volumes: + - ../search-api:/home/node/app + - /home/node/app/node_modules + command: /bin/sh -c "npm ci && while true; do sleep 600; done" + ports: + - 3002:3000 + environment: + NODE_ENV: development + profiles: + - search + + lp: + build: + context: ../landing-page-server/. + target: installer + dockerfile: ../dev/config/landing-page-server/Dockerfile + environment: + CHROME_BIN: /usr/bin/chromium + CHROME_PATH: /usr/lib/chromium/ + volumes: + - ../landing-page-server:/home/node/app + - /home/node/app/node_modules + - /home/node/app/dist + command: /bin/sh -c "apt-get update && apt-get install -y chromium && while true; do sleep 600; done" + ports: + - 4201:4200 + user: 0:0 + profiles: + - lp + + oi: + build: ../oaipmh/. + volumes: + - ../oaipmh:/home/node/app + - ./config/oaipmh/.env:/home/node/app/production/.env + - /home/node/app/node_modules + - /home/node/app/dist + command: /bin/sh -c "npm ci && while true; do sleep 600; done" + ports: + - 3001:3001 + profiles: + - oi + + pr: + build: + context: ../proposals/. + target: dev + volumes: + - ../proposals:/usr/src/proposals + - ./config/proposals/.env:/usr/src/proposals/.env + # infinite loop to keep the container running + command: /bin/sh -c "while sleep 1000; do :; done" + profiles: + - pr + + panet: + build: + context: ../pan-ontologies-api/. + volumes: + - ../pan-ontologies-api:/home/node/app + - /home/node/app/node_modules + # infinite loop to keep the container running + command: /bin/sh -c "while sleep 1000; do :; done" + profiles: + - panet + ports: + - 3002:3000 + From 58e74428d3eca1313014f5105efae3600227f96c Mon Sep 17 00:00:00 2001 From: sofyalaski Date: Thu, 6 Jun 2024 13:52:44 +0200 Subject: [PATCH 2/6] add test_be_next service using different env file for jobs testing' --- dev/config/backend_next/.test_env | 5 +- dev/docker-compose.test.yaml | 146 ------------------------------ dev/docker-compose.yaml | 29 +++++- 3 files changed, 30 insertions(+), 150 deletions(-) delete mode 100644 dev/docker-compose.test.yaml diff --git a/dev/config/backend_next/.test_env b/dev/config/backend_next/.test_env index 83340f8..a515bdd 100644 --- a/dev/config/backend_next/.test_env +++ b/dev/config/backend_next/.test_env @@ -1,4 +1,4 @@ -MONGODB_URI = mongodb://mongodb:27017/be_next +MONGODB_URI = mongodb://mongodb:27017/test_be_next EXPRESS_SESSION_SECRET = a_scicat_secret JWT_SECRET = a_scicat_secret PORT = 3000 @@ -19,6 +19,8 @@ DELETE_GROUPS = "archivemanager" CREATE_DATASET_GROUPS = group1,group2,group3 CREATE_DATASET_WITH_PID_GROUPS = "group2" CREATE_DATASET_PRIVILEGED_GROUPS = "datasetIngestor,group3" +CREATE_JOB_GROUPS = group1,group2 +UPDATE_JOB_GROUPS = group1 ACCESS_GROUPS_STATIC_VALUES = "ess" PROPOSAL_GROUPS = "proposalingestor" SAMPLE_PRIVILEGED_GROUPS = "sampleingestor" @@ -36,3 +38,4 @@ ES_REFRESH = "wait_for" STACK_VERSION = 8.8.2 CLUSTER_NAME = es-cluster MEM_LIMIT = 4G +JOB_CONFIGURATION_FILE = "test/config/jobconfig.json" diff --git a/dev/docker-compose.test.yaml b/dev/docker-compose.test.yaml deleted file mode 100644 index a69f905..0000000 --- a/dev/docker-compose.test.yaml +++ /dev/null @@ -1,146 +0,0 @@ -version: "3.9" -services: - - mongodb: - image: mongo - profiles: - - be - - be_next - - oi - - be: - build: ../backend/. - depends_on: - - mongodb - volumes: - - ../backend:/home/node/app - - ../backend/CI/ESS/envfiles/settings.sample.json:/home/node/app/test/config/settings.json - - /home/node/app/node_modules - - ./config/backend/config.local.js:/home/node/app/server/config.local.js - - ./config/backend/datasources.json:/home/node/app/server/datasources.json - - ./config/backend/providers.json:/home/node/app/server/providers.json - environment: - NODE_ENV: development - command: /bin/sh -c "npm ci && while true; do sleep 600; done" - ports: - - 3000:3000 - profiles: - - be - - fe: - build: - context: ../frontend/. - dockerfile: ../dev/config/frontend/Dockerfile - target: installer - volumes: - - ../frontend:/frontend - - ./config/frontend/config.json:/frontend/src/assets/config.json - - /frontend/node_modules - - /frontend/dist - command: /bin/sh -c "while true; do sleep 600; done" - ports: - - 4200:4200 - profiles: - - fe - - be_next: - build: - context: ../scicat-backend-next/. - target: dev - depends_on: - - mongodb - ports: - - 3000:3000 - volumes: - - ../scicat-backend-next:/home/node/app - - /home/node/app/node_modules - - /home/node/app/dist - - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json - env_file: ./config/backend_next/.test_env - command: /bin/sh -c "while true; do sleep 600; done" - profiles: - - be_next - - jupyter: - image: python:3.10 - ports: - - 8888:8888 - volumes: - - ../curation/requirements.txt:/requirements.txt - - ../curation/notebooks:/notebooks - - ./config/jupyter/.env:/.env - command: /bin/sh -c "pip install --no-cache-dir -r requirements.txt && pip install jupyterlab && jupyter-lab --LabApp.token='' --allow-root --port=8888 --ip=0.0.0.0 --notebook-dir=/notebooks" - profiles: - - jupyter - - search: - build: - context: ../search-api/. - volumes: - - ../search-api:/home/node/app - - /home/node/app/node_modules - command: /bin/sh -c "npm ci && while true; do sleep 600; done" - ports: - - 3002:3000 - environment: - NODE_ENV: development - profiles: - - search - - lp: - build: - context: ../landing-page-server/. - target: installer - dockerfile: ../dev/config/landing-page-server/Dockerfile - environment: - CHROME_BIN: /usr/bin/chromium - CHROME_PATH: /usr/lib/chromium/ - volumes: - - ../landing-page-server:/home/node/app - - /home/node/app/node_modules - - /home/node/app/dist - command: /bin/sh -c "apt-get update && apt-get install -y chromium && while true; do sleep 600; done" - ports: - - 4201:4200 - user: 0:0 - profiles: - - lp - - oi: - build: ../oaipmh/. - volumes: - - ../oaipmh:/home/node/app - - ./config/oaipmh/.env:/home/node/app/production/.env - - /home/node/app/node_modules - - /home/node/app/dist - command: /bin/sh -c "npm ci && while true; do sleep 600; done" - ports: - - 3001:3001 - profiles: - - oi - - pr: - build: - context: ../proposals/. - target: dev - volumes: - - ../proposals:/usr/src/proposals - - ./config/proposals/.env:/usr/src/proposals/.env - # infinite loop to keep the container running - command: /bin/sh -c "while sleep 1000; do :; done" - profiles: - - pr - - panet: - build: - context: ../pan-ontologies-api/. - volumes: - - ../pan-ontologies-api:/home/node/app - - /home/node/app/node_modules - # infinite loop to keep the container running - command: /bin/sh -c "while sleep 1000; do :; done" - profiles: - - panet - ports: - - 3002:3000 - diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index b65eb1c..52580fd 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -8,6 +8,7 @@ services: profiles: - be - be_next + - test_be_next - oi mongodb_seed: @@ -20,8 +21,6 @@ services: - "-c" - "chmod u+x /mnt/mongo_import.sh && /mnt/mongo_import.sh" user: "0:0" - depends_on: - - mongodb restart: on-failure profiles: - never @@ -30,6 +29,8 @@ services: extends: mongodb_seed environment: - DATABASE=be + depends_on: + - mongodb profiles: - be @@ -37,6 +38,8 @@ services: extends: mongodb_seed environment: - DATABASE=be_next + depends_on: + - mongodb profiles: - be_next @@ -75,6 +78,24 @@ services: profiles: - fe + test_be_next: + build: + context: ../scicat-backend-next/. + target: dev + depends_on: + - mongodb + ports: + - 3000:3000 + volumes: + - ../scicat-backend-next:/home/node/app + - /home/node/app/node_modules + - /home/node/app/dist + - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json + env_file: ./config/backend_next/.test_env + command: /bin/sh -c "while true; do sleep 600; done" + profiles: + - test_be_next + be_next: build: context: ../scicat-backend-next/. @@ -87,11 +108,13 @@ services: - ../scicat-backend-next:/home/node/app - /home/node/app/node_modules - /home/node/app/dist + - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json env_file: ./config/backend_next/.env command: /bin/sh -c "while true; do sleep 600; done" profiles: - be_next + jupyter: image: python:3.10 ports: @@ -177,4 +200,4 @@ services: volumes: mongodb_data: - driver: local + driver: local \ No newline at end of file From 77e2e98c83c004a972319292f214905c731b1edf Mon Sep 17 00:00:00 2001 From: sofyalaski Date: Tue, 25 Jun 2024 15:38:14 +0200 Subject: [PATCH 3/6] prepare env for testing job authorization --- dev/config/backend_next/.test_env | 41 ---------- dev/config/test_backend_next/jobconfig.json | 87 +++++++++++++++++++++ dev/docker-compose.yaml | 50 +++++++----- 3 files changed, 119 insertions(+), 59 deletions(-) delete mode 100644 dev/config/backend_next/.test_env create mode 100644 dev/config/test_backend_next/jobconfig.json diff --git a/dev/config/backend_next/.test_env b/dev/config/backend_next/.test_env deleted file mode 100644 index a515bdd..0000000 --- a/dev/config/backend_next/.test_env +++ /dev/null @@ -1,41 +0,0 @@ -MONGODB_URI = mongodb://mongodb:27017/test_be_next -EXPRESS_SESSION_SECRET = a_scicat_secret -JWT_SECRET = a_scicat_secret -PORT = 3000 -HTTP_MAX_REDIRECTS = 5 -HTTP_TIMEOUT = 5000 -JWT_EXPIRES_IN = 3600 -LOGGING_DISABLED = True -# NOTE = The SITE variable is set to PSI because of the PublishedData test. -# Testing /register endpoint expects to have it as PSI for that specific scenario. -# Old backend was modifying this at runtime but with NestJS we need to investigate little bit more if there is a bit better and more elegant solution. -SITE = PSI -PID_PREFIX = "API_testing" -DOI_PREFIX = DOI.SAMPLE.PREFIX -METADATA_KEYS_RETURN_LIMIT = 100 -METADATA_PARENT_INSTANCES_RETURN_LIMIT = 100 -ADMIN_GROUPS = "admin,adminingestor" -DELETE_GROUPS = "archivemanager" -CREATE_DATASET_GROUPS = group1,group2,group3 -CREATE_DATASET_WITH_PID_GROUPS = "group2" -CREATE_DATASET_PRIVILEGED_GROUPS = "datasetIngestor,group3" -CREATE_JOB_GROUPS = group1,group2 -UPDATE_JOB_GROUPS = group1 -ACCESS_GROUPS_STATIC_VALUES = "ess" -PROPOSAL_GROUPS = "proposalingestor" -SAMPLE_PRIVILEGED_GROUPS = "sampleingestor" -SAMPLE_GROUPS = "group1" -DATASET_CREATION_VALIDATION_ENABLED = true -DATASET_CREATION_VALIDATION_REGEX = "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$" -ES_HOST = https://localhost:9200 -ES_USERNAME = elastic -ES_PASSWORD = duo-password -MONGODB_COLLECTION = Dataset -ES_MAX_RESULT = 210000 -ES_FIELDS_LIMIT = 400000 -ES_INDEX = "dataset" -ES_REFRESH = "wait_for" -STACK_VERSION = 8.8.2 -CLUSTER_NAME = es-cluster -MEM_LIMIT = 4G -JOB_CONFIGURATION_FILE = "test/config/jobconfig.json" diff --git a/dev/config/test_backend_next/jobconfig.json b/dev/config/test_backend_next/jobconfig.json new file mode 100644 index 0000000..807d901 --- /dev/null +++ b/dev/config/test_backend_next/jobconfig.json @@ -0,0 +1,87 @@ +{ + "configVersion": "v1.0 2024-03-01 6f3f38", + "jobs": [ + { + "jobType": "all_access", + "configVersion": "v1.0 2024-03-01 6f3f38", + "create": { + "auth": "#all", + "actions": [ + { + "actionType": "log" + }, + { + "actionType": "url", + "url": "http://localhost:3000/api/v3/health?jobid={{id}}", + "headers": { + "accept": "application/json" + } + } + ] + }, + "statusUpdate": { + "auth": "#all" + } + }, + { + "jobType": "public_access", + "configVersion": "v1.0 2024-03-01 6f3f31", + "create": { + "auth": "#datasetPublic" + }, + "statusUpdate": { + "auth": "#all" + } + }, + { + "jobType": "authenticated_access", + "configVersion": "v1.0 2024-03-01 6f3f32", + "create": { + "auth": "#authenticated" + }, + "statusUpdate": { + "auth": "#all" + } + }, + { + "jobType": "dataset_access", + "configVersion": "v1.0 2024-03-01 6f3f33", + "create": { + "auth": "#datasetAccess" + }, + "statusUpdate": { + "auth": "#jobOwnerGroup" + } + }, + { + "jobType": "owner_access", + "configVersion": "v1.0 2024-03-01 6f3f34", + "create": { + "auth": "#datasetOwner" + }, + "statusUpdate": { + "auth": "#jobOwnerUser" + } + }, + { + "jobType": "user_access", + "configVersion": "v1.0 2024-03-01 6f3f35", + "create": { + "auth": "user5.1" + }, + "statusUpdate": { + "auth": "user5.1" + } + }, + { + "jobType": "group_access", + "configVersion": "v1.0 2024-03-01 6f3f36", + "create": { + "auth": "@group5" + }, + "statusUpdate": { + "auth": "@group5" + } + } + ] +} diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index 52580fd..f0907ce 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -78,12 +78,10 @@ services: profiles: - fe - test_be_next: + be_next_base: build: context: ../scicat-backend-next/. target: dev - depends_on: - - mongodb ports: - 3000:3000 volumes: @@ -91,30 +89,45 @@ services: - /home/node/app/node_modules - /home/node/app/dist - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json - env_file: ./config/backend_next/.test_env + env_file: ./config/backend_next/.env command: /bin/sh -c "while true; do sleep 600; done" + profiles: + - never + + test_be_next: + extends: be_next_base + depends_on: + - mongodb + volumes: + - ./config/test_backend_next/jobconfig.json:/home/node/app/test/config/jobconfig.json + environment: + MONGODB_URI: mongodb://mongodb:27017/test_be_next + PID_PREFIX: "API_testing" + ADMIN_GROUPS: "admin,adminingestor" + DELETE_GROUPS: "archivemanager" + CREATE_DATASET_GROUPS: group1,group2,group3 + CREATE_DATASET_WITH_PID_GROUPS: "group2" + CREATE_DATASET_PRIVILEGED_GROUPS: "datasetingestor,group3" + CREATE_JOB_GROUPS: group1,group2 + UPDATE_JOB_GROUPS: group1 + DELETE_JOB_GROUPS: "archivemanager" + PROPOSAL_GROUPS: "proposalingestor" + SAMPLE_PRIVILEGED_GROUPS: "sampleingestor" + SAMPLE_GROUPS: "group1" + MONGODB_COLLECTION: Dataset + STACK_VERSION: 8.8.2 + MEM_LIMIT: 4G + JOB_CONFIGURATION_FILE: "test/config/jobconfig.json" profiles: - test_be_next be_next: - build: - context: ../scicat-backend-next/. - target: dev + extends: be_next_base depends_on: - mongodb - ports: - - 3000:3000 - volumes: - - ../scicat-backend-next:/home/node/app - - /home/node/app/node_modules - - /home/node/app/dist - - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json - env_file: ./config/backend_next/.env - command: /bin/sh -c "while true; do sleep 600; done" profiles: - be_next - jupyter: image: python:3.10 ports: @@ -200,4 +213,5 @@ services: volumes: mongodb_data: - driver: local \ No newline at end of file + driver: local + \ No newline at end of file From 83c58f84ba088126a5441336d56cebcdc0a3a1fd Mon Sep 17 00:00:00 2001 From: sofyalaski Date: Tue, 25 Jun 2024 16:03:34 +0200 Subject: [PATCH 4/6] create test env file --- dev/config/test_backend_next/.env | 18 ++++++++++++++++++ dev/docker-compose.yaml | 19 +------------------ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 dev/config/test_backend_next/.env diff --git a/dev/config/test_backend_next/.env b/dev/config/test_backend_next/.env new file mode 100644 index 0000000..810026d --- /dev/null +++ b/dev/config/test_backend_next/.env @@ -0,0 +1,18 @@ + +MONGODB_URI=mongodb://mongodb:27017/test_be_next +PID_PREFIX="API_testing" +ADMIN_GROUPS="admin,adminingestor" +DELETE_GROUPS="archivemanager" +CREATE_DATASET_GROUPS=group1,group2,group3 +CREATE_DATASET_WITH_PID_GROUPS="group2" +CREATE_DATASET_PRIVILEGED_GROUPS="datasetingestor,group3" +CREATE_JOB_GROUPS=group1,group2 +UPDATE_JOB_GROUPS=group1 +DELETE_JOB_GROUPS="archivemanager" +PROPOSAL_GROUPS="proposalingestor" +SAMPLE_PRIVILEGED_GROUPS="sampleingestor" +SAMPLE_GROUPS="group1" +MONGODB_COLLECTION=Dataset +STACK_VERSION=8.8.2 +MEM_LIMIT=4G +JOB_CONFIGURATION_FILE="test/config/jobconfig.json" \ No newline at end of file diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index f0907ce..53d9efd 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -100,24 +100,7 @@ services: - mongodb volumes: - ./config/test_backend_next/jobconfig.json:/home/node/app/test/config/jobconfig.json - environment: - MONGODB_URI: mongodb://mongodb:27017/test_be_next - PID_PREFIX: "API_testing" - ADMIN_GROUPS: "admin,adminingestor" - DELETE_GROUPS: "archivemanager" - CREATE_DATASET_GROUPS: group1,group2,group3 - CREATE_DATASET_WITH_PID_GROUPS: "group2" - CREATE_DATASET_PRIVILEGED_GROUPS: "datasetingestor,group3" - CREATE_JOB_GROUPS: group1,group2 - UPDATE_JOB_GROUPS: group1 - DELETE_JOB_GROUPS: "archivemanager" - PROPOSAL_GROUPS: "proposalingestor" - SAMPLE_PRIVILEGED_GROUPS: "sampleingestor" - SAMPLE_GROUPS: "group1" - MONGODB_COLLECTION: Dataset - STACK_VERSION: 8.8.2 - MEM_LIMIT: 4G - JOB_CONFIGURATION_FILE: "test/config/jobconfig.json" + env_file: ./config/test_backend_next/.env profiles: - test_be_next From c49c39d5c8b47e3686e2c45b871a054b68170b35 Mon Sep 17 00:00:00 2001 From: sofyalaski Date: Wed, 26 Jun 2024 10:57:38 +0200 Subject: [PATCH 5/6] add missing new line --- dev/config/test_backend_next/.env | 2 +- dev/docker-compose.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/config/test_backend_next/.env b/dev/config/test_backend_next/.env index 810026d..f0bf64f 100644 --- a/dev/config/test_backend_next/.env +++ b/dev/config/test_backend_next/.env @@ -15,4 +15,4 @@ SAMPLE_GROUPS="group1" MONGODB_COLLECTION=Dataset STACK_VERSION=8.8.2 MEM_LIMIT=4G -JOB_CONFIGURATION_FILE="test/config/jobconfig.json" \ No newline at end of file +JOB_CONFIGURATION_FILE="test/config/jobconfig.json" diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index 53d9efd..f20b8a7 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -197,4 +197,3 @@ services: volumes: mongodb_data: driver: local - \ No newline at end of file From 28fd20b2a53b46922ce2b18963b28886addd93fc Mon Sep 17 00:00:00 2001 From: sofyalaski Date: Wed, 26 Jun 2024 11:01:35 +0200 Subject: [PATCH 6/6] add missing new line --- dev/config/test_backend_next/.env | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/config/test_backend_next/.env b/dev/config/test_backend_next/.env index f0bf64f..426b9bf 100644 --- a/dev/config/test_backend_next/.env +++ b/dev/config/test_backend_next/.env @@ -1,4 +1,3 @@ - MONGODB_URI=mongodb://mongodb:27017/test_be_next PID_PREFIX="API_testing" ADMIN_GROUPS="admin,adminingestor"