Skip to content

Conversation

DomAyre
Copy link
Contributor

@DomAyre DomAyre commented Oct 16, 2025

Why

Recently these two PRs were merged:

They 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

  • Add new expected policies for the --infrastructure-svn and --fragments-json combination in the new existing_policy cases

This checklist is used to make sure that common guidelines for a pull request are followed.

Related command

General Guidelines

  • Have you run azdev style <YOUR_EXT> locally? (pip install azdev required)
  • Have you run python scripts/ci/test_index.py -q locally? (pip install wheel==0.30.0 required)
  • My extension version conforms to the Extension version schema

Note: since only test data is added, no version change is required

@Copilot Copilot AI review requested due to automatic review settings October 16, 2025 10:16
Copy link

azure-client-tools-bot-prd bot commented Oct 16, 2025

️✔️Azure CLI Extensions Breaking Change Test
️✔️Non Breaking Changes

Copy link

Hi @DomAyre,
Please write the description of changes which can be perceived by customers into HISTORY.rst.
If you want to release a new extension version, please update the version in setup.py as well.

@yonzhan
Copy link
Collaborator

yonzhan commented Oct 16, 2025

Thank you for your contribution! We will review the pull request and get back to you soon.

Copy link

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).
After that please run the following commands to enable git hooks:

pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>

Copy link
Contributor

@Copilot Copilot AI left a 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

Copy link

Hi @DomAyre

Release Suggestions

Module: confcom

  • Please log updates into to src/confcom/HISTORY.rst
  • Update VERSION to 1.3.1 in src/confcom/setup.py

Notes

@yonzhan yonzhan requested a review from kairu-ms October 16, 2025 11:31
@yonzhan yonzhan requested a review from jsntcy October 16, 2025 11:31
@kairu-ms kairu-ms merged commit 4c81161 into Azure:main Oct 17, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants