Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/services/gitops/push-new.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { EnvType } from '../../models/environment.js';
import { getComponents } from '../component.js';
import { createStrategy } from '../config-strategy.js';
import { addComponent, createConfig, getConfig } from '../config.js';
Expand All @@ -18,11 +19,15 @@ export async function processNew(domain, change, environment) {
async function processNewGroup(domain, change, environment) {
const admin = { _id: domain.owner };
const content = change.content;

const activated = new Map().set(EnvType.DEFAULT, false);
activated.set(environment, getNewValue(content.activated, true));

const group = await createGroup({
domain: domain._id,
name: content.name,
description: getNewValue(content.description, ''),
activated: new Map().set(environment, getNewValue(content.activated, true)),
activated,
owner: domain.owner
}, admin);

Expand All @@ -42,12 +47,15 @@ async function processNewConfig(domain, change, environment) {
const admin = { _id: domain.owner };
const group = await getGroupConfig({ domain: domain._id, name: path[0] });

const activated = new Map().set(EnvType.DEFAULT, false);
activated.set(environment, getNewValue(content.activated, true));

const newConfig = {
domain: domain._id,
group: group._id,
key: content.key,
description: getNewValue(content.description, ''),
activated: new Map().set(environment, getNewValue(content.activated, true)),
activated,
owner: domain.owner,
};

Expand Down
67 changes: 67 additions & 0 deletions tests/gitops.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,39 @@ describe('GitOps - Push New', () => {
expect(group.description).toBe('New Group Description');
});

test('GITOPS_SUITE - Should push changes - New Group for environment', async () => {
const token = generateToken('30s');

const lastUpdate = Date.now();
const req = await request(app)
.post('/gitops/v1/push')
.set('Authorization', `Bearer ${token}`)
.send({
environment: 'staging',
changes: [{
action: 'NEW',
diff: 'GROUP',
path: [],
content: {
name: 'New Group Staging',
description: 'New Group Description',
activated: true
}
}]
})
.expect(200);

expect(req.body.message).toBe('Changes applied successfully');
expect(req.body.version).toBeGreaterThan(lastUpdate);

// Check if the changes were applied
const group = await GroupConfig.findOne({ name: 'New Group Staging', domain: domainId }).lean().exec();
expect(group).not.toBeNull();
expect(group.activated['staging']).toBe(true);
expect(group.activated[EnvType.DEFAULT]).toBeDefined();
expect(group.description).toBe('New Group Description');
});

test('GITOPS_SUITE - Should push changes - New Group and Switcher', async () => {
const token = generateToken('30s');

Expand Down Expand Up @@ -189,6 +222,40 @@ describe('GitOps - Push New', () => {
expect(config.components).toHaveLength(0);
});

test('GITOPS_SUITE - Should push changes - New Switcher for environment', async () => {
const token = generateToken('30s');

const lastUpdate = Date.now();
const req = await request(app)
.post('/gitops/v1/push')
.set('Authorization', `Bearer ${token}`)
.send({
environment: 'staging',
changes: [{
action: 'NEW',
diff: 'CONFIG',
path: [
'Group Test'
],
content: {
key: 'NEW_SWITCHER_STAGING',
activated: true
}
}]
})
.expect(200);

expect(req.body.message).toBe('Changes applied successfully');
expect(req.body.version).toBeGreaterThan(lastUpdate);

// Check if the changes were applied
const config = await Config.findOne({ key: 'NEW_SWITCHER_STAGING', domain: domainId }).lean().exec();
expect(config).not.toBeNull();
expect(config.activated['staging']).toBe(true);
expect(config.activated[EnvType.DEFAULT]).toBeDefined();
expect(config.components).toHaveLength(0);
});

test('GITOPS_SUITE - Should push changes - New Switcher and Relay', async () => {
const token = generateToken('30s');

Expand Down