From 583f54142234883206cf8ab1465ac5faa6f636a0 Mon Sep 17 00:00:00 2001
From: "Van J. Wilson" <vwilson@redhat.com>
Date: Thu, 27 Oct 2022 17:23:24 -0400
Subject: [PATCH 1/2] Fix skipTLSVerify property on Generic Webhook integration
 form

---
 .../Forms/GenericWebhookIntegrationForm.tsx            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx b/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx
index 75f11d34868c8..735b879313064 100644
--- a/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx
+++ b/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx
@@ -31,7 +31,7 @@ import FormLabelGroup from '../FormLabelGroup';
 export type GenericWebhookIntegration = {
     generic: {
         endpoint: string;
-        skipTlsVerify: boolean;
+        skipTLSVerify: boolean;
         auditLoggingEnabled: boolean;
         caCert: string;
         username: string;
@@ -105,7 +105,7 @@ export const defaultValues: GenericWebhookIntegrationFormValues = {
         name: '',
         generic: {
             endpoint: '',
-            skipTlsVerify: false,
+            skipTLSVerify: false,
             auditLoggingEnabled: false,
             caCert: '',
             username: '',
@@ -207,13 +207,13 @@ function GenericWebhookIntegrationForm({
                         </FormLabelGroup>
                         <FormLabelGroup
                             label=""
-                            fieldId="notifier.generic.skipTlsVerify"
+                            fieldId="notifier.generic.skipTLSVerify"
                             errors={errors}
                         >
                             <Checkbox
                                 label="Skip TLS verification"
-                                id="notifier.generic.skipTlsVerify"
-                                isChecked={values.notifier.generic.skipTlsVerify}
+                                id="notifier.generic.skipTLSVerify"
+                                isChecked={values.notifier.generic.skipTLSVerify}
                                 onChange={onChange}
                                 onBlur={handleBlur}
                                 isDisabled={!isEditable}

From 848902d79b17fc17dd5cce32b2585249d54944fe Mon Sep 17 00:00:00 2001
From: "Van J. Wilson" <vwilson@redhat.com>
Date: Fri, 28 Oct 2022 10:04:02 -0400
Subject: [PATCH 2/2] Address PR comments

---
 .../Forms/GenericWebhookIntegrationForm.tsx   | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx b/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx
index 735b879313064..823a62538c1fa 100644
--- a/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx
+++ b/ui/apps/platform/src/Containers/Integrations/IntegrationForm/Forms/GenericWebhookIntegrationForm.tsx
@@ -15,39 +15,18 @@ import { PlusCircleIcon, TrashIcon } from '@patternfly/react-icons';
 import * as yup from 'yup';
 import { FieldArray, FormikProvider } from 'formik';
 
-import { NotifierIntegrationBase } from 'services/NotifierIntegrationsService';
-
 import usePageState from 'Containers/Integrations/hooks/usePageState';
 import FormMessage from 'Components/PatternFly/FormMessage';
 import FormTestButton from 'Components/PatternFly/FormTestButton';
 import FormSaveButton from 'Components/PatternFly/FormSaveButton';
 import FormCancelButton from 'Components/PatternFly/FormCancelButton';
+import { GenericNotifierIntegration as GenericWebhookIntegration } from 'types/notifier.proto';
 import useIntegrationForm from '../useIntegrationForm';
 import { IntegrationFormProps } from '../integrationFormTypes';
 
 import IntegrationFormActions from '../IntegrationFormActions';
 import FormLabelGroup from '../FormLabelGroup';
 
-export type GenericWebhookIntegration = {
-    generic: {
-        endpoint: string;
-        skipTLSVerify: boolean;
-        auditLoggingEnabled: boolean;
-        caCert: string;
-        username: string;
-        password: string;
-        headers: {
-            key: string;
-            value: string;
-        }[];
-        extraFields: {
-            key: string;
-            value: string;
-        }[];
-    };
-    type: 'generic';
-} & NotifierIntegrationBase;
-
 export type GenericWebhookIntegrationFormValues = {
     notifier: GenericWebhookIntegration;
     updatePassword: boolean;