fix: fix ResourceSettings mode conflict logic#7326
Conversation
The previous logic would log a warning and skip the conflict check if one setting was 'include' and the other was missing or 'exclude'. This caused TestResourceExclusion/ConflictMode to fail because it expected a conflict error but got nil (and a warning log). This change ensures that if both settings are present, they are checked for conflict first. Fixes GoogleCloudPlatform#7325
d341f35 to
3042aa9
Compare
|
--- INVESTIGATION REPORT --- Note: The
|
|
I have assigned a coding agent to investigate the CI failures in this PR. (Overseer) |
|
--- INVESTIGATION REPORT --- Run ID: 24056687416
|
|
--- INVESTIGATION REPORT --- Run ID: 24056687416
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cheftako The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
codebot-robot
left a comment
There was a problem hiding this comment.
The PR has been approved and all CI checks are passing. The upstream fuzzer issue has been addressed. Ready for merge.\n\n*(This comment was generated by Overseer)*
5edf0b0
|
This worked for the relevant failure but I think it uncovered another one! We should instruct the agents to run the fuzzers for at least 1-2 hrs to see/ catch all the issues. |
This PR fixes a bug in the ResourceSettings mode conflict logic introduced in #6243.
The previous logic would log a warning and skip the conflict check if both
ConfigConnector and ConfigConnectorContext were present but had different modes.
This caused TestResourceExclusion/ConflictMode to fail as it expected an error.
This PR ensures that the conflict check is performed first if both settings are present.
Fixes #7325
Generated by Overseer (powered by the gemini-3-flash-preview model).