From f528de30aef86a2f57eac48cf6dd9fd048aa814c Mon Sep 17 00:00:00 2001
From: yzamir <kobi.zamir@gmail.com>
Date: Wed, 20 Sep 2023 10:39:43 +0300
Subject: [PATCH] Add project and reagion as required fields to all openstack
 authentications

Signed-off-by: yzamir <kobi.zamir@gmail.com>
---
 .../secret/openstackSecretValidator.ts        | 22 ++++++++--
 ...ionCredentialNameSecretFieldsFormGroup.tsx | 42 +++++++++++++++++++
 .../ApplicationWithCredentialsIDFormGroup.tsx | 42 +++++++++++++++++++
 .../TokenWithUserIDSecretFieldsFormGroup.tsx  | 23 ++++++++++
 ...TokenWithUsernameSecretFieldsFormGroup.tsx | 24 +++++++++++
 5 files changed, 150 insertions(+), 3 deletions(-)

diff --git a/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret/openstackSecretValidator.ts b/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret/openstackSecretValidator.ts
index 573a17413..d344f08a2 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret/openstackSecretValidator.ts
+++ b/packages/forklift-console-plugin/src/modules/Providers/utils/validators/secret/openstackSecretValidator.ts
@@ -35,8 +35,15 @@ export function openstackSecretValidator(secret: V1Secret) {
           'insecureSkipVerify',
         ];
       } else {
-        requiredFields = ['token', 'userID', 'projectID'];
-        validateFields = ['token', 'userID', 'projectID', 'cacert', 'insecureSkipVerify'];
+        requiredFields = ['token', 'userID', 'projectID', 'domainName'];
+        validateFields = [
+          'token',
+          'userID',
+          'projectID',
+          'domainName',
+          'cacert',
+          'insecureSkipVerify',
+        ];
       }
       break;
     case 'applicationcredential':
@@ -45,23 +52,32 @@ export function openstackSecretValidator(secret: V1Secret) {
           'applicationCredentialName',
           'applicationCredentialSecret',
           'username',
+          'projectName',
           'domainName',
         ];
         validateFields = [
           'applicationCredentialName',
           'applicationCredentialSecret',
           'username',
+          'projectName',
           'domainName',
           'cacert',
           'insecureSkipVerify',
         ];
       } else {
-        requiredFields = ['applicationCredentialID', 'applicationCredentialSecret'];
+        requiredFields = [
+          'applicationCredentialID',
+          'applicationCredentialSecret',
+          'projectName',
+          'domainName',
+        ];
         validateFields = [
           'applicationCredentialID',
           'applicationCredentialSecret',
           'cacert',
           'insecureSkipVerify',
+          'projectName',
+          'domainName',
         ];
       }
       break;
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx
index 20def945c..5f50481cb 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationCredentialNameSecretFieldsFormGroup.tsx
@@ -25,6 +25,8 @@ export const ApplicationCredentialNameSecretFieldsFormGroup: React.FC<EditCompon
   );
   const username = safeBase64Decode(secret?.data?.username || '');
   const domainName = safeBase64Decode(secret?.data?.domainName || '');
+  const regionName = safeBase64Decode(secret?.data?.regionName || '');
+  const projectName = safeBase64Decode(secret?.data?.projectName || '');
 
   const initialState = {
     passwordHidden: true,
@@ -33,6 +35,8 @@ export const ApplicationCredentialNameSecretFieldsFormGroup: React.FC<EditCompon
       applicationCredentialSecret: 'default' as Validation,
       username: 'default' as Validation,
       domainName: 'default' as Validation,
+      regionName: 'default' as Validation,
+      projectName: 'default' as Validation,
     },
   };
 
@@ -138,6 +142,44 @@ export const ApplicationCredentialNameSecretFieldsFormGroup: React.FC<EditCompon
         />
       </FormGroup>
 
