Update NotificationEventIndexTest.kt

.github/workflows/notifications-test-and-build-workflow.yml

@@ -26,8 +26,9 @@ name: Test and Build Notifications
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '1.0'
-  COMMON_UTILS_VERSION: '1.0'
+  OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'
+  OPENSEARCH_BRANCH: '1.x'
+  COMMON_UTILS_BRANCH: 'main'
 
 jobs:
   build:
@@ -45,30 +46,31 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: ${{ env.OPENSEARCH_VERSION }}
+          ref: ${{ env.OPENSEARCH_BRANCH }}
       - name: Build OpenSearch
         working-directory: ./OpenSearch
-        run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal
 
       # dependencies: common-utils
       - name: Checkout common-utils
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/common-utils'
-          ref: ${{ env.COMMON_UTILS_VERSION }}
+          ref: ${{ env.COMMON_UTILS_BRANCH }}
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       # notifications
       - name: Checkout Notifications
         uses: actions/checkout@v2
 
+      # Temporarily exclude tests which causing CI to fail. Tracking in #251
       - name: Build with Gradle
         run: |
           cd notifications
-          ./gradlew build -PexcludeTests="**/SesChannelIT*" -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
+          ./gradlew build -PexcludeTests="**/SesChannelIT*" -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1

dashboards-notifications/models/interfaces.ts

@@ -88,6 +88,10 @@ export interface ChannelItemType extends ConfigType {
       [id: string]: string;
     };
   };
+  sns?: {
+    topic_arn: string;
+    role_arn?: string;
+  }
 }
 
 interface ConfigType {

dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap

@@ -28,7 +28,6 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
       "notificationService": NotificationService {
         "createConfig": [Function],
         "deleteConfigs": [Function],
-        "getAvailableFeatures": [Function],
         "getChannel": [Function],
         "getChannels": [Function],
         "getConfig": [Function],
@@ -38,6 +37,7 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
         "getRecipientGroups": [Function],
         "getSender": [Function],
         "getSenders": [Function],
+        "getServerFeatures": [Function],
         "httpClient": [MockFunction],
         "updateConfig": [Function],
       },

dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap

@@ -29,7 +29,6 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
       "notificationService": NotificationService {
         "createConfig": [Function],
         "deleteConfigs": [Function],
-        "getAvailableFeatures": [Function],
         "getChannel": [Function],
         "getChannels": [Function],
         "getConfig": [Function],
@@ -39,6 +38,7 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
         "getRecipientGroups": [Function],
         "getSender": [Function],
         "getSenders": [Function],
+        "getServerFeatures": [Function],
         "httpClient": [MockFunction],
         "updateConfig": [Function],
       },
@@ -1862,7 +1862,6 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
       "notificationService": NotificationService {
         "createConfig": [Function],
         "deleteConfigs": [Function],
-        "getAvailableFeatures": [Function],
         "getChannel": [Function],
         "getChannels": [Function],
         "getConfig": [Function],
@@ -1872,6 +1871,7 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
         "getRecipientGroups": [Function],
         "getSender": [Function],
         "getSenders": [Function],
+        "getServerFeatures": [Function],
         "httpClient": [MockFunction],
         "updateConfig": [Function],
       },

dashboards-notifications/public/pages/Channels/components/details/ChannelSettingsDetails.tsx

@@ -143,19 +143,6 @@ export function ChannelSettingsDetails(props: ChannelSettingsDetailsProps) {
           title: 'Default recipients',
           description: recipientsDescription,
         },
-        // TODO remove when removing header/footer functionality
-        // {
-        //   title: 'Email header',
-        //   description: props.channel.destination.email.header
-        //     ? 'Enabled'
-        //     : 'Disabled',
-        // },
-        // {
-        //   title: 'Email footer',
-        //   description: props.channel.destination.email.footer
-        //     ? 'Enabled'
-        //     : 'Disabled',
-        // },
       ]
     );
   } else if (type === BACKEND_CHANNEL_TYPE.CUSTOM_WEBHOOK) {
@@ -203,22 +190,22 @@ export function ChannelSettingsDetails(props: ChannelSettingsDetailsProps) {
       ]
     );
   } else if (type === BACKEND_CHANNEL_TYPE.SNS) {
-    // settingsList.push(
-    //   ...[
-    //     {
-    //       title: 'Channel type',
-    //       description: CHANNEL_TYPE.SNS,
-    //     },
-    //     {
-    //       title: 'SNS topic ARN',
-    //       description: props.channel.destination.sns.topic_arn || '-',
-    //     },
-    //     {
-    //       title: 'IAM role ARN',
-    //       description: props.channel.destination.sns.role_arn || '-',
-    //     },
-    //   ]
-    // );
+    settingsList.push(
+      ...[
+        {
+          title: 'Channel type',
+          description: CHANNEL_TYPE.sns,
+        },
+        {
+          title: 'SNS topic ARN',
+          description: props.channel.sns?.topic_arn || '-',
+        },
+        {
+          title: 'IAM role ARN',
+          description: props.channel.sns?.role_arn || '-',
+        },
+      ]
+    );
   } else if (type === BACKEND_CHANNEL_TYPE.SES) {
     // TODO
   }

