Skip to content

Commit 8b0db2f

Browse files
Arun-KumarHArun-KumarH
committed
fix: unit tests
1 parent 5b9b46f commit 8b0db2f

File tree

6 files changed

+48
-49
lines changed

6 files changed

+48
-49
lines changed

‎test/acl.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import * as mocha from 'mocha';
22
import * as should from 'should';
3-
import { Worker } from '../lib/worker';
4-
import * as testUtils from './utils';
3+
import { Worker } from '../lib/worker.js';
4+
import * as testUtils from './utils.js';
55
import * as yaml from 'js-yaml';
6-
import * as fs from 'fs';
6+
import * as fs from 'node:fs';
77
import { updateConfig } from '@restorecommerce/acs-client';
88
import { createChannel, createClient } from '@restorecommerce/grpc-client';
9-
import { RuleServiceDefinition, RuleServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule';
10-
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy';
11-
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set';
12-
import { AccessControlServiceDefinition, AccessControlServiceClient, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control';
13-
import { cfg, logger } from './utils';
9+
import { RuleServiceDefinition, RuleServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule.js';
10+
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy.js';
11+
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set.js';
12+
import { AccessControlServiceDefinition, AccessControlServiceClient, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control.js';
13+
import { cfg, logger } from './utils.js';
1414

1515
let worker: Worker;
1616
let ruleService: RuleServiceClient, policyService: PolicyServiceClient, policySetService: PolicySetServiceClient;

‎test/core.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import * as mocha from 'mocha';
22
import nock from 'nock';
33
import * as should from 'should';
4-
import * as core from '../src/core';
5-
import * as testUtils from './utils';
4+
import { AccessController } from '../src/core/accessController.js';
5+
import * as testUtils from './utils.js';
66
import { Events } from '@restorecommerce/kafka-client';
77
import { createChannel, createClient } from '@restorecommerce/grpc-client';
8-
import { UserServiceDefinition } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/user';
9-
import { Request, Response, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control';
10-
import { cfg, logger } from './utils';
8+
import { UserServiceDefinition } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/user.js';
9+
import { Request, Response, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control.js';
10+
import { cfg, logger } from './utils.js';
1111

1212
const acConfig = require('./access_control.json');
1313

14-
let ac: core.AccessController;
14+
let ac: AccessController;
1515
let request: Request;
1616

1717
// Helper functions
@@ -25,11 +25,11 @@ const prepare = async (filepath: string): Promise<void> => {
2525
...grpcIDSConfig,
2626
logger
2727
}, UserServiceDefinition, createChannel(grpcIDSConfig.address));
28-
ac = new core.AccessController(logger, acConfig, userTopic, cfg, userService);
28+
ac = new AccessController(logger, acConfig, userTopic, cfg, userService);
2929
testUtils.populate(ac, filepath);
3030
};
3131

32-
const requestAndValidate = async (ac: core.AccessController, request: Request, expectedDecision: Response_Decision, invalidContext?: boolean): Promise<void> => {
32+
const requestAndValidate = async (ac: AccessController, request: Request, expectedDecision: Response_Decision, invalidContext?: boolean): Promise<void> => {
3333
const response: Response = await ac.isAllowed(request);
3434
should.exist(response);
3535
should.exist(response.decision);

‎test/microservice.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import * as mocha from 'mocha';
22
import * as should from 'should';
3-
import { Worker } from '../src/worker';
4-
import * as testUtils from './utils';
3+
import { Worker } from '../src/worker.js';
4+
import * as testUtils from './utils.js';
55
import * as yaml from 'js-yaml';
6-
import * as fs from 'fs';
6+
import * as fs from 'node:fs';
77
import { updateConfig } from '@restorecommerce/acs-client';
88
import { createChannel, createClient } from '@restorecommerce/grpc-client';
9-
import { RuleServiceDefinition, RuleServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule';
10-
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy';
11-
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set';
12-
import { AccessControlServiceDefinition, AccessControlServiceClient, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control';
13-
import { PolicySetWithCombinables, PolicyWithCombinables } from '../src/core/interfaces';
14-
import { cfg, logger } from './utils';
9+
import { RuleServiceDefinition, RuleServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule.js';
10+
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy.js';
11+
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set.js';
12+
import { AccessControlServiceDefinition, AccessControlServiceClient, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control.js';
13+
import { PolicySetWithCombinables, PolicyWithCombinables } from '../src/core/interfaces.js';
14+
import { cfg, logger } from './utils.js';
1515

1616
let worker: Worker;
1717
let ruleService: RuleServiceClient, policyService: PolicyServiceClient, policySetService: PolicySetServiceClient;

‎test/microservice_acs_enabled.spec.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
import * as should from 'should';
2-
import { Worker } from '../src/worker';
3-
import * as testUtils from './utils';
2+
import { Worker } from '../src/worker.js';
3+
import * as testUtils from './utils.js';
44
import * as yaml from 'js-yaml';
55
import * as fs from 'fs';
66
import { updateConfig } from '@restorecommerce/acs-client';
77
import { GrpcMockServer, ProtoUtils } from '@alenon/grpc-mock-server';
88
import * as proto_loader from '@grpc/proto-loader';
99
import * as grpc from '@grpc/grpc-js';
1010
import { Topic, Events } from '@restorecommerce/kafka-client';
11-
import { RuleServiceDefinition, RuleServiceClient, Effect } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule';
12-
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy';
13-
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set';
14-
import { AccessControlServiceDefinition } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control';
11+
import { RuleServiceDefinition, RuleServiceClient, Effect } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule.js';
12+
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy.js';
13+
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set.js';
1514
import { createChannel, createClient } from '@restorecommerce/grpc-client';
16-
import { cfg, logger } from './utils';
15+
import { cfg, logger } from './utils.js';
1716

1817
let worker: Worker;
1918
let ruleService: RuleServiceClient, policyService: PolicyServiceClient, policySetService: PolicySetServiceClient;

‎test/properties.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
import * as mocha from 'mocha';
44
import * as should from 'should';
5-
import { Worker } from '../src/worker';
6-
import * as testUtils from './utils';
5+
import { Worker } from '../src/worker.js';
6+
import * as testUtils from './utils.js';
77
import * as yaml from 'js-yaml';
8-
import * as fs from 'fs';
8+
import * as fs from 'node:fs';
99
import { updateConfig } from '@restorecommerce/acs-client';
1010
import { createChannel, createClient } from '@restorecommerce/grpc-client';
11-
import { RuleServiceDefinition, RuleServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule';
12-
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy';
13-
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set';
14-
import { AccessControlServiceDefinition, AccessControlServiceClient, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control';
15-
import { cfg, logger } from './utils';
11+
import { RuleServiceDefinition, RuleServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule.js';
12+
import { PolicyServiceDefinition, PolicyServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy.js';
13+
import { PolicySetServiceDefinition, PolicySetServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/policy_set.js';
14+
import { AccessControlServiceDefinition, AccessControlServiceClient, Response_Decision } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control.js';
15+
import { cfg, logger } from './utils.js';
1616

1717
let worker: Worker;
1818
let ruleService: RuleServiceClient, policyService: PolicyServiceClient, policySetService: PolicySetServiceClient;

‎test/utils.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import * as _ from 'lodash';
1+
import * as _ from 'lodash-es';
22
import * as yaml from 'js-yaml';
3-
import * as fs from 'fs';
4-
import * as core from '../src/core';
5-
import { formatTarget } from '../src/core/utils';
3+
import * as fs from 'node:fs';
4+
import { AccessController } from '../src/core/accessController.js';
5+
import { formatTarget } from '../src/core/utils.js';
66
export { formatTarget };
77
import { createLogger } from '@restorecommerce/logger';
88
import { createServiceConfig } from '@restorecommerce/service-config';
9-
import { Request } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control';
10-
import { Attribute } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/attribute';
11-
import { Rule, Effect } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule';
12-
import { PolicyWithCombinables, PolicySetWithCombinables } from '../src/core/interfaces';
9+
import { Request } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/access_control.js';
10+
import { Attribute } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/attribute.js';
11+
import { Rule, Effect } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule.js';
12+
import { PolicyWithCombinables, PolicySetWithCombinables } from '../src/core/interfaces.js';
1313

1414
export const cfg = createServiceConfig(process.cwd() + '/test');
1515
export const logger = createLogger(cfg.get('logger'));
@@ -375,7 +375,7 @@ export const marshallRequest = (request: Request): void => {
375375
};
376376

377377

378-
export const populate = (accessController: core.AccessController, filepath: string): core.AccessController => {
378+
export const populate = (accessController: AccessController, filepath: string): AccessController => {
379379
const rawObject = yaml.load(fs.readFileSync(filepath));
380380
const policySets = rawObject.policy_sets;
381381

0 commit comments

Comments
 (0)