+      <FormGroup
+        label={t('Region')}
+        isRequired
+        fieldId="regionName"
+        helperText={t('OpenStack region for password credentials.')}
+        helperTextInvalid={t('Invalid region name.')}
+        validated={state.validation.regionName}
+      >
+        <TextInput
+          isRequired
+          type="text"
+          id="regionName"
+          name="regionName"
+          value={regionName}
+          onChange={(value) => handleChange('regionName', value)}
+          validated={state.validation.regionName}
+        />
+      </FormGroup>
+
+      <FormGroup
+        label={t('Project')}
+        isRequired
+        fieldId="projectName"
+        helperText={t('OpenStack project for password credentials.')}
+        helperTextInvalid={t('Invalid project name.')}
+        validated={state.validation.projectName}
+      >
+        <TextInput
+          isRequired
+          type="text"
+          id="projectName"
+          name="projectName"
+          value={projectName}
+          onChange={(value) => handleChange('projectName', value)}
+          validated={state.validation.projectName}
+        />
+      </FormGroup>
+
       <FormGroup
         label={t('Domain')}
         isRequired
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx
index a58d99f55..31a0ac194 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/ApplicationWithCredentialsIDFormGroup.tsx
@@ -23,12 +23,16 @@ export const ApplicationWithCredentialsIDFormGroup: React.FC<EditComponentProps>
   const applicationCredentialSecret = safeBase64Decode(
     secret?.data?.applicationCredentialSecret || '',
   );
+  const regionName = safeBase64Decode(secret?.data?.regionName || '');
+  const projectName = safeBase64Decode(secret?.data?.projectName || '');
 
   const initialState = {
     passwordHidden: true,
     validation: {
       applicationCredentialID: 'default' as Validation,
       applicationCredentialSecret: 'default' as Validation,
+      regionName: 'default' as Validation,
+      projectName: 'default' as Validation,
     },
   };
 
@@ -114,6 +118,44 @@ export const ApplicationWithCredentialsIDFormGroup: React.FC<EditComponentProps>
           {state.passwordHidden ? <EyeIcon /> : <EyeSlashIcon />}
         </Button>
       </FormGroup>
+
+      <FormGroup
+        label={t('Region')}
+        isRequired
+        fieldId="regionName"
+        helperText={t('OpenStack region for password credentials.')}
+        helperTextInvalid={t('Invalid region name.')}
+        validated={state.validation.regionName}
+      >
+        <TextInput
+          isRequired
+          type="text"
+          id="regionName"
+          name="regionName"
+          value={regionName}
+          onChange={(value) => handleChange('regionName', value)}
+          validated={state.validation.regionName}
+        />
+      </FormGroup>
+
+      <FormGroup
+        label={t('Project')}
+        isRequired
+        fieldId="projectName"
+        helperText={t('OpenStack project for password credentials.')}
+        helperTextInvalid={t('Invalid project name.')}
+        validated={state.validation.projectName}
+      >
+        <TextInput
+          isRequired
+          type="text"
+          id="projectName"
+          name="projectName"
+          value={projectName}
+          onChange={(value) => handleChange('projectName', value)}
+          validated={state.validation.projectName}
+        />
+      </FormGroup>
     </>
   );
 };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUserIDSecretFieldsFormGroup.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUserIDSecretFieldsFormGroup.tsx
index 112d3dbf9..fd9d0e93a 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUserIDSecretFieldsFormGroup.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUserIDSecretFieldsFormGroup.tsx
@@ -22,6 +22,7 @@ export const TokenWithUserIDSecretFieldsFormGroup: React.FC<EditComponentProps>
   const token = safeBase64Decode(secret?.data?.token || '');
   const userID = safeBase64Decode(secret?.data?.userID || '');
   const projectID = safeBase64Decode(secret?.data?.projectID || '');