dashboards-notifications/public/pages/CreateChannel/CreateChannel.tsx

@@ -90,8 +90,6 @@ export const CreateChannelContext = createContext<{
 } | null>(null);
 
 export function CreateChannel(props: CreateChannelsProps) {
-  const isOdfe = true;
-
   const coreContext = useContext(CoreServicesContext)!;
   const servicesContext = useContext(ServicesContext)!;
   const mainStateContext = useContext(MainContext)!;
@@ -226,7 +224,8 @@ export function CreateChannel(props: CreateChannelsProps) {
       } else if (type === BACKEND_CHANNEL_TYPE.SES) {
         // TODO
       } else if (type === BACKEND_CHANNEL_TYPE.SNS) {
-        // TODO
+        setTopicArn(response.sns?.topic_arn || '');
+        setRoleArn(response.sns?.role_arn || '');
       }
     } catch (error) {
       coreContext.notifications.toasts.addDanger(
@@ -265,7 +264,7 @@ export function CreateChannel(props: CreateChannelsProps) {
       }
     } else if (channelType === BACKEND_CHANNEL_TYPE.SNS) {
       errors.topicArn = validateArn(topicArn);
-      if (!isOdfe) errors.roleArn = validateArn(roleArn);
+      if (!mainStateContext.tooltipSupport) errors.roleArn = validateArn(roleArn);
     }
     setInputErrors(errors);
     return !Object.values(errors).reduce(
@@ -303,6 +302,13 @@ export function CreateChannel(props: CreateChannelsProps) {
         selectedSenderOptions,
         selectedRecipientGroupOptions
       );
+    } else if (channelType === BACKEND_CHANNEL_TYPE.SES) {
+      // TODO
+    } else if (channelType === BACKEND_CHANNEL_TYPE.SNS) {
+      config.sns = {
+        topic_arn: topicArn,
+        ...(roleArn && { role_arn: roleArn }),
+      };
     }
     return config;
   };
@@ -450,7 +456,6 @@ export function CreateChannel(props: CreateChannelsProps) {
             />
           ) : channelType === BACKEND_CHANNEL_TYPE.SNS ? (
             <SNSSettings
-              isOdfe={isOdfe}
               topicArn={topicArn}
               setTopicArn={setTopicArn}
               roleArn={roleArn}

dashboards-notifications/public/pages/CreateChannel/__tests__/validationHelper.test.ts

@@ -46,9 +46,11 @@ describe('test create channel validation helpers', () => {
 
   it('validates webhook', () => {
     const pass = validateWebhookURL('https://test-webhook');
+    const httpTest = validateWebhookURL('http://test-webhook');
     const emptyInput = validateWebhookURL('');
     const invalidURL = validateWebhookURL('hxxp://test-webhook');
     expect(pass).toHaveLength(0);
+    expect(httpTest).toHaveLength(0);
     expect(emptyInput).toHaveLength(1);
     expect(invalidURL).toHaveLength(1);
   });
@@ -69,11 +71,13 @@ describe('test create channel validation helpers', () => {
 
   it('validates custom url host', () => {
     const pass = validateCustomURLHost('test-webhook');
+    const httpTest = validateCustomURLHost('http://test-webhook');
+    const httpsTest = validateCustomURLHost('https://test-webhook');
     const emptyInput = validateCustomURLHost('');
-    const invalidURL = validateCustomURLHost('http://test-webhook'); // only https is allowed
     expect(pass).toHaveLength(0);
+    expect(httpTest).toHaveLength(0);
+    expect(httpsTest).toHaveLength(0);
     expect(emptyInput).toHaveLength(1);
-    expect(invalidURL).toHaveLength(1);
   });
 
   it('validates custom url port', () => {

dashboards-notifications/public/pages/CreateChannel/components/EmailSettings.tsx

@@ -212,6 +212,10 @@ export function EmailSettings(props: EmailSettingsProps) {
                           ) => {
                             setSenderOptions([...senderOptions, newOption]);
                             props.setSelectedSenderOptions([newOption]);
+                            context.setInputErrors({
+                              ...context.inputErrors,
+                              sender: validateEmailSender([newOption]),
+                            });
                           },
                         })
                       }
@@ -273,6 +277,10 @@ export function EmailSettings(props: EmailSettingsProps) {
                           ...props.selectedRecipientGroupOptions,
                           newOption,
                         ]);
+                        context.setInputErrors({
+                          ...context.inputErrors,
+                          recipients: validateRecipients([newOption]),
+                        });
                       },
                     })
                   }

dashboards-notifications/public/pages/CreateChannel/components/SNSSettings.tsx

@@ -34,11 +34,11 @@ import {
 } from '@elastic/eui';
 import React, { useContext } from 'react';
 import { DOCUMENTATION_LINK } from '../../../utils/constants';
