Skip to content

chore: replacing Cache with PermissionCache, bump deps #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petruki merged 1 commit into from
May 7, 2026
Merged

chore: replacing Cache with PermissionCache, bump deps #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 39 additions & 39 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"cors": "^2.8.6",
"express": "^5.2.1",
"express-basic-auth": "^1.2.1",
"express-rate-limit": "^8.5.0",
"express-rate-limit": "^8.5.1",
"express-session": "^1.19.0",
"express-validator": "^7.3.2",
"graphql": "^16.13.2",
"graphql": "^16.14.0",
"graphql-http": "^1.22.4",
"graphql-tag": "^2.12.6",
"helmet": "^8.1.0",
Expand All @@ -68,7 +68,7 @@
"jest-sonar-reporter": "^2.0.0",
"node-notifier": "^10.0.1",
"nodemon": "^3.1.14",
"sinon": "^21.1.2",
"sinon": "^22.0.0",
"supertest": "^7.2.2"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/aggregator/permission-resolvers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { verifyOwnership } from '../helpers/index.js';
import { RouterTypes } from '../models/permission.js';
import { getConfigs } from '../services/config.js';
import { getGroupConfigs } from '../services/group-config.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';
import Logger from '../helpers/logger.js';

export async function resolvePermission(args, admin) {
Expand Down
4 changes: 2 additions & 2 deletions src/helpers/cache.js → src/helpers/permission-cache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ActionTypes, RouterTypes } from '../models/permission.js';

