[Cloud Security]Added Beta tag + improvements for CIS GCP (#163663)

## Summary - Added Beta tag for GCP option on CSPM - Fix a bug where setup_access is stuck on google_cloud_shell ( This bug occur when user clicks on Manual option, click the start of Project ID name, and then click google cloud shell option again) - Added unit test for getCspmCloudShellDefaultValue to help with refactor later <img width="950" alt="Screenshot 2023-08-10 at 2 02 46 PM" src="https://github.com/elastic/kibana/assets/8703149/ccd45ed1-8b6c-4631-8a01-22d35d1b62aa">
elastic · Aug 11, 2023 · 349972c · 349972c
1 parent 3762df1
commit 349972c
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 5 deletions.
diff --git a/x-pack/plugins/cloud_security_posture/public/common/constants.ts b/x-pack/plugins/cloud_security_posture/public/common/constants.ts
@@ -59,6 +59,7 @@ export interface CloudPostureIntegrationProps {
     disabled?: boolean;
     icon?: string;
     tooltip?: string;
+    isBeta?: boolean;
   }>;
 }
 
@@ -91,6 +92,7 @@ export const cloudPostureIntegrations: CloudPostureIntegrations = {
           defaultMessage: 'CIS GCP',
         }),
         icon: 'logoGCP',
+        isBeta: true,
       },
       {
         type: CLOUDBEAT_AZURE,

diff --git a/...ugins/cloud_security_posture/public/components/fleet_extensions/csp_boxed_radio_group.tsx b/...ugins/cloud_security_posture/public/components/fleet_extensions/csp_boxed_radio_group.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { useEuiTheme, EuiButton, EuiRadio, EuiToolTip } from '@elastic/eui';
+import { useEuiTheme, EuiButton, EuiRadio, EuiToolTip, EuiBetaBadge } from '@elastic/eui';
 import { css } from '@emotion/react';
 
 export interface CspRadioGroupProps {
@@ -23,6 +23,7 @@ interface CspRadioOption {
   label: string;
   icon?: string;
   tooltip?: string;
+  isBeta?: boolean;
 }
 
 export const RadioGroup = ({
@@ -57,7 +58,7 @@ export const RadioGroup = ({
             content={option.tooltip}
             anchorProps={{
               style: {
-                flexGrow: 1,
+                flex: '1 1 0',
               },
             }}
           >
@@ -105,6 +106,15 @@ export const RadioGroup = ({
                 checked={isChecked}
                 onChange={() => {}}
               />
+              {option.isBeta && (
+                <div
+                  css={css`
+                    margin: auto;
+                  `}
+                >
+                  <EuiBetaBadge label="Beta" alignment="middle" />
+                </div>
+              )}
             </EuiButton>
           </EuiToolTip>
         );

diff --git a/...plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx b/...plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
@@ -335,8 +335,8 @@ export const GcpCredentialsForm = ({
       updatePolicy(
         getPosturePolicy(newPolicy, input.type, {
           setup_access: {
-            // Restoring last manual credentials type or defaulting to the first option
-            value: lastSetupAccessType.current || SETUP_ACCESS_MANUAL,
+            // Restoring last manual credentials type
+            value: SETUP_ACCESS_MANUAL,
             type: 'text',
           },
           // Restoring fields from manual setup format if any

diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.test.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.test.ts
@@ -5,8 +5,14 @@
  * 2.0.
  */
 
-import { getMaxPackageName, getPostureInputHiddenVars, getPosturePolicy } from './utils';
+import {
+  getMaxPackageName,
+  getPostureInputHiddenVars,
+  getPosturePolicy,
+  getCspmCloudShellDefaultValue,
+} from './utils';
 import { getMockPolicyAWS, getMockPolicyK8s, getMockPolicyEKS } from './mocks';
+import type { PackageInfo } from '@kbn/fleet-plugin/common';
 
 describe('getPosturePolicy', () => {
   for (const [name, getPolicy, expectedVars] of [
@@ -123,3 +129,126 @@ describe('getMaxPackageName', () => {
     expect(result).toBe('kspm-1');
   });
 });
+
+describe('getCspmCloudShellDefaultValue', () => {
+  it('should return empty string when policy_templates is missing', () => {
+    const packagePolicy = { name: 'test' } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('');
+  });
+
+  it('should return empty string when policy_templates.name is not cspm', () => {
+    const packagePolicy = { name: 'test', policy_templates: [{ name: 'kspm' }] } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('');
+  });
+
+  it('should return empty string when policy_templates.inputs is missing', () => {
+    const packagePolicy = { name: 'test', policy_templates: [{ name: 'cspm' }] } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('');
+  });
+
+  it('should return empty string when policy_templates.inputs is empty', () => {
+    const packagePolicy = {
+      name: 'test',
+      policy_templates: [
+        {
+          title: '',
+          description: '',
+          name: 'cspm',
+          inputs: [{}],
+        },
+      ],
+    } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('');
+  });
+
+  it('should return empty string when policy_templates.inputs is undefined', () => {
+    const packagePolicy = {
+      name: 'test',
+      policy_templates: [
+        {
+          title: '',
+          description: '',
+          name: 'cspm',
+          inputs: undefined,
+        },
+      ],
+    } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('');
+  });
+
+  it('should return empty string when policy_templates.inputs.vars does not have cloud_shell_url', () => {
+    const packagePolicy = {
+      name: 'test',
+      policy_templates: [
+        {
+          title: '',
+          description: '',
+          name: 'cspm',
+          inputs: [{ vars: [{ name: 'cloud_shell_url_FAKE' }] }],
+        },
+      ],
+    } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('');
+  });
+
+  it('should return empty string when policy_templates.inputs.varshave cloud_shell_url but no default', () => {
+    const packagePolicy = {
+      name: 'test',
+      policy_templates: [
+        {
+          title: '',
+          description: '',
+          name: 'cspm',
+          inputs: [{ vars: [{ name: 'cloud_shell_url' }] }],
+        },
+      ],
+    } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('');
+  });
+
+  it('should cloud shell url when policy_templates.inputs.vars have cloud_shell_url', () => {
+    const packagePolicy = {
+      name: 'test',
+      policy_templates: [
+        {
+          title: '',
+          description: '',
+          name: 'cspm',
+          inputs: [
+            {
+              vars: [
+                { name: 'cloud_shell_url_FAKE', default: 'URL_FAKE' },
+                { name: 'cloud_shell_url', default: 'URL' },
+              ],
+            },
+          ],
+        },
+      ],
+    } as PackageInfo;
+
+    const result = getCspmCloudShellDefaultValue(packagePolicy);
+
+    expect(result).toBe('URL');
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts
@@ -207,6 +207,7 @@ export const getPolicyTemplateInputOptions = (policyTemplate: CloudSecurityPolic
     label: o.name,
     icon: o.icon,
     disabled: o.disabled,
+    isBeta: o.isBeta,
   }));
 
 export const getMaxPackageName = (