Skip to content

Commit d852ec2

Browse files
authored
[8.x] [Cloud Security] Fixing FTR test for agentless default remove Beta badge from CSPM Agentless (elastic#208314) (elastic#208656)
# Backport This will backport the following commits from `main` to `8.x`: - [[Cloud Security] Fixing FTR test for agentless default remove Beta badge from CSPM Agentless (elastic#208314)](elastic#208314) <!--- Backport version: 9.6.4 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"seanrathier","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-28T22:09:13Z","message":"[Cloud Security] Fixing FTR test for agentless default remove Beta badge from CSPM Agentless (elastic#208314)","sha":"71566f38dcb4d27b35986e7dfb0171b86c005843","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","Team:Cloud Security","backport:prev-minor"],"title":"[Cloud Security] Fixing FTR test for agentless default remove Beta badge from CSPM Agentless","number":208314,"url":"https://github.com/elastic/kibana/pull/208314","mergeCommit":{"message":"[Cloud Security] Fixing FTR test for agentless default remove Beta badge from CSPM Agentless (elastic#208314)","sha":"71566f38dcb4d27b35986e7dfb0171b86c005843"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/208314","number":208314,"mergeCommit":{"message":"[Cloud Security] Fixing FTR test for agentless default remove Beta badge from CSPM Agentless (elastic#208314)","sha":"71566f38dcb4d27b35986e7dfb0171b86c005843"}}]}] BACKPORT-->
1 parent fd8de9d commit d852ec2

File tree

5 files changed

+15
-58
lines changed

5 files changed

+15
-58
lines changed

x-pack/platform/plugins/private/translations/translations/fr-FR.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14872,8 +14872,6 @@
1487214872
"xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDescription": "Configurer l'intégration sans agent",
1487314873
"xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDisplay": "Sans agent",
1487414874
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay": "Sans agent",
14875-
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.label": "Bêta",
14876-
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.tooltip": "Cette fonctionnalité est en version d'évaluation technique et pourra être modifiée dans une future version. Nous vous remercions de bien vouloir nous aider en nous signalant tout bug.",
1487714875
"xpack.csp.fleetIntegration.setupTechnology.setupTechnologyLabel": "Technologie de configuration",
1487814876
"xpack.csp.fleetIntegration.setupTechnology.setupTechnologyPlaceholder": "Sélectionner la technologie de configuration",
1487914877
"xpack.csp.flyout.moreActionsButton": "Plus d'actions",

x-pack/platform/plugins/private/translations/translations/ja-JP.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14737,8 +14737,6 @@
1473714737
"xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDescription": "エージェントなしで統合を設定",
1473814738
"xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDisplay": "エージェントレス",
1473914739
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay": "エージェントレス",
14740-
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.label": "ベータ",
14741-
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.tooltip": "この機能はテクニカルプレビュー中であり、将来のリリースでは変更される場合があります。不具合が発生したら報告してください。",
1474214740
"xpack.csp.fleetIntegration.setupTechnology.setupTechnologyLabel": "セットアップ技術",
1474314741
"xpack.csp.fleetIntegration.setupTechnology.setupTechnologyPlaceholder": "セットアップ技術を選択",
1474414742
"xpack.csp.flyout.moreActionsButton": "さらにアクションを表示",

x-pack/platform/plugins/private/translations/translations/zh-CN.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14805,8 +14805,6 @@
1480514805
"xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDescription": "不使用代理设置集成",
1480614806
"xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDisplay": "无代理",
1480714807
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay": "无代理",
14808-
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.label": "公测版",
14809-
"xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.tooltip": "此功能处于技术预览状态,在未来版本中可能会发生更改。请通过报告错误来帮助我们。",
1481014808
"xpack.csp.fleetIntegration.setupTechnology.setupTechnologyLabel": "设置技术",
1481114809
"xpack.csp.fleetIntegration.setupTechnology.setupTechnologyPlaceholder": "选择设置技术",
1481214810
"xpack.csp.flyout.moreActionsButton": "更多操作",

x-pack/solutions/security/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/setup_technology_selector.tsx

Lines changed: 12 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,14 @@ import React from 'react';
99

1010
import { SetupTechnology } from '@kbn/fleet-plugin/public';
1111
import { FormattedMessage } from '@kbn/i18n-react';
12-
import { i18n } from '@kbn/i18n';
1312
import {
14-
EuiBetaBadge,
1513
EuiAccordion,
1614
EuiFormRow,
1715
EuiLink,
1816
EuiSpacer,
1917
EuiSuperSelect,
2018
EuiText,
2119
useGeneratedHtmlId,
22-
EuiFlexItem,
23-
EuiFlexGroup,
24-
useEuiTheme,
2520
} from '@elastic/eui';
2621
import {
2722
SETUP_TECHNOLOGY_SELECTOR_ACCORDION_TEST_SUBJ,
@@ -37,47 +32,6 @@ export const SetupTechnologySelector = ({
3732
setupTechnology: SetupTechnology;
3833
onSetupTechnologyChange: (value: SetupTechnology) => void;
3934
}) => {
40-
const { euiTheme } = useEuiTheme();
41-
const agentlessOptionBadge = (isDropDownDisplay: boolean) => {
42-
const title = isDropDownDisplay ? (
43-
<strong>
44-
<FormattedMessage
45-
id="xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDisplay"
46-
defaultMessage="Agentless"
47-
/>
48-
</strong>
49-
) : (
50-
<FormattedMessage
51-
id="xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay"
52-
defaultMessage="Agentless"
53-
/>
54-
);
55-
return (
56-
<EuiFlexGroup alignItems="center" responsive={false}>
57-
<EuiFlexItem grow={false}>{title}</EuiFlexItem>
58-
<EuiFlexItem css={{ paddingTop: !isDropDownDisplay ? euiTheme.size.xs : undefined }}>
59-
<EuiBetaBadge
60-
label={i18n.translate(
61-
'xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.label',
62-
{
63-
defaultMessage: 'Beta',
64-
}
65-
)}
66-
size="m"
67-
color="hollow"
68-
tooltipContent={i18n.translate(
69-
'xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay.techPreviewBadge.tooltip',
70-
{
71-
defaultMessage:
72-
'This functionality is in technical preview and may be changed in a future release. Please help us by reporting any bugs.',
73-
}
74-
)}
75-
/>
76-
</EuiFlexItem>
77-
</EuiFlexGroup>
78-
);
79-
};
80-
8135
const options = [
8236
{
8337
value: SetupTechnology.AGENT_BASED,
@@ -109,11 +63,21 @@ export const SetupTechnologySelector = ({
10963
},
11064
{
11165
value: SetupTechnology.AGENTLESS,
112-
inputDisplay: agentlessOptionBadge(false),
66+
inputDisplay: (
67+
<FormattedMessage
68+
id="xpack.csp.fleetIntegration.setupTechnology.agentlessInputDisplay"
69+
defaultMessage="Agentless"
70+
/>
71+
),
11372
'data-test-subj': 'setup-technology-agentless-option',
11473
dropdownDisplay: (
11574
<>
116-
{agentlessOptionBadge(true)}
75+
<strong>
76+
<FormattedMessage
77+
id="xpack.csp.fleetIntegration.setupTechnology.agentlessDrowpownDisplay"
78+
defaultMessage="Agentless"
79+
/>
80+
</strong>
11781
<EuiText size="s" color="subdued">
11882
<p>
11983
<FormattedMessage

x-pack/test/cloud_security_posture_functional/agentless/security_posture.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
import expect from '@kbn/expect';
9-
import type { FtrProviderContext } from '../ftr_provider_context';
109
import { AGENTLESS_SECURITY_POSTURE_PACKAGE_VERSION } from '../constants';
10+
import type { FtrProviderContext } from '../ftr_provider_context';
1111
// eslint-disable-next-line import/no-default-export
1212
export default function ({ getPageObjects, getService }: FtrProviderContext) {
1313
const testSubjects = getService('testSubjects');
@@ -68,8 +68,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
6868
expect(hasAgentBased).to.be(true);
6969
});
7070

71-
it(`should show cspm with agentless option`, async () => {
72-
// const integrationPolicyName = `cloud_security_posture-${new Date().toISOString()}`;
71+
it.skip(`should show cspm with agentless option`, async () => {
7372
await cisIntegration.navigateToAddIntegrationWithVersionPage(
7473
AGENTLESS_SECURITY_POSTURE_PACKAGE_VERSION
7574
);
@@ -81,7 +80,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
8180
const hasAgentBased = await testSubjects.exists(POLICY_NAME_FIELD);
8281

8382
expect(hasSetupTechnologySelector).to.be(true);
84-
expect(hasAgentBased).to.be(true);
83+
expect(hasAgentBased).to.be(false);
8584
});
8685
});
8786
}

0 commit comments

Comments
 (0)