class Cache {
class PermissionCache {
constructor() {
this.cache = new Map();
}
Expand Down Expand Up @@ -58,6 +58,6 @@ class Cache {
}
}

const permissionCache = new Cache();
const permissionCache = new PermissionCache();

export { permissionCache };
2 changes: 1 addition & 1 deletion src/routers/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { check } from 'express-validator';
import { auth, authRefreshToken } from '../middleware/auth.js';
import { validate, verifyInputUpdateParameters } from '../middleware/validators.js';
import { formatInput, verifyOwnership } from '../helpers/index.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';
import { responseException } from '../exceptions/index.js';
import * as Services from '../services/admin.js';
import { SwitcherKeys } from '../external/switcher-api-facade.js';
Expand Down
2 changes: 1 addition & 1 deletion src/services/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { checkComponent } from '../external/switcher-api-facade.js';
import Component from '../models/component.js';
import { ActionTypes, RouterTypes } from '../models/permission.js';
import { formatInput, verifyOwnership } from '../helpers/index.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';
import { response } from './common.js';

export async function getComponentById(id) {
Expand Down
2 changes: 1 addition & 1 deletion src/services/config-strategy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { response } from './common.js';
import { ConfigStrategy } from '../models/config-strategy.js';
import { ActionTypes, RouterTypes } from '../models/permission.js';
import { verifyOwnership } from '../helpers/index.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';
import { updateDomainVersion } from './domain.js';
import { getConfigById } from './config.js';
import { BadRequestError } from '../exceptions/index.js';
Expand Down
2 changes: 1 addition & 1 deletion src/services/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { BadRequestError, NotFoundError } from '../exceptions/index.js';
import { checkEnvironmentStatusChange } from '../middleware/validators.js';
import { getComponentById, getComponents } from './component.js';
import { resolveVerification } from './relay.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';

async function verifyAddComponentInput(configId, admin) {
const config = await getConfigById(configId);
Expand Down
2 changes: 1 addition & 1 deletion src/services/domain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import GroupConfig from '../models/group-config.js';
import History from '../models/history.js';
import { ActionTypes, RouterTypes } from '../models/permission.js';
import { formatInput, verifyOwnership, checkEnvironmentStatusRemoval } from '../helpers/index.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';
import { response } from './common.js';
import Logger from '../helpers/logger.js';
import { BadRequestError } from '../exceptions/index.js';
Expand Down
2 changes: 1 addition & 1 deletion src/services/environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ConfigStrategy } from '../models/config-strategy.js';
import { Environment, EnvType } from '../models/environment.js';
import { ActionTypes, RouterTypes } from '../models/permission.js';
import { formatInput, verifyOwnership } from '../helpers/index.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';
import { response } from './common.js';
import { getConfigs, removeConfigStatus } from './config.js';
import { getDomainById, removeDomainStatus } from './domain.js';
Expand Down
2 changes: 1 addition & 1 deletion src/services/group-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { checkGroup } from '../external/switcher-api-facade.js';
import { ActionTypes, RouterTypes } from '../models/permission.js';
import { getDomainById, updateDomainVersion } from './domain.js';
import { checkEnvironmentStatusChange } from '../middleware/validators.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';

export async function getGroupConfigById(id, lean = false, populateAdmin = false) {
let group = await GroupConfig.findById(id, null, { lean }).exec();
Expand Down
2 changes: 1 addition & 1 deletion src/services/permission.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActionTypes, Permission, RouterTypes } from '../models/permission.js';
import { verifyOwnership } from '../helpers/index.js';
import { response } from './common.js';
import { getTeam, getTeams, verifyRequestedTeam } from './team.js';
import { permissionCache } from '../helpers/cache.js';
import { permissionCache } from '../helpers/permission-cache.js';

async function verifyRequestedTeamByPermission(permissionId, admin, action) {
let team = await getTeam({ permissions: permissionId });
Expand Down
2 changes: 1 addition & 1 deletion tests/admin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import app from '../src/app';
import Admin from '../src/models/admin';
import { Team } from '../src/models/team';
import { EnvType } from '../src/models/environment';
import { permissionCache } from '../src/helpers/cache';
import { permissionCache } from '../src/helpers/permission-cache';
import { ActionTypes, RouterTypes } from '../src/models/permission';
import swaggerDocument from '../src/api-docs/swagger-document';
import {
Expand Down
2 changes: 1 addition & 1 deletion tests/aggregator-api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import request from 'supertest';
import sinon from 'sinon';
import app from '../src/app';
import { ActionTypes, Permission, RouterTypes } from '../src/models/permission';
import { permissionCache } from '../src/helpers/cache';
import { permissionCache } from '../src/helpers/permission-cache';
import { Team } from '../src/models/team';
import { EnvType } from '../src/models/environment';
import Admin from '../src/models/admin';
Expand Down
12 changes: 6 additions & 6 deletions tests/unit-test/cache.test.js → tests/unit-test/permission-cache.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import mongoose from 'mongoose';
import { permissionCache } from '../../src/helpers/cache';
import { permissionCache } from '../../src/helpers/permission-cache';
import { EnvType } from '../../src/models/environment';
import { ActionTypes, RouterTypes } from '../../src/models/permission';

Expand All @@ -16,7 +16,7 @@ describe('Test permissionCache', () => {
permissionCache.cache.clear();
});

it('UNIT_CACHE - Should set and get cache', () => {
it('UNIT_PERMISSION_CACHE - Should set and get cache', () => {
const cacheKey = permissionCache.permissionKey(
'adminId',
'domainId',
Expand All @@ -31,7 +31,7 @@ describe('Test permissionCache', () => {
expect(result).toEqual('value');
});

it('UNIT_CACHE - Should reload cache', () => {
it('UNIT_PERMISSION_CACHE - Should reload cache', () => {
const cacheKey = permissionCache.permissionKey(
'adminId',
'domainId',
Expand All @@ -46,7 +46,7 @@ describe('Test permissionCache', () => {
expect(result).toBeUndefined();
});

it('UNIT_CACHE - Should NOT reload cache', () => {
it('UNIT_PERMISSION_CACHE - Should NOT reload cache', () => {
const cacheKey = permissionCache.permissionKey(
'adminId',
'domainId',
Expand All @@ -61,7 +61,7 @@ describe('Test permissionCache', () => {
expect(result).toEqual('value');
});

it('UNIT_CACHE - Should NOT reload cache - empty router/action', () => {
it('UNIT_PERMISSION_CACHE - Should NOT reload cache - empty router/action', () => {
const cacheKey = permissionCache.permissionKey(
'adminId',
'domainId',
Expand All @@ -76,7 +76,7 @@ describe('Test permissionCache', () => {
expect(result).toEqual('value');
});

it('UNIT_CACHE - Should NOT get from cache - different environment', () => {
it('UNIT_PERMISSION_CACHE - Should NOT get from cache - different environment', () => {
const cacheKey = permissionCache.permissionKey(
'adminId',
'domainId',
Expand Down