+import { MainContext } from '../../Main/Main';
 import { CreateChannelContext } from '../CreateChannel';
 import { validateArn } from '../utils/validationHelper';
 
 interface SNSSettingsProps {
-  isOdfe: boolean;
   topicArn: string;
   setTopicArn: (topicArn: string) => void;
   roleArn: string;
@@ -47,6 +47,7 @@ interface SNSSettingsProps {
 
 export function SNSSettings(props: SNSSettingsProps) {
   const context = useContext(CreateChannelContext)!;
+  const mainStateContext = useContext(MainContext)!;
   return (
     <>
       <EuiSpacer />
@@ -69,7 +70,7 @@ export function SNSSettings(props: SNSSettingsProps) {
         />
       </EuiFormRow>
 
-      {props.isOdfe ? (
+      {mainStateContext.tooltipSupport ? (
         <>
           <EuiFormRow
             label={
@@ -97,9 +98,8 @@ export function SNSSettings(props: SNSSettingsProps) {
             style={{ maxWidth: 720 }}
           >
             <div>
-              If your cluster is not running on AWS, you must add your access
-              key, secret key, and optional session token to the OpenSearch
-              keystore.{' '}
+              If your cluster is not running on AWS, you must configure aws
+              credentials on your OpenSearch cluster.{' '}
               <EuiLink href={DOCUMENTATION_LINK} target="_blank" external>
                 Learn more
               </EuiLink>

dashboards-notifications/public/pages/CreateChannel/utils/validationHelper.ts

@@ -36,7 +36,7 @@ export const validateChannelName = (name: string) => {
 export const validateWebhookURL = (url: string) => {
   const errors = [];
   if (url.length === 0) errors.push('Webhook URL cannot be empty.');
-  else if (!url.match(/^https:\/\/.+/)) errors.push('Invalid webhook URL.');
+  else if (!url.match(/^https?:\/\/.+/)) errors.push('Invalid webhook URL.');
   return errors;
 };
 
@@ -55,7 +55,6 @@ export const validateWebhookValue = (value: string) => {
 export const validateCustomURLHost = (host: string) => {
   const errors = [];
   if (host.length === 0) errors.push('Host cannot be empty.');
-  else if (host.match(/^http:\/\//)) errors.push('Invalid webhook URL.');
   return errors;
 };
 

dashboards-notifications/public/pages/Main/Main.tsx

@@ -57,6 +57,7 @@ interface MainProps extends RouteComponentProps {}
 
 export interface MainState {
   availableFeatures: Partial<typeof CHANNEL_TYPE>;
+  tooltipSupport: boolean; // if true, IAM role for SNS is optional and helper text should be available
 }
 
 export const MainContext = createContext<MainState | null>(null);
@@ -68,13 +69,17 @@ export default class Main extends Component<MainProps, MainState> {
     super(props);
     this.state = {
       availableFeatures: CHANNEL_TYPE,
+      tooltipSupport: false,
     };
   }
 
   async componentDidMount() {
-    const availableFeatures =
-      await this.context.notificationService.getAvailableFeatures();
-    if (availableFeatures != null) this.setState({ availableFeatures });
+    const serverFeatures = await this.context.notificationService.getServerFeatures();
+    if (serverFeatures != null)
+      this.setState({
+        availableFeatures: serverFeatures.availableFeatures,
+        tooltipSupport: serverFeatures.tooltipSupport,
+      });
   }
 
   render() {

dashboards-notifications/public/pages/Notifications/containers/Notifications.tsx

@@ -198,13 +198,13 @@ export default class Notifications extends Component<
       const getNotificationsResponse = await services.eventService.getNotifications(
         queryObject
       );
-      const getHistogramResponse = await services.eventService.getHistogram(
-        queryObject
-      );
+      // const getHistogramResponse = await services.eventService.getHistogram(
+      //   queryObject
+      // );
       this.setState({
         items: getNotificationsResponse.items,
         total: getNotificationsResponse.total,
-        histogramData: getHistogramResponse,
+        // histogramData: getHistogramResponse,
       });
     } catch (err) {
       this.context.notifications.toasts.addDanger(

dashboards-notifications/public/services/EventService.ts

@@ -27,7 +27,6 @@
 import { HttpFetchQuery, HttpSetup } from '../../../../src/core/public';
 import { NODE_API } from '../../common';
 import { NOTIFICATION_SOURCE } from '../utils/constants';
-import { MOCK_GET_HISTOGRAM } from './mockData';
 import { eventListToNotifications, eventToNotification } from './utils/helper';
 
 interface EventsResponse {
@@ -43,7 +42,8 @@ export default class EventService {
   }
 
   getHistogram = async (queryObject: object) => {
-    return MOCK_GET_HISTOGRAM();
+    // TODO needs backend support
+    // return MOCK_GET_HISTOGRAM();
   };
 
   getNotifications = async (queryObject: HttpFetchQuery) => {