Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Aug 25, 2025

Summary of your changes

Fixes missing cloud.service.name values for Azure assets (were all assigned Azure).

Related Issues

Fixes https://github.com/elastic/security-team/issues/13159


This is an automatic backport of pull request #3466 done by [Mergify](https://mergify.com).

…#3466)

* update test cases

* update Azure service names

* apply review remarks

* rename FlexibleMySQLDBAssetType

* rename MySQLDBAssetType

* gofmt

(cherry picked from commit 7e3234f)

# Conflicts:
#	internal/inventory/azurefetcher/fetcher_account.go
#	internal/inventory/azurefetcher/fetcher_account_test.go
#	internal/inventory/azurefetcher/fetcher_activedirectory.go
#	internal/inventory/azurefetcher/fetcher_activedirectory_test.go
#	internal/inventory/azurefetcher/fetcher_resource_graph.go
#	internal/inventory/azurefetcher/fetcher_resource_graph_test.go
#	internal/inventory/azurefetcher/fetcher_storage.go
#	internal/inventory/azurefetcher/fetcher_storage_test.go
#	internal/resources/fetching/fetchers/azure/assets_fetcher.go
@mergify mergify bot added the backport label Aug 25, 2025
@mergify mergify bot requested a review from a team as a code owner August 25, 2025 11:39
@mergify
Copy link
Author

mergify bot commented Aug 25, 2025

Cherry-pick of 7e3234f has failed:

On branch mergify/bp/8.17/pr-3466
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 7e3234f1.
  (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/resources/fetching/fetchers/azure/assets_enricher_mysql.go
	modified:   internal/resources/fetching/fetchers/azure/assets_enricher_mysql_test.go
	modified:   internal/resources/providers/azurelib/inventory/asset.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/inventory/azurefetcher/fetcher_account.go
	both modified:   internal/inventory/azurefetcher/fetcher_account_test.go
	both modified:   internal/inventory/azurefetcher/fetcher_activedirectory.go
	both modified:   internal/inventory/azurefetcher/fetcher_activedirectory_test.go
	both modified:   internal/inventory/azurefetcher/fetcher_resource_graph.go
	both modified:   internal/inventory/azurefetcher/fetcher_resource_graph_test.go
	both modified:   internal/inventory/azurefetcher/fetcher_storage.go
	both modified:   internal/inventory/azurefetcher/fetcher_storage_test.go
	both modified:   internal/resources/fetching/fetchers/azure/assets_fetcher.go

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

@mergify
Copy link
Author

mergify bot commented Sep 1, 2025

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

7 similar comments
@mergify
Copy link
Author

mergify bot commented Sep 8, 2025

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

@mergify
Copy link
Author

mergify bot commented Sep 15, 2025

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

@mergify
Copy link
Author

mergify bot commented Sep 22, 2025

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

@mergify
Copy link
Author

mergify bot commented Sep 29, 2025

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

@mergify
Copy link
Author

mergify bot commented Oct 6, 2025

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

@mergify
Copy link
Author

mergify bot commented Oct 13, 2025

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

@mergify
Copy link
Author

mergify bot commented Oct 20, 2025

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

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.

1 participant