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).

@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.19/pr-3466
Your branch is up to date with 'origin/8.19'.

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/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_storage_test.go
	modified:   internal/resources/fetching/fetchers/azure/assets_enricher_mysql.go
	modified:   internal/resources/fetching/fetchers/azure/assets_enricher_mysql_test.go
	modified:   internal/resources/fetching/fetchers/azure/assets_fetcher.go
	modified:   internal/resources/providers/azurelib/inventory/asset.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

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? 🙏

…#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_resource_graph.go
#	internal/inventory/azurefetcher/fetcher_resource_graph_test.go
#	internal/inventory/azurefetcher/fetcher_storage.go
@kubasobon kubasobon force-pushed the mergify/bp/8.19/pr-3466 branch from ecb2127 to 8982712 Compare September 1, 2025 09:31
@kubasobon kubasobon merged commit ae23183 into 8.19 Sep 1, 2025
9 checks passed
@kubasobon kubasobon deleted the mergify/bp/8.19/pr-3466 branch September 1, 2025 11:25
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.

2 participants