From b39d651dbd52b0b38e417652c3386f4f5c1bc65d Mon Sep 17 00:00:00 2001
From: Yaacov Zamir <kobi.zamir@gmail.com>
Date: Mon, 26 Feb 2024 12:29:00 +0200
Subject: [PATCH] Allow to fetch CA from URL for all providers

Signed-off-by: Yaacov Zamir <kobi.zamir@gmail.com>
---
 .../CertificateUpload/CertificateUpload.tsx       |  2 +-
 .../views/create/components/EditProvider.tsx      |  5 ++---
 .../create/components/ProviderCreateForm.tsx      |  5 +++--
 .../CredentialsSection/CredentialsSection.tsx     | 13 ++++++++-----
 .../components/edit/OpenshiftCredentialsEdit.tsx  |  6 ++++--
 .../components/edit/OpenstackCredentialsEdit.tsx  | 15 +++++----------
 .../components/edit/OvirtCredentialsEdit.tsx      |  6 ++++--
 7 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/packages/forklift-console-plugin/src/modules/Providers/utils/components/CertificateUpload/CertificateUpload.tsx b/packages/forklift-console-plugin/src/modules/Providers/utils/components/CertificateUpload/CertificateUpload.tsx
index ee8639bfa..290fae566 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/utils/components/CertificateUpload/CertificateUpload.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/utils/components/CertificateUpload/CertificateUpload.tsx
@@ -53,7 +53,7 @@ export const CertificateUpload: FC<CertificateUploadProps> = ({
             <FlexItem>
               <Button
                 className="forklift-certificate-upload-margin"
-                isDisabled={isDisabled}
+                isDisabled={isDisabled || !url?.trim().startsWith('https://')}
                 variant="secondary"
                 onClick={() =>
                   showModal(
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/EditProvider.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/EditProvider.tsx
index 96f3bd33c..09192df99 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/EditProvider.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/EditProvider.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { ModalHOC } from 'src/modules/Providers/modals';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import {
@@ -55,12 +54,12 @@ export const EditProvider: React.FC<ProvidersCreateFormProps> = ({
       );
     case 'vsphere':
       return (
-        <ModalHOC>
+        <>
           <VSphereProviderCreateForm provider={newProvider} onChange={onNewProviderChange} />
 
           <EditProviderSectionHeading text={t('Provider credentials')} />
           <VSphereCredentialsEdit secret={newSecret} onChange={onNewSecretChange} />
-        </ModalHOC>
+        </>
       );
     case 'ova':
       return (
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx
index ef653aae0..e15dcb114 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx
@@ -1,5 +1,6 @@
 import React, { useReducer } from 'react';
 import { Base64 } from 'js-base64';
+import { ModalHOC } from 'src/modules/Providers/modals';
 import { validateK8sName, ValidationMsg } from 'src/modules/Providers/utils';
 import { SelectableCard } from 'src/modules/Providers/utils/components/Galerry/SelectableCard';
 import { SelectableGallery } from 'src/modules/Providers/utils/components/Galerry/SelectableGallery';
@@ -84,7 +85,7 @@ export const ProvidersCreateForm: React.FC<ProvidersCreateFormProps> = ({
   };
 
   return (
-    <>
+    <ModalHOC>
       <div className="forklift-create-provider-edit-section">
         <EditProviderSectionHeading text={t('Provider details')} />
 
@@ -144,7 +145,7 @@ export const ProvidersCreateForm: React.FC<ProvidersCreateFormProps> = ({
           onNewSecretChange={onNewSecretChange}
         />
       </div>
-    </>
+    </ModalHOC>
   );
 };
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/CredentialsSection.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/CredentialsSection.tsx
index 9a430d876..a86459c0b 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/CredentialsSection.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/CredentialsSection.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { ModalHOC } from 'src/modules/Providers/modals';
 import { ProviderData } from 'src/modules/Providers/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
@@ -40,11 +41,13 @@ export const CredentialsSection: React.FC<CredentialsProps> = (props) => {
   }
 
   return (
-    <CredentialsSection_
-      name={provider?.spec?.secret?.name}
-      namespace={provider?.spec?.secret?.namespace}
-      type={provider?.spec?.type}
-    />
+    <ModalHOC>
+      <CredentialsSection_
+        name={provider?.spec?.secret?.name}
+        namespace={provider?.spec?.secret?.namespace}
+        type={provider?.spec?.type}
+      />
+    </ModalHOC>
   );
 };
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx
index 99cac5153..87b8927ce 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx
@@ -1,12 +1,12 @@
 import React, { useCallback, useReducer } from 'react';
 import { Base64 } from 'js-base64';
 import { openshiftSecretFieldValidator, safeBase64Decode } from 'src/modules/Providers/utils';
+import { CertificateUpload } from 'src/modules/Providers/utils/components/CertificateUpload';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   Button,
   Divider,
-  FileUpload,
   Form,
   FormGroup,
   Popover,
@@ -22,6 +22,7 @@ import { EditComponentProps } from '../BaseCredentialsSection';
 export const OpenshiftCredentialsEdit: React.FC<EditComponentProps> = ({ secret, onChange }) => {
   const { t } = useForkliftTranslation();
 
+  const url = safeBase64Decode(secret?.data?.url || '');
   const token = safeBase64Decode(secret?.data?.token || '');
   const insecureSkipVerify = safeBase64Decode(secret?.data?.insecureSkipVerify || '') === 'true';
   const cacert = safeBase64Decode(secret?.data?.cacert || '');
@@ -190,7 +191,7 @@ export const OpenshiftCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
         helperTextInvalid={state.validation.cacert.msg}
         validated={state.validation.cacert.type}
       >
-        <FileUpload
+        <CertificateUpload
           id="cacert"
           type="text"
           filenamePlaceholder="Drag and drop a file or upload one"
@@ -200,6 +201,7 @@ export const OpenshiftCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
           onTextChange={(value) => handleChange('cacert', value)}
           onClearClick={() => handleChange('cacert', '')}
           browseButtonText="Upload"
+          url={url}
           isDisabled={insecureSkipVerify}
         />
       </FormGroup>
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx
index 77ab2a8ea..ed42e1144 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx
@@ -1,17 +1,10 @@
 import React, { useCallback, useReducer } from 'react';
 import { Base64 } from 'js-base64';
 import { openstackSecretFieldValidator, safeBase64Decode } from 'src/modules/Providers/utils';
+import { CertificateUpload } from 'src/modules/Providers/utils/components/CertificateUpload';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
-import {
-  Divider,
-  FileUpload,
-  Form,
-  FormGroup,
-  Popover,
-  Radio,
-  Switch,
-} from '@patternfly/react-core';
+import { Divider, Form, FormGroup, Popover, Radio, Switch } from '@patternfly/react-core';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 
 import { EditComponentProps } from '../BaseCredentialsSection';
@@ -50,6 +43,7 @@ export const OpenstackCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
     </ForkliftTrans>
   );
 
+  const url = safeBase64Decode(secret?.data?.url || '');
   const authType = safeBase64Decode(secret?.data?.authType || '');
   const username = safeBase64Decode(secret?.data?.username || '');
   const insecureSkipVerify = safeBase64Decode(secret?.data?.insecureSkipVerify || '') === 'true';
@@ -288,7 +282,7 @@ export const OpenstackCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
         validated={state.validation.cacert}
         helperTextInvalid={cacertHelperTextMsgs.error}
       >
-        <FileUpload
+        <CertificateUpload
           id="cacert"
           type="text"
           filenamePlaceholder="Drag and drop a file or upload one"
@@ -298,6 +292,7 @@ export const OpenstackCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
           onTextChange={(value) => handleChange('cacert', value)}
           onClearClick={() => handleChange('cacert', '')}
           browseButtonText="Upload"
+          url={url}
           isDisabled={insecureSkipVerify}
         />
       </FormGroup>
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx
index 7c8bfc8f6..a33b100ba 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx
@@ -1,12 +1,12 @@
 import React, { useCallback, useReducer } from 'react';
 import { Base64 } from 'js-base64';
 import { ovirtSecretFieldValidator, safeBase64Decode } from 'src/modules/Providers/utils';
+import { CertificateUpload } from 'src/modules/Providers/utils/components/CertificateUpload';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   Button,
   Divider,
-  FileUpload,
   Form,
   FormGroup,
   Popover,
@@ -23,6 +23,7 @@ export const OvirtCredentialsEdit: React.FC<EditComponentProps> = ({ secret, onC
   const { t } = useForkliftTranslation();
 
   const user = safeBase64Decode(secret?.data?.user || '');
+  const url = safeBase64Decode(secret?.data?.url || '');
   const password = safeBase64Decode(secret?.data?.password || '');
   const insecureSkipVerify = safeBase64Decode(secret?.data?.insecureSkipVerify || '') === 'true';
   const cacert = safeBase64Decode(secret?.data?.cacert || '');
@@ -216,7 +217,7 @@ export const OvirtCredentialsEdit: React.FC<EditComponentProps> = ({ secret, onC
         helperTextInvalid={state.validation.cacert.msg}
         validated={state.validation.cacert.type}
       >
-        <FileUpload
+        <CertificateUpload
           id="cacert"
           type="text"
           filenamePlaceholder="Drag and drop a file or upload one"
@@ -226,6 +227,7 @@ export const OvirtCredentialsEdit: React.FC<EditComponentProps> = ({ secret, onC
           onTextChange={(value) => handleChange('cacert', value)}
           onClearClick={() => handleChange('cacert', '')}
           browseButtonText="Upload"
+          url={url}
           isDisabled={insecureSkipVerify}
         />
       </FormGroup>