+  const regionName = safeBase64Decode(secret?.data?.regionName || '');
 
   const initialState = {
     passwordHidden: true,
@@ -29,6 +30,7 @@ export const TokenWithUserIDSecretFieldsFormGroup: React.FC<EditComponentProps>
       token: 'default' as Validation,
       userID: 'default' as Validation,
       projectID: 'default' as Validation,
+      regionName: 'default' as Validation,
     },
   };
 
@@ -94,6 +96,7 @@ export const TokenWithUserIDSecretFieldsFormGroup: React.FC<EditComponentProps>
           {state.passwordHidden ? <EyeIcon /> : <EyeSlashIcon />}
         </Button>
       </FormGroup>
+
       <FormGroup
         label={t('User ID')}
         isRequired
@@ -112,6 +115,26 @@ export const TokenWithUserIDSecretFieldsFormGroup: React.FC<EditComponentProps>
           validated={state.validation.userID}
         />
       </FormGroup>
+
+      <FormGroup
+        label={t('Region')}
+        isRequired
+        fieldId="regionName"
+        helperText={t('OpenStack region for password credentials.')}
+        helperTextInvalid={t('Invalid region name.')}
+        validated={state.validation.regionName}
+      >
+        <TextInput
+          isRequired
+          type="text"
+          id="regionName"
+          name="regionName"
+          value={regionName}
+          onChange={(value) => handleChange('regionName', value)}
+          validated={state.validation.regionName}
+        />
+      </FormGroup>
+
       <FormGroup
         label={t('Project ID')}
         isRequired
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUsernameSecretFieldsFormGroup.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUsernameSecretFieldsFormGroup.tsx
index 0ea178d44..602ca9cc8 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUsernameSecretFieldsFormGroup.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEditFormGroups/TokenWithUsernameSecretFieldsFormGroup.tsx
@@ -22,6 +22,7 @@ export const TokenWithUsernameSecretFieldsFormGroup: React.FC<EditComponentProps
   const token = safeBase64Decode(secret?.data?.token || '');
   const username = safeBase64Decode(secret?.data?.username || '');
   const projectName = safeBase64Decode(secret?.data?.projectName || '');
+  const regionName = safeBase64Decode(secret?.data?.regionName || '');
   const domainName = safeBase64Decode(secret?.data?.domainName || '');
 
   const initialState = {
@@ -30,6 +31,7 @@ export const TokenWithUsernameSecretFieldsFormGroup: React.FC<EditComponentProps
       token: 'default' as Validation,
       username: 'default' as Validation,
       projectName: 'default' as Validation,
+      regionName: 'default' as Validation,
       domainName: 'default' as Validation,
     },
   };
@@ -96,6 +98,7 @@ export const TokenWithUsernameSecretFieldsFormGroup: React.FC<EditComponentProps
           {state.passwordHidden ? <EyeIcon /> : <EyeSlashIcon />}
         </Button>
       </FormGroup>
+
       <FormGroup
         label={t('Username')}
         isRequired
@@ -114,6 +117,26 @@ export const TokenWithUsernameSecretFieldsFormGroup: React.FC<EditComponentProps
           validated={state.validation.username}
         />
       </FormGroup>
+
+      <FormGroup
+        label={t('Region')}
+        isRequired
+        fieldId="regionName"
+        helperText={t('OpenStack region for password credentials.')}
+        helperTextInvalid={t('Invalid region name.')}
+        validated={state.validation.regionName}
+      >
+        <TextInput
+          isRequired
+          type="text"
+          id="regionName"
+          name="regionName"
+          value={regionName}
+          onChange={(value) => handleChange('regionName', value)}
+          validated={state.validation.regionName}
+        />
+      </FormGroup>
+
       <FormGroup
         label={t('Project')}
         isRequired
@@ -132,6 +155,7 @@ export const TokenWithUsernameSecretFieldsFormGroup: React.FC<EditComponentProps
           validated={state.validation.projectName}
         />
       </FormGroup>
+
       <FormGroup
         label={t('Domain name')}
         isRequired