fix: Merging the changes from dev to main#248
Merged
Roopan-Microsoft merged 3 commits intomainfrom Oct 29, 2025
Merged
Conversation
fix: Prevent removal of existing RG tags when deploying GSA
feat: Down merge from main to dev
Roopan-Microsoft
approved these changes
Oct 29, 2025
|
🎉 This PR is included in version 1.5.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
This pull request updates the tagging logic for resource groups and makes a minor fix to resource dependencies in the infrastructure templates. The main improvements are ensuring that existing resource group tags are preserved and merged with new tags, and correcting the order of dependencies for private DNS zones.
Tagging improvements:
resourceGroupTagsresource inmain.bicepto merge existing resource group tags (resourceGroup().tags) withallTagsand other custom tags, ensuring that all relevant tags are included.tagsproperty inmain.jsonto use a shallow merge that now includesresourceGroup().tags, so any pre-existing tags on the resource group are retained in addition to new tags.Infrastructure and dependency fixes:
main.jsonby moving the dependency foropenAIDNS zone to the correct position in the list.main.jsonto reflect the changes made.Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Other Information