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
1 change: 0 additions & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ jobs:
- name: SonarCloud Scan
uses: sonarsource/sonarqube-scan-action@v5.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

docker:
Expand Down
910 changes: 432 additions & 478 deletions npm-shrinkwrap.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "switcher-resolver-node",
"version": "1.0.1",
"version": "1.1.0",
"description": "Resolver API to be used with Switcher API",
"main": "src/start.js",
"type": "module",
Expand Down Expand Up @@ -41,7 +41,7 @@
"cors": "^2.8.5",
"express": "^5.1.0",
"express-basic-auth": "^1.2.1",
"express-rate-limit": "^7.5.0",
"express-rate-limit": "^7.5.1",
"express-validator": "^7.2.1",
"graphql": "^16.11.0",
"graphql-http": "^1.22.4",
Expand All @@ -50,7 +50,7 @@
"jsonwebtoken": "^9.0.2",
"moment": "^2.30.1",
"mongodb": "^6.17.0",
"mongoose": "^8.15.2",
"mongoose": "^8.16.0",
"pino": "^9.7.0",
"pino-pretty": "^13.0.0",
"swagger-ui-express": "^5.0.1",
Expand All @@ -60,7 +60,7 @@
"devDependencies": {
"env-cmd": "^10.1.0",
"eslint": "^9.29.0",
"jest": "^30.0.0",
"jest": "^30.0.2",
"jest-sonar-reporter": "^2.0.0",
"node-notifier": "^10.0.1",
"nodemon": "^3.1.10",
Expand Down
2 changes: 1 addition & 1 deletion requests/Switcher Resolver Node.postman_collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
]
},
{
"name": "GraphqQL",
"name": "Aggregator API (GraphqQL)",
"item": [
{
"name": "Resolve criteria - detailed",
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/client/resolvers.js → src/aggregator/resolvers.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import GroupConfig from '../models/group-config.js';
import { Config, RelayTypes} from '../models/config.js';
import { addMetrics } from '../models/metric.js';
import { ConfigStrategy, processOperation } from '../models/config-strategy.js';
import { resolveNotification, resolveValidation } from './relay/index.js';
import { resolveNotification, resolveValidation } from '../services/relay.js';
import Component from '../models/component.js';
import Logger from '../helpers/logger.js';
import { isRelayVerified, isRelayValid } from '../services/config.js';
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import './db/mongoose.js';
import mongoose from 'mongoose';
import swaggerDocument from './api-docs/swagger-document.js';
import clientApiRouter from './routers/client-api.js';
import schema from './client/schema.js';
import schema from './aggregator/schema.js';
import { appAuth, resourcesAuth } from './middleware/auth.js';
import { clientLimiter, defaultLimiter } from './middleware/limiter.js';
import { createServer } from './app-server.js';
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/cache/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { graphql } from 'graphql';
import schema from '../../client/schema.js';
import schema from '../../aggregator/schema.js';
import { getAllDomains } from '../../services/domain.js';
import { domainQuery, reduceSnapshot } from './query.js';

Expand Down
2 changes: 1 addition & 1 deletion src/routers/client-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { body, check, query, header } from 'express-validator';
import jwt from 'jsonwebtoken';
import { checkConfig, checkConfigComponent, validate } from '../middleware/validators.js';
import { appAuth, appGenerateCredentials } from '../middleware/auth.js';
import { resolveCriteria, findDomain } from '../client/resolvers.js';
import { resolveCriteria, findDomain } from '../aggregator/resolvers.js';
import { getConfigs } from '../services/config.js';
import { clientLimiter } from '../middleware/limiter.js';
import { StrategiesType } from '../models/config-strategy.js';
Expand Down
6 changes: 3 additions & 3 deletions src/client/relay/index.js → src/services/relay.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import axios from 'axios';
import https from 'https';
import { StrategiesToRelayDataType, RelayMethods } from '../../models/config.js';
import { checkHttpsAgent } from '../../external/switcher-api-facade.js';
import Logger from '../../helpers/logger.js';
import { StrategiesToRelayDataType, RelayMethods } from '../models/config.js';
import { checkHttpsAgent } from '../external/switcher-api-facade.js';
import Logger from '../helpers/logger.js';

const agent = async (url) => {
const response = await checkHttpsAgent(url);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit-test/client/relay.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import mongoose from 'mongoose';
import { resolveValidation } from '../../../src/client/relay';
import { resolveValidation } from '../../../src/services/relay';
import sinon from 'sinon';
import axios from 'axios';
import { RelayMethods } from '../../../src/models/config';
Expand Down