Skip to content

Commit 7033d46

Browse files
committed
fix: reload issue
1 parent bc94bf7 commit 7033d46

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

src/resourceManager.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ export class RuleService extends ServiceBase<RuleListResponse, RuleList> impleme
257257
return { operation_status: acsResponse.operation_status };
258258
}
259259
const result = await super.update(request, ctx);
260+
_accessController.policySets = await policySetService.load() || new Map();
261+
this.logger.info('Reloaded Rules after update operation');
260262
return result;
261263
}
262264

@@ -286,6 +288,8 @@ export class RuleService extends ServiceBase<RuleListResponse, RuleList> impleme
286288
return { operation_status: acsResponse.operation_status };
287289
}
288290
const result = await super.upsert(request, ctx);
291+
_accessController.policySets = await policySetService.load() || new Map();
292+
this.logger.info('Reloaded Rules after upsert operation');
289293
return result;
290294
}
291295

@@ -541,6 +545,8 @@ export class PolicyService extends ServiceBase<PolicyListResponse, PolicyList> i
541545
return { operation_status: acsResponse.operation_status };
542546
}
543547
const result = await super.update(request, ctx);
548+
_accessController.policySets = await policySetService.load() || new Map();
549+
this.logger.info('Reloaded Policies after update operation');
544550
return result;
545551
}
546552

@@ -570,6 +576,8 @@ export class PolicyService extends ServiceBase<PolicyListResponse, PolicyList> i
570576
return { operation_status: acsResponse.operation_status };
571577
}
572578
const result = await super.upsert(request, ctx);
579+
_accessController.policySets = await policySetService.load() || new Map();
580+
this.logger.info('Reloaded Policies after upsert operation');
573581
return result;
574582
}
575583

@@ -986,6 +994,8 @@ export class PolicySetService extends ServiceBase<PolicySetListResponse, PolicyS
986994
return { operation_status: acsResponse.operation_status };
987995
}
988996
const result = await super.upsert(request, ctx);
997+
_accessController.policySets = await policySetService.load() || new Map();
998+
this.logger.info('Reloaded PolicySet after upsert operation');
989999
return result;
9901000
}
9911001
}

src/worker.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,6 @@ export class Worker {
106106
_.assign({}, kafkaConfig, policySetConfig, policyConfig, ruleConfig));
107107

108108
kafkaConfig = this.cfg.get('events:kafka');
109-
const acsEvents = [
110-
'policy_setCreated',
111-
'policy_setModified',
112-
'policy_setDeleted',
113-
'policyCreated',
114-
'policyModified',
115-
'policyDeleted',
116-
'ruleCreated',
117-
'ruleModified',
118-
'ruleDeleted',
119-
];
120109
const hierarchicalScopesResponse = 'hierarchicalScopesResponse';
121110
const events = new Events(kafkaConfig, this.logger); // Kafka
122111
await events.start();
@@ -241,9 +230,7 @@ export class Worker {
241230
const commandTopic = await events.topic(this.cfg.get('events:kafka:topics:command:topic'));
242231
const eventListener = async (msg: any,
243232
context: any, config: any, eventName: string): Promise<any> => {
244-
if (acsEvents.indexOf(eventName) > -1) {
245-
await accessControlService.loadPolicies();
246-
} else if (eventName === hierarchicalScopesResponse) {
233+
if (eventName === hierarchicalScopesResponse) {
247234
// Add subject_id to waiting list
248235
const hierarchical_scopes = msg?.hierarchical_scopes ? msg.hierarchical_scopes : [];
249236
const tokenDate = msg?.token;

0 commit comments

Comments
 (0)