Rb/bye bitnami

.oktetoignore

@@ -5,11 +5,9 @@
 !api/chart
 !catalog/chart
 !frontend/chart
-!kafka
-!mongodb
-!postgresql
 !rent/chart
 !worker/chart
+!infrastructure/chart
 
 
 [test]

catalog/Dockerfile

@@ -1,9 +1,17 @@
 FROM node:20
 
-WORKDIR /src
+# Enable Corepack and prepare Yarn 4.9.4
+RUN corepack enable && corepack prepare yarn@4.9.4 --activate
 
+# Copy dependencies
+WORKDIR /src
 COPY package.json yarn.lock ./
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install
+
+# Install using Yarn 4 with node_modules (disable PnP)
+RUN --mount=type=cache,target=/root/.yarn \
+    YARN_CACHE_FOLDER=/root/.yarn \
+    yarn config set nodeLinker node-modules && \
+    yarn install --immutable
 
 COPY . .
 CMD ["yarn", "start"]

catalog/chart/templates/deployment.yaml

@@ -26,9 +26,9 @@ spec:
             - load
           env:
             - name: MONGODB_USERNAME
-              value: okteto
+              value: "okteto"
             - name: MONGODB_PASSWORD
-              value: okteto
+              value: "okteto"
             - name: MONGODB_DATABASE
               value: okteto
             - name: MONGODB_HOST
@@ -38,9 +38,9 @@ spec:
           image: {{ .Values.image }}
           env:
             - name: MONGODB_USERNAME
-              value: okteto
+              value: "okteto"
             - name: MONGODB_PASSWORD
-              value: okteto
+              value: "okteto"
             - name: MONGODB_DATABASE
               value: okteto
             - name: MONGODB_HOST

catalog/load.js

@@ -1,52 +1,51 @@
-const mongo = require("mongodb").MongoClient;
+const { MongoClient } = require("mongodb");
 
-const url = `mongodb://${process.env.MONGODB_USERNAME}:${encodeURIComponent(process.env.MONGODB_PASSWORD)}@${process.env.MONGODB_HOST}:27017/${process.env.MONGODB_DATABASE}`;
+const url = process.env.MONGODB_USERNAME && process.env.MONGODB_PASSWORD 
+  ? `mongodb://${process.env.MONGODB_USERNAME}:${encodeURIComponent(process.env.MONGODB_PASSWORD)}@${process.env.MONGODB_HOST}:27017/${process.env.MONGODB_DATABASE}?authSource=admin`
+  : `mongodb://${process.env.MONGODB_HOST}:27017/${process.env.MONGODB_DATABASE}`;
 
