fetch secret to check URL with new IP address validation on edit of an existing provider

Author: jpuzz0

packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
-import { ProviderModel } from '@kubev2v/types';
+import { IoK8sApiCoreV1Secret, ProviderModel } from '@kubev2v/types';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { ModalVariant } from '@patternfly/react-core';
 
 import { validateEsxiURL, validateVCenterURL } from '../../utils/validators';
@@ -16,12 +17,20 @@ export const VSphereEditURLModal: React.FC<EditProviderURLModalProps> = (props)
 
   let validationHook: ValidationHookType;
 
+  const [secret] = useK8sWatchResource<IoK8sApiCoreV1Secret>({
+    groupVersionKind: { version: 'v1', kind: 'Secret' },
+    namespaced: true,
+    namespace: provider?.spec?.secret?.namespace,
+    name: provider?.spec?.secret?.name,
+  });
+
   // VCenter of ESXi
   const sdkEndpoint = provider?.spec?.settings?.['sdkEndpoint'] || '';
   if (sdkEndpoint === 'esxi') {
     validationHook = validateEsxiURL;
   } else {
-    validationHook = validateVCenterURL;
+    validationHook = () =>
+      validateVCenterURL(provider?.spec?.url, secret?.data?.insecureSkipVerify);
   }
 
   const ModalBody = (

packages/forklift-console-plugin/src/modules/Providers/utils/validators/provider/vsphere/validateVCenterURL.ts

@@ -1,9 +1,7 @@
-import { IoK8sApiCoreV1Secret } from '@kubev2v/types';
-
 import { safeBase64Decode } from '../../../helpers';
 import { validateIpv4, validateURL, ValidationMsg } from '../../common';
 
-export const validateVCenterURL = (url: string, secret?: IoK8sApiCoreV1Secret): ValidationMsg => {
+export const validateVCenterURL = (url: string, insecureSkipVerify?: string): ValidationMsg => {
   // For a newly opened form where the field is not set yet, set the validation type to default.
   if (url === undefined) {
     return {
@@ -21,7 +19,6 @@ export const validateVCenterURL = (url: string, secret?: IoK8sApiCoreV1Secret):
   const isValidURL = validateURL(trimmedUrl);
   const urlObject = getUrlObject(url);
   const urlHostname = urlObject?.hostname;
-  const insecureSkipVerify = secret?.data?.insecureSkipVerify;
   const isSecure = !insecureSkipVerify || safeBase64Decode(insecureSkipVerify) === 'false';
 
   if (trimmedUrl === '') {
@@ -44,7 +41,7 @@ export const validateVCenterURL = (url: string, secret?: IoK8sApiCoreV1Secret):
     if (isValidIpAddress) {
       return {
         type: 'warning',
-        msg: 'The URL is not a fully qualified domain name (FQDN). If the certificate does not match the URL, the connection might fail.',
+        msg: 'The URL is not a fully qualified domain name (FQDN). If the certificate is not skipped and does not match the URL, the connection might fail.',
       };
     }
   }

packages/forklift-console-plugin/src/modules/Providers/utils/validators/provider/vsphere/vsphereProviderValidator.ts

@@ -24,7 +24,9 @@ export function vsphereProviderValidator(
   }
 
   if (
-    subType === 'vcenter' ? validateVCenterURL(url, secret).type === 'error' : !validateURL(url)
+    subType === 'vcenter'
+      ? validateVCenterURL(url, secret?.data?.insecureSkipVerify).type === 'error'
+      : !validateURL(url)
   ) {
     return { type: 'error', msg: 'invalid URL' };
   }

packages/forklift-console-plugin/src/modules/Providers/views/create/components/VCenterProviderCreateForm.tsx

@@ -33,7 +33,7 @@ export const VCenterProviderCreateForm: React.FC<VCenterProviderCreateFormProps>
 
   const initialState = {
     validation: {
-      url: validateVCenterURL(url, secret),
+      url: validateVCenterURL(url, secret?.data?.insecureSkipVerify),
       vddkInitImage: validateVDDKImage(vddkInitImage),
     },
   };
@@ -42,7 +42,10 @@ export const VCenterProviderCreateForm: React.FC<VCenterProviderCreateFormProps>
   useEffect(() => {
     dispatch({
       type: 'SET_FIELD_VALIDATED',
-      payload: { field: 'url', validationState: validateVCenterURL(url, secret) },
+      payload: {
+        field: 'url',
+        validationState: validateVCenterURL(url, secret?.data?.insecureSkipVerify),
+      },
     });
   }, [secret]);
 
@@ -127,7 +130,7 @@ export const VCenterProviderCreateForm: React.FC<VCenterProviderCreateFormProps>
 
       if (id === 'url') {
         // Validate URL - VCenter of ESXi
-        const validationState = validateVCenterURL(trimmedValue, secret);
+        const validationState = validateVCenterURL(trimmedValue, secret?.data?.insecureSkipVerify);
 
         dispatch({ type: 'SET_FIELD_VALIDATED', payload: { field: 'url', validationState } });