PR#1523: allow koji tags to be created with a configurable permission - fm-orchestrator

fm-orchestrator

#1523 allow koji tags to be created with a configurable permission

Merged 4 years ago by mprahl. Opened 4 years ago by cobrien.

cobrien/fm-orchestrator issue_1478 into master

allow koji tags to be created with a configurable permission. Fixes #1478

Christopher O'Brien • 4 years ago

12acc92

module_build_service/builder/KojiModuleBuilder.py

file modified

+4 -2

		`@@ -528,11 +528,13 @@`
		`# only if we are creating the build_tag for first time.`
		`build_tag_exists = self.koji_session.getTag(self.tag_name + "-build")`

		`+ tag_perm = self.config.koji_tag_permission`
		`+`
		`# Create or update individual tags`
		`# the main tag needs arches so pungi can dump it`
		`- self.module_tag = self._koji_create_tag(self.tag_name, self.arches, perm="admin")`
		`+ self.module_tag = self._koji_create_tag(self.tag_name, self.arches, perm=tag_perm)`
		`self.module_build_tag = self._koji_create_tag(`
		`- self.tag_name + "-build", self.arches, perm="admin")`
		`+ self.tag_name + "-build", self.arches, perm=tag_perm)`

		`buildopts = self.mmd.get_buildopts()`
		`if buildopts and buildopts.get_rpm_whitelist():`

module_build_service/config.py

file modified

		`@@ -164,6 +164,11 @@`
		`"default": ["module", "scrmod"],`
		`"desc": "List of allowed koji tag prefixes.",`
		`},`
		`+ "koji_tag_permission": {`
		`+ "type": str,`
		`+ "default": "admin",`
		`+ "desc": "Permission name to require for newly created Koji tags.",`
		`+ },`
		`"koji_tag_extra_opts": {`
		`"type": dict,`
		`"default": {`

cobrien commented 4 years ago

Remove hard-coded admin permission and allow it to be specified as a configuration option named koji_tag_permission. Default configuration value if unset is admin (ie. behavior unchanged by default)

Fixes #1478