GitOps - Fixes push New group/config and strategy changes

package.json

@@ -46,11 +46,11 @@
     "graphql": "^16.9.0",
     "graphql-http": "^1.22.1",
     "graphql-tag": "^2.12.6",
-    "helmet": "^7.1.0",
+    "helmet": "^8.0.0",
     "jsonwebtoken": "^9.0.2",
     "moment": "^2.30.1",
     "mongodb": "^6.9.0",
-    "mongoose": "^8.6.4",
+    "mongoose": "^8.7.0",
     "pino": "^9.4.0",
     "pino-pretty": "^11.2.2",
     "swagger-ui-express": "^5.0.1",

src/routers/gitops.js

@@ -8,7 +8,7 @@ import * as Service from '../services/gitops/index.js';
 
 const router = new express.Router();
 
-router.post('/gitops/v1/push', featureFlag, gitopsAuth, [
+router.post('/gitops/v1/push', gitopsAuth, featureFlag, [
     body('environment').isString(),
     body('changes').isArray(),
     body('changes.*.path').isArray({ min: 0, max: 3 }),

src/services/config-strategy.js

@@ -49,7 +49,7 @@ export async function populateAdmin(configStrategies) {
     }
 }
 
-export async function createStrategy(args, admin) {
+export async function createStrategy(args, admin, status = true) {
     const config = await getConfigById(args.config);
 
     if (!args.env) {
@@ -61,7 +61,7 @@ export async function createStrategy(args, admin) {
 
     let configStrategy = new ConfigStrategy({
         ...args,
-        activated: new Map().set(environment.name, true),
+        activated: new Map().set(environment.name, status),
         domain: config.domain,
         owner: admin._id
     });

src/services/gitops/index.js

@@ -1,3 +1,4 @@
+import Logger from '../../helpers/logger.js';
 import { getDomainById, updateDomainVersion } from '../domain.js';
 import { processChanged } from './push-changed.js';
 import { processDeleted } from './push-deleted.js';
@@ -6,6 +7,9 @@ import { processNew } from './push-new.js';
 export const ADMIN_EMAIL = 'gitops@admin.noreply.switcherapi.com';
 
 export async function pushChanges(domainId, environment, changes) {
+    Logger.debug(`Pushing changes to domain ${domainId} for environment ${environment}`);
+    Logger.debug(`Changes: ${JSON.stringify(changes)}`);
+
     let domain = await getDomainById(domainId);
     for (const change of changes) {
         switch (change.action) {

src/services/gitops/push-changed.js

@@ -19,11 +19,12 @@ export async function processChanged(domain, change, environment) {
 
 async function processChangedGroup(domain, change, environment) {
     const admin = { _id: domain.owner, email: ADMIN_EMAIL };
+    const content = change.content;
     const group = await getGroupConfig({ domain: domain._id, name: change.path[0] });
 
     await updateGroup(group._id, {
-        description: getChangedValue(change.content.description, group.description),
-        activated: new Map().set(environment, getChangedValue(change.content.activated, group.activated.get(environment)))
+        description: getChangedValue(content.description, group.description),
+        activated: new Map().set(environment, getChangedValue(content.activated, group.activated.get(environment)))
     }, admin);
 }
 
@@ -48,7 +49,7 @@ async function processChangedStrategy(domain, change, environment) {
     const config = await getConfig({ domain: domain._id, group: group._id, key: path[1] });
 
     const strategies = await getStrategies({ config: config._id });
-    const strategy = strategies.find(strategy => strategy.strategy === path[2] && strategy.activated.get(environment));
+    const strategy = strategies.find(strategy => strategy.strategy === path[2] && strategy.activated.has(environment));
 
     await updateStrategy(strategy._id, {
         description: getChangedValue(content.description, group.description),

src/services/gitops/push-new.js

@@ -26,16 +26,17 @@ export async function processNew(domain, change, environment) {
 
 async function processNewGroup(domain, change, environment) {
     const admin = { _id: domain.owner };
+    const content = change.content;
     const group = await createGroup({
         domain: domain._id,
-        name: change.content.name,
-        description: change.content.description,
-        activated: new Map().set(environment, change.content.activated),
+        name: content.name,
+        description: getNewValue(content.description, ''),
+        activated: new Map().set(environment, getNewValue(content.activated, true)),
         owner: domain.owner
     }, admin);
 
-    if (change.content.configs?.length) {
-        for (const config of change.content.configs) {
+    if (content.config?.length) {
+        for (const config of content.config) {
             await processNewConfig(domain, {
                 path: [group.name],
                 content: config
@@ -51,23 +52,23 @@ async function processNewConfig(domain, change, environment) {
     const group = await getGroupConfig({ domain: domain._id, name: path[0] });
 
     let componentIds;
-    if (change.content.components?.length) {
-        const components = await getComponents({ domain: domain._id, name: { $in: change.content.components } });
+    if (content.components?.length) {
+        const components = await getComponents({ domain: domain._id, name: { $in: content.components } });
         componentIds = components.map(component => component._id);
     }
 
     const config = await createConfig({
         domain: domain._id,
         group: group._id,
         key: content.key,
-        description: content.description,
-        activated: new Map().set(environment, content.activated),
+        description: getNewValue(content.description, ''),
+        activated: new Map().set(environment, getNewValue(content.activated, true)),
         owner: domain.owner,
         components: componentIds
     }, admin);
 
-    if (change.content.strategies?.length) {
-        for (const strategy of change.content.strategies) {
+    if (content.strategies?.length) {
+        for (const strategy of content.strategies) {
             await processNewStrategy(domain, {
                 path: [group.name, config.key],
                 content: strategy
@@ -84,14 +85,14 @@ async function processNewStrategy(domain, change, environment) {
 
     await createStrategy({
         env: environment,
-        description: content.description,
+        description: getNewValue(content.description, ''),
         strategy: content.strategy,
         values: content.values,
         operation: content.operation,
         config: config._id,
         domain: domain._id,
         owner: domain.owner
-    }, admin);
+    }, admin, getNewValue(content.activated, true));
 }
 
 async function processNewStrategyValue(domain, change) {
@@ -122,4 +123,8 @@ async function processNewComponent(domain, change) {
             await addComponent(config._id, { component: id }, admin);
         }
     }
+}
+
+function getNewValue(newValue, defaultValue) {
+    return newValue !== undefined ? newValue : defaultValue;
 }

tests/gitops.test.js

@@ -136,7 +136,7 @@ describe('GitOps - Push New', () => {
                         name: 'New Group and Switcher',
                         description: 'New Group Description',
                         activated: true,
-                        configs: [{
+                        config: [{
                             key: 'NEW_SWITCHER_FROM_GROUP',
                             description: 'New Switcher',
                             activated: false,