Merging 2.8.4-release from dev to prod

docker/.docker-env.example

@@ -1,4 +1,5 @@
 LOCAL_KEY=TCF25YM-39C4H6D-KA32EGF-V5XSHN3
+MONGO_CONN_STRING=mongodb://docdb:27017,docdb-read-1:27017,docdb-read-2:27017/cve_dev?replicaSet=rs0&readPreference=secondaryPreferred&retryWrites=false
 MONGO_HOST=docdb
 MONGO_PORT=27017
 NODE_ENV=development

docker/.docker-env.int-example

@@ -1,3 +1,4 @@
+MONGO_CONN_STRING=mongodb://docdb:27017,docdb-read-1:27017,docdb-read-2:27017/cve_int?replicaSet=rs0&readPreference=secondaryPreferred&retryWrites=false
 MONGO_HOST=docdb
 MONGO_PORT=27017
 NODE_ENV=integration

docker/README.md

@@ -177,6 +177,36 @@ See the [API documentation](https://github.com/CVEProject/cve-services#api-docum
 
 The `docker-compose.yml` file exposes the default Mongo port to the host: `localhost:27017`. You can connect using any Mongo viewer such as [Mongo Express](https://github.com/mongo-express/mongo-express) or [Compass](https://www.mongodb.com/try/download/compass) on the host.
 
+### Run the Mongo Replica Cluster Only
+
+The Mongo-only compose file starts one primary and two replica members without starting the CVE Services app. By default it uses `mongo:5.0`.
+
+```bash
+cd docker/
+docker compose -f docker-compose.mongo-cluster.yml up -d docdb docdb-read-1 docdb-read-2 mongo-init
+```
+
+Use this connection string from the host, including MongoDB Compass:
+
+```text
+mongodb://localhost:27017,localhost:27018,localhost:27019/cve_test?replicaSet=rs0&readPreference=secondaryPreferred&retryWrites=false
+```
+
+To run the same local replica topology with Mongo 8, override the image:
+
+```bash
+cd docker/
+MONGO_IMAGE=mongo:8.0 docker compose -f docker-compose.mongo-cluster.yml up -d --force-recreate docdb docdb-read-1 docdb-read-2 mongo-init
+```
+
+If you already created the local volumes with Mongo 5, Mongo 8 may fail to start against those files. For a fresh Mongo 8 local cluster, remove the Mongo-only volumes first. This deletes local Mongo data for this compose file:
+
+```bash
+cd docker/
+docker compose -f docker-compose.mongo-cluster.yml down -v
+MONGO_IMAGE=mongo:8.0 docker compose -f docker-compose.mongo-cluster.yml up -d docdb docdb-read-1 docdb-read-2 mongo-init
+```
+
 ## Running unit tests
 
 You can run unit tests using the docker image by running the following command:

docker/docker-compose.mongo-cluster.yml

@@ -0,0 +1,132 @@
+services:
+  docdb:
+    image: ${MONGO_IMAGE:-mongo:5.0}
+    container_name: mongo
+    ports:
+      - "27017:27017"
+      - "27018:27018"
+      - "27019:27019"
+    volumes:
+      - docdb-host-data:/data/db
+    command: ["mongod", "--replSet", "rs0", "--bind_ip_all", "--port", "27017"]
+    healthcheck:
+      test: ["CMD-SHELL", "mongosh --quiet --port 27017 --eval 'db.adminCommand({ ping: 1 }).ok' || exit 1"]
+      interval: 10s
+      timeout: 10s
+      retries: 12
+      start_period: 30s
+
+  docdb-read-1:
+    image: ${MONGO_IMAGE:-mongo:5.0}
+    container_name: mongo-read-1
+    network_mode: "service:docdb"
+    depends_on:
+      docdb:
+        condition: service_healthy
+    volumes:
+      - docdb-host-read-1-data:/data/db
+    command: ["mongod", "--replSet", "rs0", "--bind_ip_all", "--port", "27018"]
+    healthcheck:
+      test: ["CMD-SHELL", "mongosh --quiet --port 27018 --eval 'db.adminCommand({ ping: 1 }).ok' || exit 1"]
+      interval: 10s
+      timeout: 10s
+      retries: 12
+      start_period: 30s
+
+  docdb-read-2:
+    image: ${MONGO_IMAGE:-mongo:5.0}
+    container_name: mongo-read-2
+    network_mode: "service:docdb"
+    depends_on:
+      docdb:
+        condition: service_healthy
+    volumes:
+      - docdb-host-read-2-data:/data/db
+    command: ["mongod", "--replSet", "rs0", "--bind_ip_all", "--port", "27019"]
+    healthcheck:
+      test: ["CMD-SHELL", "mongosh --quiet --port 27019 --eval 'db.adminCommand({ ping: 1 }).ok' || exit 1"]
+      interval: 10s
+      timeout: 10s
+      retries: 12
+      start_period: 30s
+
+  mongo-init:
+    image: ${MONGO_IMAGE:-mongo:5.0}
+    network_mode: "service:docdb"
+    depends_on:
+      docdb:
+        condition: service_healthy
+      docdb-read-1:
+        condition: service_healthy
+      docdb-read-2:
+        condition: service_healthy
+    command: >
+      sh -c "
+        mongosh --host localhost --port 27017 --eval '
+          const desiredConfig = {
+            _id: \"rs0\",
+            members: [
+              { _id: 0, host: \"localhost:27017\", priority: 2 },
+              { _id: 1, host: \"localhost:27018\", priority: 1 },
+              { _id: 2, host: \"localhost:27019\", priority: 1 }
+            ]
+          };
+
+          function memberKey(member) {
+            return member._id + \":\" + member.host + \":\" + (member.priority ?? 1);
+          }
+
+          function configMatches(currentConfig) {
+            const currentMembers = currentConfig.members.map(memberKey).sort().join(\"|\");
+            const desiredMembers = desiredConfig.members.map(memberKey).sort().join(\"|\");
+            return currentConfig._id === desiredConfig._id && currentMembers === desiredMembers;
+          }
+
+          try {
+            rs.status();
+            const currentConfig = rs.conf();
+            if (configMatches(currentConfig)) {
+              print(\"Replica set already initialized with the expected localhost members.\");
+            } else {
+              print(\"Updating replica set members...\");
+              rs.reconfig({ ...desiredConfig, version: currentConfig.version + 1 });
+            }
+          } catch (e) {
+            if (e.codeName == \"NotYetInitialized\") {
+              print(\"Initiating replica set...\");
+              rs.initiate(desiredConfig);
+            } else {
+              throw e;
+            }
+          }
+
+          for (let i = 0; i < 120; i++) {
+            let status;
+            try {
+              status = rs.status();
+            } catch (e) {
+              print(\"Waiting for replica set status: \" + e.message);
+              sleep(2000);
+              continue;
+            }
+
+            const primaryCount = status.members.filter(member => member.stateStr === \"PRIMARY\").length;
+            const secondaryCount = status.members.filter(member => member.stateStr === \"SECONDARY\").length;
+
+            if (primaryCount === 1 && secondaryCount === 2) {
+              print(\"Replica set is ready with one primary and two secondaries.\");
+              quit(0);
+            }
+
+            print(\"Waiting for replica set readiness: primary=\" + primaryCount + \", secondary=\" + secondaryCount);
+            sleep(2000);
+          }
+
+          throw new Error(\"Replica set did not become ready in time.\");
+        '
+      "
+
+volumes:
+  docdb-host-data:
+  docdb-host-read-1-data:
+  docdb-host-read-2-data: