-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into asset-client_inventory-ready
- Loading branch information
Showing
9 changed files
with
246 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
x-pack/plugins/fleet/server/saved_objects/migrations/cloud_security_posture/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| export { migrateCspPackagePolicyToV8110 } from './to_v8_11_0'; |
125 changes: 125 additions & 0 deletions
125
...k/plugins/fleet/server/saved_objects/migrations/cloud_security_posture/to_v8_11_0.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import type { SavedObjectModelTransformationContext } from '@kbn/core-saved-objects-server'; | ||
|
|
||
| import { migrateCspPackagePolicyToV8110 as migration } from './to_v8_11_0'; | ||
|
|
||
| describe('8.11.0 Cloud Security Posture Package Policy migration', () => { | ||
| const policyDoc = ( | ||
| accountType: string, | ||
| isAccountTypeCorrect: boolean, | ||
| packageName: string | ||
| ): any => { | ||
| return { | ||
| id: 'mock-saved-csp-object-id', | ||
| attributes: { | ||
| name: 'cloud_security_posture_test', | ||
| package: { | ||
| name: packageName, | ||
| title: '', | ||
| version: '', | ||
| }, | ||
| id: 'ID_123', | ||
| policy_id: '', | ||
| enabled: true, | ||
| namespace: '', | ||
| revision: 0, | ||
| updated_at: '', | ||
| updated_by: '', | ||
| created_at: '', | ||
| created_by: '', | ||
| inputs: [ | ||
| { | ||
| type: accountType, | ||
| enabled: true, | ||
| streams: [ | ||
| { | ||
| vars: { | ||
| ...(isAccountTypeCorrect && { | ||
| 'gcp.account_type': { value: 'single-account', type: 'text' }, | ||
| }), | ||
| }, | ||
| }, | ||
| ], | ||
| config: {}, | ||
| }, | ||
| ], | ||
| }, | ||
| type: ' nested', | ||
| }; | ||
| }; | ||
|
|
||
| it('adds gcp.account_type to policy, set to single', () => { | ||
| const initialDoc = policyDoc('cloudbeat/cis_gcp', false, 'cloud_security_posture'); | ||
| const migratedDoc = policyDoc('cloudbeat/cis_gcp', true, 'cloud_security_posture'); | ||
| expect(migration(initialDoc, {} as SavedObjectModelTransformationContext)).toEqual({ | ||
| attributes: migratedDoc.attributes, | ||
| }); | ||
| }); | ||
|
|
||
| it('if there are no type cloudbeat/cis_gcp, do not add gcp.account_type', () => { | ||
| const initialDoc = policyDoc('cloudbeat/cis_aws', false, 'cloud_security_posture'); | ||
| const migratedDoc = policyDoc('cloudbeat/cis_aws', false, 'cloud_security_posture'); | ||
| expect(migration(initialDoc, {} as SavedObjectModelTransformationContext)).toEqual({ | ||
| attributes: migratedDoc.attributes, | ||
| }); | ||
| }); | ||
|
|
||
| it('if there are no cloud_security_posture package, do not change the doc', () => { | ||
| const initialDoc = policyDoc('cloudbeat/cis_gcp', false, 'NOT_cloud_security_posture'); | ||
| const migratedDoc = policyDoc('cloudbeat/cis_gcp', false, 'NOT_cloud_security_posture'); | ||
| expect(migration(initialDoc, {} as SavedObjectModelTransformationContext)).toEqual({ | ||
| attributes: migratedDoc.attributes, | ||
| }); | ||
| }); | ||
|
|
||
| it('if gcp.account_type exist and already has a value, do not set it to single-account', () => { | ||
| const policyDocWithAccountType = (): any => { | ||
| return { | ||
| id: 'mock-saved-csp-object-id', | ||
| attributes: { | ||
| name: 'cloud_security_posture_test', | ||
| package: { | ||
| name: 'cloud_security_posture', | ||
| title: '', | ||
| version: '', | ||
| }, | ||
| id: 'ID_1234', | ||
| policy_id: '', | ||
| enabled: true, | ||
| namespace: '', | ||
| revision: 0, | ||
| updated_at: '', | ||
| updated_by: '', | ||
| created_at: '', | ||
| created_by: '', | ||
| inputs: [ | ||
| { | ||
| type: 'cloudbeat/cis_gcp', | ||
| enabled: true, | ||
| streams: [ | ||
| { | ||
| vars: { | ||
| 'gcp.account_type': { value: 'single-account-MAYBE', type: 'text' }, | ||
| }, | ||
| }, | ||
| ], | ||
| config: {}, | ||
| }, | ||
| ], | ||
| }, | ||
| type: ' nested', | ||
| }; | ||
| }; | ||
| const initialDoc = policyDocWithAccountType(); | ||
| const migratedDoc = policyDocWithAccountType(); | ||
| expect(migration(initialDoc, {} as SavedObjectModelTransformationContext)).toEqual({ | ||
| attributes: migratedDoc.attributes, | ||
| }); | ||
| }); | ||
| }); |
36 changes: 36 additions & 0 deletions
36
x-pack/plugins/fleet/server/saved_objects/migrations/cloud_security_posture/to_v8_11_0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import type { SavedObjectModelDataBackfillFn } from '@kbn/core-saved-objects-server'; | ||
|
|
||
| import type { PackagePolicy } from '../../../../common'; | ||
|
|
||
| export const migrateCspPackagePolicyToV8110: SavedObjectModelDataBackfillFn< | ||
| PackagePolicy, | ||
| PackagePolicy | ||
| > = (packagePolicyDoc) => { | ||
| if (packagePolicyDoc.attributes.package?.name !== 'cloud_security_posture') { | ||
| return { attributes: packagePolicyDoc.attributes }; | ||
| } | ||
|
|
||
| const updatedAttributes = packagePolicyDoc.attributes; | ||
|
|
||
| const gcpPackage = updatedAttributes.inputs.find((input) => input.type === 'cloudbeat/cis_gcp'); | ||
|
|
||
| if (gcpPackage) { | ||
| const isGcpAccountTypeExists = gcpPackage.streams[0]?.vars?.hasOwnProperty('gcp.account_type'); | ||
|
|
||
| if (!isGcpAccountTypeExists) { | ||
| const migratedPolicy = { 'gcp.account_type': { value: 'single-account', type: 'text' } }; | ||
| gcpPackage.streams[0].vars = { ...(gcpPackage.streams[0].vars || {}), ...migratedPolicy }; | ||
| } | ||
| } | ||
|
|
||
| return { | ||
| attributes: updatedAttributes, | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22688,7 +22688,7 @@ [email protected]: | |
| resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" | ||
| integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== | ||
|
|
||
| nanoid@^3.3.1, nanoid@^3.3.4: | ||
| nanoid@^3.3.1: | ||
| version "3.3.4" | ||
| resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" | ||
| integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== | ||
|
|
@@ -24625,19 +24625,10 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0 | |
| picocolors "^0.2.1" | ||
| source-map "^0.6.1" | ||
|
|
||
| postcss@^8.4.14: | ||
| version "8.4.14" | ||
| resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" | ||
| integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== | ||
| dependencies: | ||
| nanoid "^3.3.4" | ||
| picocolors "^1.0.0" | ||
| source-map-js "^1.0.2" | ||
|
|
||
| postcss@^8.4.23: | ||
| version "8.4.25" | ||
| resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.25.tgz#4a133f5e379eda7f61e906c3b1aaa9b81292726f" | ||
| integrity sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw== | ||
| postcss@^8.4.14, postcss@^8.4.23, postcss@^8.4.31: | ||
| version "8.4.31" | ||
| resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" | ||
| integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== | ||
| dependencies: | ||
| nanoid "^3.3.6" | ||
| picocolors "^1.0.0" | ||
|
|
||