almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

pkgset: Fix whitelist for modules

Browse Source 
The prefix checking only works if there are no streams that would share
prefixes. Let's instead check the value as a whole. There is extra
complexity from the fact that version and context may not be specified.

The stream as specified in input is processed to replace dashes (`-`)
with underscores (`_`) to match how the builds are imported into Koji.

JIRA: COMPOSE-3547
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-05-03 14:44:16 +02:00
parent 2ae742af04
commit a9b9ec97fb
2 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pungi/phases/pkgset/sources/source_koji.py
View File

@ -324,28 +324,41 @@ def filter_by_whitelist(compose, module_builds, input_modules):
input_modules. Order may not be preserved. input_modules. Order may not be preserved.
""" """
specs = set() specs = set()
nvr_prefixes = set() nvr_patterns = set()
for spec in input_modules: for spec in input_modules:
# Do not do any filtering in case variant wants all the modules. # Do not do any filtering in case variant wants all the modules.
if spec["name"] == "*": if spec["name"] == "*":
return module_builds return module_builds
info = variant_dict_from_str(compose, spec["name"]) info = variant_dict_from_str(compose, spec["name"])
prefix = ("%s-%s-%s.%s" % ( pattern = (
info["name"], info["name"],
info["stream"].replace("-", "_"), info["stream"].replace("-", "_"),
info.get("version", ""), info.get("version"),
info.get("context", ""), info.get("context"),
)).rstrip("-.") )
nvr_prefixes.add((prefix, spec["name"])) nvr_patterns.add((pattern, spec["name"]))
specs.add(spec["name"]) specs.add(spec["name"])
modules_to_keep = [] modules_to_keep = []
used = set() used = set()
for mb in module_builds: for mb in module_builds:
for (prefix, spec) in nvr_prefixes: # Split release from the build into version and context
if mb["nvr"].startswith(prefix): ver, ctx = mb["release"].split(".")
# Values in `mb` are from Koji build. There's nvr and name, version and
# release. The input pattern specifies modular name, stream, version
# and context.
for (n, s, v, c), spec in nvr_patterns:
if (
# We always have a name and stream...
mb["name"] == n
and mb["version"] == s
# ...but version and context can be missing, in which case we
# don't want to check them.
and (not v or ver == v)
and (not c or ctx == c)
):
modules_to_keep.append(mb) modules_to_keep.append(mb)
used.add(spec) used.add(spec)
break break

60
tests/test_pkgset_source_koji.py
View File

@ -585,6 +585,15 @@ class TestFilterInherited(unittest.TestCase):
class TestFilterByWhitelist(unittest.TestCase): class TestFilterByWhitelist(unittest.TestCase):
def _build(self, n, s, v, c):
s = s.replace("-", "_")
return {
"nvr": "%s-%s-%s.%s" % (n, s, v, c),
"name": n,
"version": s,
"release": "%s.%s" % (v, c),
}
def test_no_modules(self): def test_no_modules(self):
compose = mock.Mock() compose = mock.Mock()
module_builds = [] module_builds = []
@ -598,72 +607,55 @@ class TestFilterByWhitelist(unittest.TestCase):
def test_filter_by_NS(self): def test_filter_by_NS(self):
compose = mock.Mock() compose = mock.Mock()
module_builds = [ module_builds = [
{"nvr": "foo-1-201809031048.cafebabe"}, self._build("foo", "1", "201809031048", "cafebabe"),
{"nvr": "foo-1-201809031047.deadbeef"}, self._build("foo", "1", "201809031047", "deadbeef"),
{"nvr": "foo-2-201809031047.deadbeef"}, self._build("foo", "2", "201809031047", "deadbeef"),
] ]
input_modules = [{"name": "foo:1"}] input_modules = [{"name": "foo:1"}]
result = source_koji.filter_by_whitelist(compose, module_builds, input_modules) result = source_koji.filter_by_whitelist(compose, module_builds, input_modules)
self.assertItemsEqual( self.assertItemsEqual(result, [module_builds[0], module_builds[1]])
result,
[
{"nvr": "foo-1-201809031048.cafebabe"},
{"nvr": "foo-1-201809031047.deadbeef"},
],
)
def test_filter_by_NSV(self): def test_filter_by_NSV(self):
compose = mock.Mock() compose = mock.Mock()
module_builds = [ module_builds = [
{"nvr": "foo-1-201809031048.cafebabe"}, self._build("foo", "1", "201809031048", "cafebabe"),
{"nvr": "foo-1-201809031047.deadbeef"}, self._build("foo", "1", "201809031047", "deadbeef"),
{"nvr": "foo-2-201809031047.deadbeef"}, self._build("foo", "2", "201809031047", "deadbeef"),
] ]
input_modules = [{"name": "foo:1:201809031047"}] input_modules = [{"name": "foo:1:201809031047"}]
result = source_koji.filter_by_whitelist(compose, module_builds, input_modules) result = source_koji.filter_by_whitelist(compose, module_builds, input_modules)
self.assertItemsEqual( self.assertItemsEqual(result, [module_builds[1]])
result, [{"nvr": "foo-1-201809031047.deadbeef"}]
)
def test_filter_by_NSVC(self): def test_filter_by_NSVC(self):
compose = mock.Mock() compose = mock.Mock()
module_builds = [ module_builds = [
{"nvr": "foo-1-201809031048.cafebabe"}, self._build("foo", "1", "201809031048", "cafebabe"),
{"nvr": "foo-1-201809031047.deadbeef"}, self._build("foo", "1", "201809031047", "deadbeef"),
{"nvr": "foo-1-201809031047.cafebabe"}, self._build("foo", "1", "201809031047", "cafebabe"),
{"nvr": "foo-2-201809031047.deadbeef"}, self._build("foo", "2", "201809031047", "deadbeef"),
] ]
input_modules = [{"name": "foo:1:201809031047:deadbeef"}] input_modules = [{"name": "foo:1:201809031047:deadbeef"}]
result = source_koji.filter_by_whitelist(compose, module_builds, input_modules) result = source_koji.filter_by_whitelist(compose, module_builds, input_modules)
self.assertItemsEqual( self.assertItemsEqual(result, [module_builds[1]])
result, [{"nvr": "foo-1-201809031047.deadbeef"}]
)
def test_filter_by_wildcard(self): def test_filter_by_wildcard(self):
compose = mock.Mock() compose = mock.Mock()
module_builds = [ module_builds = [
{"nvr": "foo-1-201809031048.cafebabe"}, self._build("foo", "1", "201809031048", "cafebabe"),
{"nvr": "foo-1-201809031047.deadbeef"}, self._build("foo", "1", "201809031047", "deadbeef"),
{"nvr": "foo-2-201809031047.deadbeef"}, self._build("foo", "2", "201809031047", "deadbeef"),
] ]
input_modules = [{"name": "*"}] input_modules = [{"name": "*"}]
result = source_koji.filter_by_whitelist(compose, module_builds, input_modules) result = source_koji.filter_by_whitelist(compose, module_builds, input_modules)
self.assertItemsEqual( self.assertItemsEqual(result, module_builds)
result,
[
{"nvr": "foo-1-201809031048.cafebabe"},
{"nvr": "foo-1-201809031047.deadbeef"},
{"nvr": "foo-2-201809031047.deadbeef"},
],
)
class MockModule(object): class MockModule(object):