Fix include-branches priority

Per the documentation, include-branches should be able to override
exclude-branches, but this was not the case in the way the code was
written. Rework the code to correct this, and also add a test to ensure
it works as documented

Change-Id: I2e23b1533c67ccf84b4d6a36f5a003adc7b3e45a
changes/97/871197/3
Joshua Watt 1 week ago
parent 944b9852c9
commit a557e140b1

@ -0,0 +1,12 @@
---
upgrade:
- |
Fixes `tenant.untrusted-projects.<project>.include-branches` being lower
priority than `tenant.untrusted-projects.<project>.exclude-branches` to
match the documentation and expected user behavior.
This only affects projects that are using both `include-branches` and
`exclude-branches` at the same time. Now, `include-branches` has priority
over `exclude-branches` for any branches that match both. Practically
speaking, this means that `exclude-branches` is ignored if
`include-branches` is set.

@ -0,0 +1,16 @@
- tenant:
name: tenant-one
source:
gerrit:
config-projects:
- common-config
untrusted-projects:
- org/project1:
exclude-branches:
- foo
- bar
# Include branches has higher priority than exclude branches
include-branches:
- foo
- bar
- org/project2

@ -611,6 +611,12 @@ class TestTenantExcludeBranches(TestTenantIncludeBranches):
# Same test results as include-branches
class TestTenantExcludeIncludeBranches(TestTenantIncludeBranches):
tenant_config_file = 'config/tenant-parser/exclude-include-branches.yaml'
# Same test results as include-branches
class TestTenantExcludeAll(TenantParserTestCase):
tenant_config_file = 'config/tenant-parser/exclude-all.yaml'

@ -7029,24 +7029,15 @@ class TenantProjectConfig(object):
def includesBranch(self, branch):
if self.include_branches is not None:
included = False
for r in self.include_branches:
if r.fullmatch(branch):
included = True
break
else:
included = True
if not included:
return True
return False
excluded = False
if self.exclude_branches is not None:
for r in self.exclude_branches:
if r.fullmatch(branch):
excluded = True
break
if excluded:
return False
return False
return True

Loading…
Cancel
Save