From 6f6e190a8425b9caa176270ec52d10e9418eca79 Mon Sep 17 00:00:00 2001
From: Dhruvit Raithatha <dhruvit.raithatha@gmail.com>
Date: Wed, 18 Oct 2023 16:50:41 +0530
Subject: [PATCH 1/4] feat: use v5 endpoint for tags

---
 models/Project.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/models/Project.js b/models/Project.js
index 985d230..d94a36c 100755
--- a/models/Project.js
+++ b/models/Project.js
@@ -24,9 +24,33 @@ const schema = new Schema({
     required: true
   },
   tags: {
-    type: String,
+    type: 'list',
+    list: [{
+      type: 'map',
+      map: {
+        id: {type: String, required: true},
+        name: {type: String, required: true}
+      }
+    }],
     required: true,
-    default: ''
+    default: [],
+    fromDynamo(value) {
+      if (value.S) {
+        return value.S;
+      }
+      if (value.L) {
+        return value.L.map((item) => {
+          if (item.M && item.M.name && item.M.id) {
+            return {
+              id: item.M.id.S,
+              name: item.M.name.S
+            };
+          }
+          return null;
+        });
+      }
+      return [];
+    }
   },
   rocketChatWebhook: {type: String, required: false},
   rocketChatChannelName: {type: String, required: false},

From 38fdc28f7933829fcbbca6564b2623c063994457 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Tue, 2 Jan 2024 08:33:55 +1100
Subject: [PATCH 2/4] Additional logging for debugging in dev

---
 routes/webhooks.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/routes/webhooks.js b/routes/webhooks.js
index ca5cd9b..8295caa 100755
--- a/routes/webhooks.js
+++ b/routes/webhooks.js
@@ -24,12 +24,12 @@ const router = express.Router();
 router.post('/github', SecurityChecker('github'), RepositoryFilter('github'), wrapper(async (req, res) => {
   const result = GithubEventDetector.detect(req.body);
   if (!result) {
-    logger.info('unknown event detected');
-    logger.debug(req.body);
+    logger.info('Unknown Github event detected');
+    logger.info(JSON.stringify(req.body));
   } else {
     await kafka.send(JSON.stringify(result));
-    logger.info(`successfully add event: ${result.event} to kafka queue`);
-    logger.debug(`kafka message: ${JSON.stringify(result)}`);
+    logger.info(`Successfully added Github event: ${result.event} to kafka queue`);
+    logger.info(`kafka message: ${JSON.stringify(result)}`);
   }
   res.json({success: true});
 }));
@@ -37,12 +37,12 @@ router.post('/github', SecurityChecker('github'), RepositoryFilter('github'), wr
 router.post('/gitlab', SecurityChecker('gitlab'), RepositoryFilter('gitlab'), wrapper(async (req, res) => {
   const result = GitlabEventDetector.detect(req.body);
   if (!result) {
-    logger.info('unknown event detected');
-    logger.debug(req.body);
+    logger.info('Unknown Gitlab event detected');
+    logger.info(JSON.stringify(req.body));
   } else {
     await kafka.send(JSON.stringify(result));
-    logger.info(`successfully add event: ${result.event} to kafka queue`);
-    logger.debug(`kafka message: ${JSON.stringify(result)}`);
+    logger.info(`Successfully added Gitlab event: ${result.event} to kafka queue`);
+    logger.info(`kafka message: ${JSON.stringify(result)}`);
   }
   res.json({success: true});
 }));

From 3ff9568dfd39288f906b6295a9a9dd974437782a Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Tue, 2 Jan 2024 08:39:20 +1100
Subject: [PATCH 3/4] More debug logging

---
 utils/EventDetector.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/utils/EventDetector.js b/utils/EventDetector.js
index 7abb269..dc09622 100755
--- a/utils/EventDetector.js
+++ b/utils/EventDetector.js
@@ -11,6 +11,7 @@
 
 const Joi = require('joi');
 const _ = require('lodash');
+const logger = require('../utils/logger');
 
 class EventDetector {
 
@@ -35,12 +36,14 @@ class EventDetector {
     _.forEach(this.events, (e) => {
       let result = Joi.validate(data, e.schema, {stripUnknown: true});
       if (result.error) {
+        logger.info(`Joi validate: ${JSON.stringify(result.error)}`);
         return;
       }
       const obj = e.parse(data);
       // validate
       result = Joi.attempt(obj, e.event.schema);
       if (result.error) {
+        logger.info(`Joi schema attempt error: ${JSON.stringify(result.error)}`);
         throw result.error;
       }
       // done

From c64909eee98270a99d39317021b9419eb0d95b32 Mon Sep 17 00:00:00 2001
From: Justin Gasper <jmgasper@gmail.com>
Date: Thu, 4 Jan 2024 06:50:44 +1100
Subject: [PATCH 4/4] Fix for deployment issue with latest version of Docker

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9908e3f..5e1ec64 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,6 +9,7 @@ install_dependency: &install_dependency
             sudo apt install jq
             sudo apt install python3-pip
             sudo pip3 install awscli --upgrade
+            sudo pip3 install docker==6.1.3
 
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.