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.

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

[8.x](backport #2879) Refactor asset inventory #2921

Merged
merged 3 commits into from
Jan 29, 2025
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 16, 2025

Summary of your changes

  • Update Taxonomy
    • Remove sub_category
    • Remove sub_type
    • Change category
    • Change type
  • Move from asset to entity
  • Move asset.raw to Attributes
  • Move asset.tags to labels
  • Update fields to follow ecs definition:
    • host
    • user
    • cloud
    • network

Screenshot/Data

image

image

image

Related Issues

@mergify mergify bot requested a review from a team as a code owner January 16, 2025 15:14
Copy link
Author

mergify bot commented Jan 16, 2025

Cherry-pick of cbadcb7 has failed:

On branch mergify/bp/8.x/pr-2879
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit cbadcb77.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/inventory/ASSETS.md
	modified:   internal/inventory/asset.go
	modified:   internal/inventory/awsfetcher/fetcher_ec2_instance.go
	modified:   internal/inventory/awsfetcher/fetcher_ec2_instance_test.go
	modified:   internal/inventory/awsfetcher/fetcher_elb.go
	modified:   internal/inventory/awsfetcher/fetcher_elb_test.go
	modified:   internal/inventory/awsfetcher/fetcher_iam_policy.go
	modified:   internal/inventory/awsfetcher/fetcher_iam_policy_test.go
	modified:   internal/inventory/awsfetcher/fetcher_iam_role.go
	modified:   internal/inventory/awsfetcher/fetcher_iam_role_test.go
	modified:   internal/inventory/awsfetcher/fetcher_iam_user.go
	modified:   internal/inventory/awsfetcher/fetcher_iam_user_test.go
	modified:   internal/inventory/awsfetcher/fetcher_lambda_test.go
	modified:   internal/inventory/awsfetcher/fetcher_networking.go
	modified:   internal/inventory/awsfetcher/fetcher_rds.go
	modified:   internal/inventory/awsfetcher/fetcher_rds_test.go
	modified:   internal/inventory/awsfetcher/fetcher_s3_bucket.go
	modified:   internal/inventory/awsfetcher/fetcher_s3_bucket_test.go
	modified:   internal/inventory/awsfetcher/fetcher_sns.go
	modified:   internal/inventory/awsfetcher/fetcher_sns_test.go
	modified:   internal/inventory/azurefetcher/fetcher_account.go
	modified:   internal/inventory/azurefetcher/fetcher_account_test.go
	modified:   internal/inventory/azurefetcher/fetcher_activedirectory.go
	modified:   internal/inventory/azurefetcher/fetcher_activedirectory_test.go
	modified:   internal/inventory/azurefetcher/fetcher_resource_graph.go
	modified:   internal/inventory/azurefetcher/fetcher_resource_graph_test.go
	modified:   internal/inventory/azurefetcher/fetcher_storage.go
	modified:   internal/inventory/azurefetcher/fetcher_storage_test.go
	modified:   internal/inventory/cloud_assets.xlsx
	modified:   internal/inventory/gcpfetcher/fetcher_assets.go
	modified:   internal/inventory/gcpfetcher/fetcher_assets_test.go
	modified:   internal/inventory/inventory.go
	modified:   internal/inventory/inventory_test.go
	modified:   scripts/update_assets_md/main.go
	modified:   tests/commonlib/io_utils.py
	modified:   tests/commonlib/utils.py
	modified:   tests/product/tests/data/asset_inventory_test_case.py
	modified:   tests/product/tests/data/azure_asset_inventory/test_cases.py
	modified:   tests/product/tests/data/gcp_asset_inventory/test_cases.py
	modified:   tests/product/tests/test_aws_asset_inventory.py
	modified:   tests/product/tests/test_gcp_asset_inventory.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   internal/inventory/awsfetcher/fetcher_lambda.go
	both modified:   tests/product/tests/data/aws_asset_inventory/test_cases.py
	deleted by us:   tests/product/tests/test_azure_asset_inventory.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Author

mergify bot commented Jan 20, 2025

This pull request has not been merged yet. Could you please review and merge it @romulets? 🙏

1 similar comment
Copy link
Author

mergify bot commented Jan 27, 2025

This pull request has not been merged yet. Could you please review and merge it @romulets? 🙏

(cherry picked from commit cbadcb7)
@orouz orouz force-pushed the mergify/bp/8.x/pr-2879 branch from 170dcdb to 0091d2a Compare January 28, 2025 15:25
@orouz
Copy link
Collaborator

orouz commented Jan 28, 2025

@romulets fixed conflicts with clog (and also internal/inventory/awsfetcher/fetcher_lambda.go:83)

PTAL

@orouz orouz requested a review from romulets January 28, 2025 15:26
@romulets romulets merged commit b7bb6a8 into 8.x Jan 29, 2025
9 checks passed
@romulets romulets deleted the mergify/bp/8.x/pr-2879 branch January 29, 2025 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants