From 79d7d05fd8604ddd6970f66545c9b748b914900d Mon Sep 17 00:00:00 2001
From: Jordan <51442161+JordanSh@users.noreply.github.com>
Date: Thu, 19 Oct 2023 23:30:48 +0300
Subject: [PATCH] [Cloud Security] Enable credential fields in integration edit
 (#169365)

(cherry picked from commit 44f3910763996da35cb9a22ce8042da309319d91)
---
 .../aws_credentials_form/aws_credentials_form.tsx        | 9 ---------
 .../components/fleet_extensions/gcp_credential_form.tsx  | 3 ---
 .../components/fleet_extensions/policy_template_form.tsx | 4 ++--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
index 5c12396942d77..4be4ac082f60f 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
@@ -255,7 +255,6 @@ export const AwsCredentialsForm = ({
       {setupFormat === 'manual' && (
         <>
           <AwsCredentialTypeSelector
-            disabled={disabled}
             type={awsCredentialsType}
             onChange={(optionId) => {
               updatePolicy(
@@ -271,7 +270,6 @@ export const AwsCredentialsForm = ({
           <ReadDocumentation url={integrationLink} />
           <EuiSpacer size="l" />
           <AwsInputVarFields
-            disabled={disabled}
             fields={fields}
             onChange={(key, value) => {
               updatePolicy(getPosturePolicy(newPolicy, input.type, { [key]: { value } }));
@@ -286,11 +284,9 @@ export const AwsCredentialsForm = ({
 const AwsCredentialTypeSelector = ({
   type,
   onChange,
-  disabled,
 }: {
   onChange(type: AwsCredentialsType): void;
   type: AwsCredentialsType;
-  disabled: boolean;
 }) => (
   <EuiFormRow
     fullWidth
@@ -299,7 +295,6 @@ const AwsCredentialTypeSelector = ({
     })}
   >
     <EuiSelect
-      disabled={disabled}
       fullWidth
       options={getAwsCredentialsFormManualOptions()}
       value={type}
@@ -313,11 +308,9 @@ const AwsCredentialTypeSelector = ({
 const AwsInputVarFields = ({
   fields,
   onChange,
-  disabled,
 }: {
   fields: Array<AwsOptions[keyof AwsOptions]['fields'][number] & { value: string; id: string }>;
   onChange: (key: string, value: string) => void;
-  disabled: boolean;
 }) => (
   <div>
     {fields.map((field) => (
@@ -325,7 +318,6 @@ const AwsInputVarFields = ({
         <>
           {field.type === 'password' && (
             <EuiFieldPassword
-              disabled={disabled}
               id={field.id}
               type="dual"
               fullWidth
@@ -335,7 +327,6 @@ const AwsInputVarFields = ({
           )}
           {field.type === 'text' && (
             <EuiFieldText
-              disabled={disabled}
               id={field.id}
               fullWidth
               value={field.value || ''}
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
index b7c82d344c9c0..d1f5209e87080 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
@@ -543,7 +543,6 @@ const GcpInputVarFields = ({
         {credentialsTypeFields && credentialFilesFields && credentialJSONFields && (
           <EuiFormRow fullWidth label={gcpField.fields['gcp.credentials.type'].label}>
             <EuiSelect
-              disabled={disabled}
               data-test-subj={CIS_GCP_INPUT_FIELDS_TEST_SUBJECTS.CREDENTIALS_TYPE}
               fullWidth
               options={credentialOptionsList}
@@ -557,7 +556,6 @@ const GcpInputVarFields = ({
         {credentialsTypeValue === credentialFieldValue && credentialFilesFields && (
           <EuiFormRow fullWidth label={gcpField.fields['gcp.credentials.file'].label}>
             <EuiFieldText
-              disabled={disabled}
               data-test-subj={CIS_GCP_INPUT_FIELDS_TEST_SUBJECTS.CREDENTIALS_FILE}
               id={credentialFilesFields.id}
               fullWidth
@@ -569,7 +567,6 @@ const GcpInputVarFields = ({
         {credentialsTypeValue === credentialJSONValue && credentialJSONFields && (
           <EuiFormRow fullWidth label={gcpField.fields['gcp.credentials.json'].label}>
             <EuiTextArea
-              disabled={disabled}
               data-test-subj={CIS_GCP_INPUT_FIELDS_TEST_SUBJECTS.CREDENTIALS_JSON}
               id={credentialJSONFields.id}
               fullWidth
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
index 9d1c52a0c1ee3..e6e3f0b116c1e 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
@@ -642,7 +642,7 @@ export const CspPolicyTemplateForm = memo<PackagePolicyReplaceDefineStepExtensio
           <>
             <EuiCallOut
               title={i18n.translate('xpack.csp.fleetIntegration.editWarning.calloutTitle', {
-                defaultMessage: 'Agent Installation Required for Changes',
+                defaultMessage: 'Modifying Integration Details',
               })}
               color="warning"
               iconType="warning"
@@ -650,7 +650,7 @@ export const CspPolicyTemplateForm = memo<PackagePolicyReplaceDefineStepExtensio
               <p>
                 <FormattedMessage
                   id="xpack.csp.fleetIntegration.editWarning.calloutDescription"
-                  defaultMessage="In order to change the cloud service provider (CSP) you want to monitor, add more accounts or change where CSPM is deployed (Organization vs Single Account), please install a new CSPM integration."
+                  defaultMessage="In order to change the cloud service provider (CSP) you want to monitor, add more accounts, or change where CSPM is deployed (Organization vs Single Account), please add a new CSPM integration."
                 />
               </p>
             </EuiCallOut>