-var insert = function(collection, data, resolve, reject) {
-  const d = require(data);
-  d.results.forEach((doc) => {
+async function insertData(collection, dataPath) {
+  const data = require(dataPath);
+  data.results.forEach((doc) => {
     doc._id = doc.id;
   });
-  collection.insertMany(d.results, (err, r) => {
-    if (err) {
-      if (err.code != 11000) {
-        return reject(err);
-      }
+
+  try {
+    await collection.insertMany(data.results);
+    console.log(`Inserted ${data.results.length} documents`);
+  } catch (err) {
+    if (err.code !== 11000) {
+      throw err;
     }
-
-    resolve();
-  });
+    console.log('Documents already exist, skipping insertion');
+  }
 }
 
-function loadWithRetry() {
-  mongo.connect(url, { 
-    useUnifiedTopology: true,
-    useNewUrlParser: true,
-    connectTimeoutMS: 300,
-    socketTimeoutMS: 300,
-  }, (err, client) => {
-    if (err) {
-      console.error(`Error connecting, retrying in 300 msec: ${err}`);
-      setTimeout(loadWithRetry, 300);
-      return;
-    }
+async function loadWithRetry() {
+  const client = new MongoClient(url, {
+    connectTimeoutMS: 30000,
+    socketTimeoutMS: 30000,
+    serverSelectionTimeoutMS: 30000,
+  });
 
-    var promises = [];
-    db = client.db(process.env.MONGODB_DATABASE);
-    promises.push(new Promise((resolve, reject)=>{
-      insert(db.collection('catalog'), "./data/catalog.json", resolve, reject);
-    }));
+  try {
+    console.log('Connecting to MongoDB...');
+    await client.connect();
+    console.log('Connected successfully');
 
-    Promise.all(promises)
-    .then(function() { 
-      console.log('all loaded'); 
-      process.exit(0);
-    })
-    .catch((err) => {
-      console.error(`fail to load: ${err}`);
-      process.exit(1);
-    });      
-  });
-};
+    const db = client.db(process.env.MONGODB_DATABASE);
+    await insertData(db.collection('catalog'), "./data/catalog.json");
+
+    console.log('All data loaded successfully');
+    await client.close();
+    process.exit(0);
+  } catch (err) {
+    console.error(`Error: ${err}`);
+    await client.close();
+
+    console.log('Retrying in 3 seconds...');
+    setTimeout(loadWithRetry, 3000);
+  }
+}
 
 loadWithRetry();

catalog/package.json

@@ -5,13 +5,14 @@
   "dependencies": {
     "async": "^3.1.0",
     "express": "^4.16.4",
-    "mongodb": "^3.2.3",
+    "mongodb": "^6.18.0",
     "nodemon": "^2.0.2",
     "saslprep": "^1.0.3"
   },
   "scripts": {
     "debug": "node --inspect-brk=0.0.0.0:9229 server.js",
     "start": "nodemon server.js",
     "load": "node load.js"
-  }
+  },
+  "packageManager": "yarn@4.9.4"
 }

catalog/server.js

@@ -3,44 +3,40 @@ const mongo = require("mongodb").MongoClient;
 
 const app = express();
 
-const url = `mongodb://${process.env.MONGODB_USERNAME}:${encodeURIComponent(process.env.MONGODB_PASSWORD)}@${process.env.MONGODB_HOST}:27017/${process.env.MONGODB_DATABASE}`;
-
-function startWithRetry() {
-  mongo.connect(url, { 
-    useUnifiedTopology: true,
-    useNewUrlParser: true,
-    connectTimeoutMS: 1000,
-    socketTimeoutMS: 1000,
-  }, (err, client) => {
-    if (err) {
-      console.error(`Error connecting, retrying in 1 sec: ${err}`);
-      setTimeout(startWithRetry, 1000);
-      return;
-    }
+const url = `mongodb://${process.env.MONGODB_USERNAME}:${encodeURIComponent(process.env.MONGODB_PASSWORD)}@${process.env.MONGODB_HOST}:27017/${process.env.MONGODB_DATABASE}?authSource=admin`;
+
+async function startWithRetry() {
+  try {
+    const client = await mongo.connect(url, { 
+      connectTimeoutMS: 30000,
+      socketTimeoutMS: 30000,
+    });
 
     const db = client.db(process.env.MONGODB_DATABASE);
 
-    app.listen(8080, () => {
-      app.get("/catalog/healthz", (req, res, next) => {
-        res.sendStatus(200)
-        return;
-      });
-
-      app.get("/catalog", (req, res, next) => {
-        console.log(`GET /catalog`)
-        db.collection('catalog').find().toArray( (err, results) =>{
-          if (err){
-            console.log(`failed to query movies: ${err}`)
-            res.json([]);
-            return;
-          }
-          res.json(results);
-        });
-      });
+    app.get("/catalog/healthz", (req, res, next) => {
+      res.sendStatus(200)
+      return;
+    });
+
+    app.get("/catalog", async (req, res, next) => {
+      console.log(`GET /catalog`)
+      try {
+        const results = await db.collection('catalog').find().toArray();
+        res.json(results);
+      } catch (err) {
+        console.log(`failed to query movies: ${err}`)
+        res.json([]);
+      }
+    });
 
+    app.listen(8080, () => {
       console.log("Server running on port 8080.");
     });
-  });
+  } catch (err) {
+    console.error(`Error connecting, retrying in 1 sec: ${err}`);
+    setTimeout(startWithRetry, 1000);
+  }
 };
 
 startWithRetry();