Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create data yaml based on rules instances #130671

Merged
merged 27 commits into from
Apr 25, 2022
Merged

Create data yaml based on rules instances #130671

merged 27 commits into from
Apr 25, 2022

Conversation

CohenIdo
Copy link
Contributor

No description provided.

@CohenIdo
draft PR for adding post create package callback
4f16c31
@CohenIdo
add new CB type
0371235
@CohenIdo
add tests
9dd11b2
@CohenIdo
fix types
1093365
@CohenIdo
update packagePolicy schema validator
997b6b2
@CohenIdo
update scheme and test
59e49ed
@CohenIdo
extend packagePolicy scheme validation
485df00
@CohenIdo
install rules with postCreate hook
fbb3fb2
@CohenIdo
working version after clean
aa593b7
@CohenIdo
update scheme
9e5f8c1
@CohenIdo
Merge remote-tracking branch 'origin/main' into createConcreteCSPRule…
6d37309 
…sPostCreatePackage
@CohenIdo
working version e2e
c6fafda
@CohenIdo
revert
fda5c90
@CohenIdo
tsc errors
99c4ac6
@CohenIdo
update
40646dc
@CohenIdo
drop comments
7a98000
@CohenIdo
drop todo
c133efd
@CohenIdo
add tests
0c56a3a
@CohenIdo
typo
48883d3
@CohenIdo
Merge remote-tracking branch 'origin/main' into createConcreteCSPRule…
45256d3 
…sPostCreatePackage
@CohenIdo
code review fix
a2039f3
@CohenIdo
fix imports
cfce0e1
@CohenIdo
update callbacks
c58dee8
@CohenIdo
create data yaml base on concrete rules
5d63005
@CohenIdo CohenIdo added release_note:skip Skip the PR/issue when compiling release notes Team:Cloud Security Cloud Security team related v8.3.0 labels Apr 20, 2022
@CohenIdo CohenIdo marked this pull request as ready for review April 20, 2022 13:06
@CohenIdo CohenIdo requested a review from a team as a code owner April 20, 2022 13:06
@CohenIdo CohenIdo requested a review from kfirpeled April 20, 2022 13:07
eyalkraft
eyalkraft reviewed Apr 20, 2022
View reviewed changes
Copy link
Contributor

@eyalkraft eyalkraft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good but what about adding a test that actually confirms you filter correctly? e.g add different package_policy_ids and policy_id to your concrete rules used in the test?

x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts Outdated
const cspRules = await soClient.find<CspRuleSchema>({
type: cspRuleAssetSavedObjectType,
search: '',
filter: `csp_rule.attributes.package_policy_id: ${packagePolicy.id} AND csp_rule.attributes.policy_id: ${packagePolicy.policy_id}`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use the cspRuleAssetSavedObjectType for filtering instead csp_rule as suggeted by @kfirpeled in another PR

kfirpeled
kfirpeled approved these changes Apr 20, 2022
View reviewed changes
Copy link
Contributor

@kfirpeled kfirpeled left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested, lgtm.
see comments before merge

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@CohenIdo
Copy link
Contributor Author

CohenIdo commented Apr 25, 2022 •
edited
Loading

Looks good but what about adding a test that actually confirms you filter correctly? e.g add different package_policy_ids and policy_id to your concrete rules used in the test?

it's requires an integration test, I'll add it in another PR

@CohenIdo CohenIdo merged commit 780333b into elastic:main Apr 25, 2022
@kibanamachine kibanamachine added the backport:skip This commit does not require backporting label Apr 25, 2022
dmlemeshko pushed a commit to dmlemeshko/kibana that referenced this pull request May 5, 2022
@CohenIdo @dmlemeshko
[Cloud Posture] Create data yaml based on rules instances (elastic#13…
b031348 
…0671)
kertal pushed a commit to kertal/kibana that referenced this pull request May 24, 2022
@CohenIdo @kertal
[Cloud Posture] Create data yaml based on rules instances (elastic#13…
c860338 
…0671)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eyalkraft eyalkraft eyalkraft left review comments

@kfirpeled kfirpeled kfirpeled approved these changes

Assignees
No one assigned
Labels
backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes Team:Cloud Security Cloud Security team related v8.3.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@CohenIdo @kibana-ci @kfirpeled @eyalkraft @kibanamachine