-
Notifications
You must be signed in to change notification settings - Fork 1.5k
[confcom] Fix merge conflict with new tests #9306
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
Conversation
️✔️Azure CLI Extensions Breaking Change Test
|
Hi @DomAyre, |
Thank you for your contribution! We will review the pull request and get back to you soon. |
The git hooks are available for azure-cli and azure-cli-extensions repos. They could help you run required checks before creating the PR. Please sync the latest code with latest dev branch (for azure-cli) or main branch (for azure-cli-extensions). pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR resolves a merge conflict between two recently merged PRs that added new test cases and expected policies for the confcom extension. The conflict occurred because one PR added new input JSON configurations while the other added expected policy outputs, creating a mismatch between input and expected output for certain test combinations.
- Adds missing expected policy files for the
--infrastructure-svn
and--fragments-json
combination - Ensures test consistency by providing the correct expected outputs for new test scenarios
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
File | Description |
---|---|
src/confcom/samples/aci/existing_policy_allow_all/policy_fragment_plus_infrastructure_svn.rego | Adds expected policy output for existing_policy_allow_all test case with infrastructure SVN and fragments JSON |
src/confcom/samples/aci/existing_policy/policy_fragment_plus_infrastructure_svn.rego | Adds expected policy output for existing_policy test case with infrastructure SVN and fragments JSON |
Hi @DomAyre Release SuggestionsModule: confcom
Notes
|
Why
Recently these two PRs were merged:
acipolicygen --diff
#9258--infrastructure-svn
and--include-fragments
combo #9264They conflict since one adds new expected policies and the other adds new input json, so the intersection of the two has the new input, but not the newly expected output.
This PR fixes this issue
How
--infrastructure-svn
and--fragments-json
combination in the new existing_policy casesThis checklist is used to make sure that common guidelines for a pull request are followed.
Related command
General Guidelines
azdev style <YOUR_EXT>
locally? (pip install azdev
required)python scripts/ci/test_index.py -q
locally? (pip install wheel==0.30.0
required)Note: since only test data is added, no version change is required