github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.11] [Cloud Security] Enable credential fields in integration edit (#169365) (#169451)

Browse source 
# Backport

This will backport the following commits from `main` to `8.11`:
- [[Cloud Security] Enable credential fields in integration edit
(#169365)](https://github.com/elastic/kibana/pull/169365)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Jordan","email":"51442161+JordanSh@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-10-19T20:30:48Z","message":"[Cloud
Security] Enable credential fields in integration edit
(#169365)","sha":"44f3910763996da35cb9a22ce8042da309319d91","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Cloud
Security","v8.11.0","v8.12.0"],"number":169365,"url":"https://github.com/elastic/kibana/pull/169365","mergeCommit":{"message":"[Cloud
Security] Enable credential fields in integration edit
(#169365)","sha":"44f3910763996da35cb9a22ce8042da309319d91"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"8.11","label":"v8.11.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/169365","number":169365,"mergeCommit":{"message":"[Cloud
Security] Enable credential fields in integration edit
(#169365)","sha":"44f3910763996da35cb9a22ce8042da309319d91"}}]}]
BACKPORT-->

Co-authored-by: Jordan <51442161+JordanSh@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2023-10-19 17:49:41 -04:00 • committed by GitHub
parent 05769d55c7
commit 107eab4e13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
View file

@ -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 || ''}

3
x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
View file

@ -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

4
x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
View file

@ -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>