Updating privilege string terminology

x-pack/plugins/alerting/server/alerts_client/alerts_client.ts

@@ -397,7 +397,7 @@ export class AlertsClient {
     await this.authorization.ensureAuthorized({
       ruleTypeId: alert.alertTypeId,
       consumer: alert.consumer,
-      operation: ReadOperations.GetAlertState,
+      operation: ReadOperations.GetRuleState,
       entity: AlertingAuthorizationEntity.Rule,
     });
     if (alert.scheduledTaskId) {
@@ -418,7 +418,7 @@ export class AlertsClient {
     await this.authorization.ensureAuthorized({
       ruleTypeId: alert.alertTypeId,
       consumer: alert.consumer,
-      operation: ReadOperations.GetAlertInstanceSummary,
+      operation: ReadOperations.GetAlertSummary,
       entity: AlertingAuthorizationEntity.Rule,
     });
 
@@ -1282,7 +1282,7 @@ export class AlertsClient {
       await this.authorization.ensureAuthorized({
         ruleTypeId: attributes.alertTypeId,
         consumer: attributes.consumer,
-        operation: WriteOperations.MuteInstance,
+        operation: WriteOperations.MuteAlert,
         entity: AlertingAuthorizationEntity.Rule,
       });
 
@@ -1350,7 +1350,7 @@ export class AlertsClient {
       await this.authorization.ensureAuthorized({
         ruleTypeId: attributes.alertTypeId,
         consumer: attributes.consumer,
-        operation: WriteOperations.UnmuteInstance,
+        operation: WriteOperations.UnmuteAlert,
         entity: AlertingAuthorizationEntity.Rule,
       });
       if (attributes.actions.length) {

x-pack/plugins/alerting/server/alerts_client/tests/get_alert_state.test.ts

@@ -213,7 +213,7 @@ describe('getAlertState()', () => {
       expect(authorization.ensureAuthorized).toHaveBeenCalledWith({
         entity: 'rule',
         consumer: 'myApp',
-        operation: 'getAlertState',
+        operation: 'getRuleState',
         ruleTypeId: 'myType',
       });
     });
@@ -222,19 +222,19 @@ describe('getAlertState()', () => {
       const alertsClient = new AlertsClient(alertsClientParams);
       // `get` check
       authorization.ensureAuthorized.mockResolvedValueOnce();
-      // `getAlertState` check
+      // `getRuleState` check
       authorization.ensureAuthorized.mockRejectedValueOnce(
-        new Error(`Unauthorized to getAlertState a "myType" alert for "myApp"`)
+        new Error(`Unauthorized to getRuleState a "myType" alert for "myApp"`)
       );
 
       await expect(alertsClient.getAlertState({ id: '1' })).rejects.toMatchInlineSnapshot(
-        `[Error: Unauthorized to getAlertState a "myType" alert for "myApp"]`
+        `[Error: Unauthorized to getRuleState a "myType" alert for "myApp"]`
       );
 
       expect(authorization.ensureAuthorized).toHaveBeenCalledWith({
         entity: 'rule',
         consumer: 'myApp',
-        operation: 'getAlertState',
+        operation: 'getRuleState',
         ruleTypeId: 'myType',
       });
     });

x-pack/plugins/alerting/server/alerts_client/tests/mute_instance.test.ts

@@ -162,27 +162,27 @@ describe('muteInstance()', () => {
       expect(authorization.ensureAuthorized).toHaveBeenCalledWith({
         entity: 'rule',
         consumer: 'myApp',
-        operation: 'muteInstance',
+        operation: 'muteAlert',
         ruleTypeId: 'myType',
       });
     });
 
     test('throws when user is not authorised to muteInstance this type of alert', async () => {
       const alertsClient = new AlertsClient(alertsClientParams);
       authorization.ensureAuthorized.mockRejectedValue(
-        new Error(`Unauthorized to muteInstance a "myType" alert for "myApp"`)
+        new Error(`Unauthorized to muteAlert a "myType" alert for "myApp"`)
       );
 
       await expect(
         alertsClient.muteInstance({ alertId: '1', alertInstanceId: '2' })
       ).rejects.toMatchInlineSnapshot(
-        `[Error: Unauthorized to muteInstance a "myType" alert for "myApp"]`
+        `[Error: Unauthorized to muteAlert a "myType" alert for "myApp"]`
       );
 
       expect(authorization.ensureAuthorized).toHaveBeenCalledWith({
         entity: 'rule',
         consumer: 'myApp',
-        operation: 'muteInstance',
+        operation: 'muteAlert',
         ruleTypeId: 'myType',
       });
     });

x-pack/plugins/alerting/server/alerts_client/tests/unmute_instance.test.ts

@@ -160,27 +160,27 @@ describe('unmuteInstance()', () => {
       expect(authorization.ensureAuthorized).toHaveBeenCalledWith({
         entity: 'rule',
         consumer: 'myApp',
-        operation: 'unmuteInstance',
+        operation: 'unmuteAlert',
         ruleTypeId: 'myType',
       });
     });
 
     test('throws when user is not authorised to unmuteInstance this type of alert', async () => {
       const alertsClient = new AlertsClient(alertsClientParams);
       authorization.ensureAuthorized.mockRejectedValue(
-        new Error(`Unauthorized to unmuteInstance a "myType" alert for "myApp"`)
+        new Error(`Unauthorized to unmuteAlert a "myType" alert for "myApp"`)
       );
 
       await expect(
         alertsClient.unmuteInstance({ alertId: '1', alertInstanceId: '2' })
       ).rejects.toMatchInlineSnapshot(
-        `[Error: Unauthorized to unmuteInstance a "myType" alert for "myApp"]`
+        `[Error: Unauthorized to unmuteAlert a "myType" alert for "myApp"]`
       );
 
       expect(authorization.ensureAuthorized).toHaveBeenCalledWith({
         entity: 'rule',
         consumer: 'myApp',
-        operation: 'unmuteInstance',
+        operation: 'unmuteAlert',
         ruleTypeId: 'myType',
       });
     });

x-pack/plugins/alerting/server/authorization/alerting_authorization.ts

@@ -28,8 +28,8 @@ export enum AlertingAuthorizationEntity {
 
 export enum ReadOperations {
   Get = 'get',
-  GetAlertState = 'getAlertState',
-  GetAlertInstanceSummary = 'getAlertInstanceSummary',
+  GetRuleState = 'getRuleState',
+  GetAlertSummary = 'getAlertSummary',
   Find = 'find',
 }
 
@@ -42,8 +42,8 @@ export enum WriteOperations {
   Disable = 'disable',
   MuteAll = 'muteAll',
   UnmuteAll = 'unmuteAll',
-  MuteInstance = 'muteInstance',
-  UnmuteInstance = 'unmuteInstance',
+  MuteAlert = 'muteAlert',
+  UnmuteAlert = 'unmuteAlert',
 }
 
 export interface EnsureAuthorizedOpts {

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts

@@ -77,8 +77,8 @@ describe(`feature_privilege_builder`, () => {
         expect(alertingFeaturePrivileges.getActions(privilege, feature)).toMatchInlineSnapshot(`
           Array [
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/get",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertState",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertInstanceSummary",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleState",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/get",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/find",
@@ -117,8 +117,8 @@ describe(`feature_privilege_builder`, () => {
         expect(alertingFeaturePrivileges.getActions(privilege, feature)).toMatchInlineSnapshot(`
           Array [
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/get",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertState",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertInstanceSummary",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleState",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/create",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/delete",
@@ -128,8 +128,8 @@ describe(`feature_privilege_builder`, () => {
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/disable",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/muteAll",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/unmuteAll",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/muteInstance",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/unmuteInstance",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/muteAlert",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/unmuteAlert",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/get",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/find",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/update",
@@ -168,8 +168,8 @@ describe(`feature_privilege_builder`, () => {
         expect(alertingFeaturePrivileges.getActions(privilege, feature)).toMatchInlineSnapshot(`
           Array [
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/get",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertState",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertInstanceSummary",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getRuleState",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/getAlertSummary",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/find",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/create",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/delete",
@@ -179,14 +179,14 @@ describe(`feature_privilege_builder`, () => {
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/disable",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/muteAll",
             "alerting:1.0.0-zeta1:alert-type/my-feature/rule/unmuteAll",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/muteInstance",
-            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/unmuteInstance",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/muteAlert",
+            "alerting:1.0.0-zeta1:alert-type/my-feature/rule/unmuteAlert",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/get",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/find",
             "alerting:1.0.0-zeta1:alert-type/my-feature/alert/update",
             "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/get",
-            "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getAlertState",
-            "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getAlertInstanceSummary",
+            "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getRuleState",
+            "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/getAlertSummary",
             "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/rule/find",
             "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/alert/get",
             "alerting:1.0.0-zeta1:readonly-alert-type/my-feature/alert/find",

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts

@@ -16,7 +16,7 @@ enum AlertingType {
 }
 
 const readOperations: Record<AlertingType, string[]> = {
-  rule: ['get', 'getAlertState', 'getAlertInstanceSummary', 'find'],
+  rule: ['get', 'getRuleState', 'getAlertSummary', 'find'],
   alert: ['get', 'find'],
 };
 
@@ -30,8 +30,8 @@ const writeOperations: Record<AlertingType, string[]> = {
     'disable',
     'muteAll',
     'unmuteAll',
-    'muteInstance',
-    'unmuteInstance',
+    'muteAlert',
+    'unmuteAlert',
   ],
   alert: ['update'],
 };