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

[Cloud Security][CIS GCP]Migration for new fields #167545

Merged
merged 47 commits into from
Oct 3, 2023
Merged

[Cloud Security][CIS GCP]Migration for new fields #167545

merged 47 commits into from
Oct 3, 2023

Conversation

animehart
Copy link
Contributor

@animehart animehart commented Sep 28, 2023 •
edited
Loading

Summary

This PR is for migrating account.type fields for GCP when it doesnt have it

animehart and others added 30 commits September 21, 2023 12:05
@animehart
added base update (still rough) for GCP Organization option + Updates…
e4e173d 
… to Single account
@kibanamachine
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
90af2ed 
…-fix'
@animehart
more update on GCP Organization
83bf2dc
@animehart
fix conflict
85cc99b
@kibanamachine
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
54a3b20 
…-ref HEAD~1..HEAD --fix'
@animehart
added more unit test
c0ab168
@animehart
Merge branch 'cis-gcp-organization' of github.com:animehart/kibana in…
45ca6d8 
…to cis-gcp-organization
@kibanamachine
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
3366c97 
…-fix'
@animehart
a little fix or update for the unit test
d8ef6b2
@animehart
fix conflict
383e3d0
@animehart
version update checks fix
aacb6e8
@kibanamachine
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
14853ae 
…-ref HEAD~1..HEAD --fix'
@animehart
updates
a253c63
@animehart
Merge branch 'cis-gcp-organization' of github.com:animehart/kibana in…
38a6cef 
…to cis-gcp-organization
@animehart
Fix conflict
f0d6ff5
@animehart
fix
eef51dc
@kibanamachine
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
5c4bde8 
…-ref HEAD~1..HEAD --fix'
@animehart
update steps to change based if user provided prj id or not
e1ffc0c
@animehart
Merge branch 'cis-gcp-organization' of github.com:animehart/kibana in…
ee94563 
…to cis-gcp-organization
@animehart
check fail fix
a555ed5
@kibanamachine
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
e8280b7 
…-fix'
@animehart
fix conflict
a6a18af
@animehart
Merge branch 'cis-gcp-organization' of github.com:animehart/kibana in…
19bfd44 
…to cis-gcp-organization
@animehart
Merge branch 'main' into cis-gcp-organization
2efd21e
@animehart
migration attempt
5e29f55
@kibanamachine
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
85d8725 
…-ref HEAD~1..HEAD --fix'
@kfirpeled
fixed migrations to fit serverless model
11b23ea
@kfirpeled
Update to_v8_11_0.ts
325f233
@animehart
fix conflict
9afd4b7
@animehart
more conflict fix
dd0d759
@animehart animehart added v8.11.0 Team:Cloud Security Cloud Security team related release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team labels Sep 29, 2023
@animehart animehart marked this pull request as ready for review September 29, 2023 17:40
@animehart animehart requested a review from a team as a code owner September 29, 2023 17:40
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-cloud-security-posture (Team:Cloud Security)

kfirpeled
kfirpeled requested changes Oct 1, 2023
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.

lgtm, I believe we must create a new version - number 4

x-pack/plugins/fleet/server/saved_objects/index.ts Show resolved Hide resolved
x-pack/plugins/fleet/server/saved_objects/migrations/cloud_security_posture/to_v8_11_0.test.ts
});
});

it('if there are no cloud_security_posture package, do not change the doc', () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

worth adding another test case - when the value is already set to something else, we don't set it to single-account

juliaElastic
juliaElastic reviewed Oct 2, 2023
View reviewed changes
Copy link
Contributor

@juliaElastic juliaElastic left a comment

Choose a reason for hiding this comment

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

Ready to approve after the comments are addressed.

@animehart animehart requested a review from kfirpeled October 2, 2023 14:40
@animehart animehart requested a review from juliaElastic October 2, 2023 15:41
@animehart animehart requested a review from a team as a code owner October 3, 2023 16:51
kfirpeled
kfirpeled approved these changes Oct 3, 2023
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.

LGTM

TinaHeiligers
TinaHeiligers approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@TinaHeiligers TinaHeiligers left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM on CI green.

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Defend Workflows Cypress Tests #4 / Artifact pages Trusted applications should update Endpoint Policy on Endpoint when adding Trusted application name should update Endpoint Policy on Endpoint when adding Trusted application name

Metrics [docs]

✅ unchanged

History

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

nchaulet
nchaulet approved these changes Oct 3, 2023
View reviewed changes
Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

🚀

@animehart animehart merged commit 959f623 into elastic:main Oct 3, 2023
@kibanamachine kibanamachine added the backport:skip This commit does not require backporting label Oct 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kfirpeled kfirpeled kfirpeled approved these changes

@TinaHeiligers TinaHeiligers TinaHeiligers approved these changes

@nchaulet nchaulet nchaulet approved these changes

@juliaElastic juliaElastic Awaiting requested review from juliaElastic

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 Team:Fleet Team label for Observability Data Collection Fleet team v8.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@animehart @elasticmachine @kibana-ci @nchaulet @TinaHeiligers @kfirpeled @juliaElastic @kibanamachine