generify util functions (#13)

Addresses PR feedback to generalize util params.
yctercero · Jul 5, 2021 · d403e56 · d403e56
1 parent 0a407df
commit d403e56
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
@@ -2010,8 +2010,13 @@ describe('AlertingAuthorization', () => {
       });
       alertTypeRegistry.list.mockReturnValue(setOfAlertTypes);
 
-      await expect(alertAuthorization.getAugmentRuleTypesWithAuthorization(['myApp'])).resolves
-        .toMatchInlineSnapshot(`
+      await expect(
+        alertAuthorization.getAugmentRuleTypesWithAuthorization(
+          ['myApp'],
+          [ReadOperations.Find, ReadOperations.Get, WriteOperations.Update],
+          AlertingAuthorizationEntity.Alert
+        )
+      ).resolves.toMatchInlineSnapshot(`
               Object {
                 "authorizedRuleTypes": Set {
                   Object {
@@ -2078,8 +2083,13 @@ describe('AlertingAuthorization', () => {
       });
       alertTypeRegistry.list.mockReturnValue(setOfAlertTypes);
 
-      await expect(alertAuthorization.getAugmentRuleTypesWithAuthorization(['myApp'])).resolves
-        .toMatchInlineSnapshot(`
+      await expect(
+        alertAuthorization.getAugmentRuleTypesWithAuthorization(
+          ['myApp'],
+          [ReadOperations.Find, ReadOperations.Get, WriteOperations.Update],
+          AlertingAuthorizationEntity.Alert
+        )
+      ).resolves.toMatchInlineSnapshot(`
               Object {
                 "authorizedRuleTypes": Set {
                   Object {

diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
@@ -143,16 +143,18 @@ export class AlertingAuthorization {
    * used by the RAC/Alerts client
    */
   public async getAugmentRuleTypesWithAuthorization(
-    featureIds: string[]
+    featureIds: string[],
+    operations: Array<ReadOperations | WriteOperations>,
+    authorizationEntity: AlertingAuthorizationEntity
   ): Promise<{
     username?: string;
     hasAllRequested: boolean;
     authorizedRuleTypes: Set<RegistryAlertTypeWithAuth>;
   }> {
     return this.augmentRuleTypesWithAuthorization(
       this.alertTypeRegistry.list(),
-      [ReadOperations.Find, ReadOperations.Get, WriteOperations.Update],
-      AlertingAuthorizationEntity.Alert,
+      operations,
+      authorizationEntity,
       new Set(featureIds)
     );
   }

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -64,9 +64,14 @@ export class AlertsClient {
     this.auditLogger = auditLogger;
   }
 
-  public async getAlertsIndex(featureIds: string[]) {
+  public async getAlertsIndex(
+    featureIds: string[],
+    operations: Array<ReadOperations | WriteOperations>
+  ) {
     return this.authorization.getAugmentRuleTypesWithAuthorization(
-      featureIds.length !== 0 ? featureIds : ['apm', 'siem']
+      featureIds.length !== 0 ? featureIds : ['apm', 'siem'],
+      operations,
+      AlertingAuthorizationEntity.Alert
     );
   }
 
@@ -186,7 +191,9 @@ export class AlertsClient {
 
   public async getAuthorizedAlertsIndices(featureIds: string[]): Promise<string[] | undefined> {
     const augmentedRuleTypes = await this.authorization.getAugmentRuleTypesWithAuthorization(
-      featureIds
+      featureIds,
+      [ReadOperations.Find, ReadOperations.Get, WriteOperations.Update],
+      AlertingAuthorizationEntity.Alert
     );
 
     const arrayOfAuthorizedRuleTypes = Array.from(augmentedRuleTypes.authorizedRuleTypes);