yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osclib/conf: decouple from StagingAPI and always fetch remote config.

Browse Source 
As the remote config is no longer optional for SLE and is utilized by
openSUSE to the point were it is dangerous not to load the remote config
it should be required. Currently only certain users call apply_remote()
while this will make it built-in during construction and thus makes the
usage consistent and no longer require StagingAPI.
This commit is contained in:
Jimmy Berry 2018-08-16 21:46:05 -05:00
parent 68c3150069
commit 760ddf39e6
18 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ReviewBot.py
View File

@ -141,10 +141,8 @@ class ReviewBot(object):
def staging_api(self, project):
if project not in self.staging_apis:
config = Config(project)
Config(self.apiurl, project)
self.staging_apis[project] = StagingAPI(self.apiurl, project)
config.apply_remote(self.staging_apis[project])
self.staging_config[project] = conf.config[project].copy()
return self.staging_apis[project]

7
devel-project.py
View File

@ -40,8 +40,9 @@ osc.core._search = osc.core.search
osc.core.search = search
def staging_api(args):
Config(args.project)
return StagingAPI(osc.conf.config['apiurl'], args.project)
apiurl = osc.conf.config['apiurl']
Config(apiurl, args.project)
return StagingAPI(apiurl, args.project)
def devel_projects_get(apiurl, project):
"""
@ -116,7 +117,7 @@ def notify(args):
maintainer_map.setdefault(userid, set())
maintainer_map[userid].add(devel_package_identifier)
Config(args.project) # Ensure mail-* options are loaded for mail_send().
Config(apiurl, args.project) # Ensure mail-* options are loaded for mail_send().
subject = 'Packages you maintain are present in {}'.format(args.project)
for userid, package_identifiers in maintainer_map.items():
email = entity_email(apiurl, userid)

6
metrics.py
View File

@ -549,9 +549,9 @@ def main(args):
Cache.PATTERNS['/source/[^/]+/dashboard/[^/]+\?rev=.*'] = sys.maxint
Cache.init()
config = Config(args.project)
api = StagingAPI(osc.conf.config['apiurl'], args.project)
config.apply_remote(api)
apiurl = osc.conf.config['apiurl']
Config(apiurl, args.project)
api = StagingAPI(apiurl, args.project)
print('dashboard: wrote {:,} points'.format(ingest_dashboard(api)))

6
openqa-comments.py
View File

@ -211,9 +211,9 @@ if __name__ == '__main__':
if args.force:
MARGIN_HOURS = 0
config = Config(args.project)
api = StagingAPI(osc.conf.config['apiurl'], args.project)
config.apply_remote(api)
apiurl = osc.conf.config['apiurl']
Config(apiurl, args.project)
api = StagingAPI(apiurl, args.project)
openQA = OpenQAReport(api)
if args.staging:

4
osc-staging.py
View File

@ -407,7 +407,7 @@ def do_staging(self, subcmd, opts, *args):
opts.project = self._full_project_name(opts.project)
opts.apiurl = self.get_api_url()
opts.verbose = False
config = Config(opts.project)
Config(opts.apiurl, opts.project)
colorama.init(autoreset=True,
strip=(opts.no_color or not bool(int(conf.config.get('staging.color', True)))))
@ -423,8 +423,6 @@ def do_staging(self, subcmd, opts, *args):
Cache.delete_all()
api = StagingAPI(opts.apiurl, opts.project)
config.apply_remote(api)
needed = lock_needed(cmd, opts)
with OBSLock(opts.apiurl, opts.project, reason=cmd, needed=needed) as lock:

17
osclib/conf.py
View File

@ -171,12 +171,12 @@ def str2bool(v):
class Config(object):
"""Helper class to configuration file."""
def __init__(self, project):
def __init__(self, apiurl, project):
self.project = project
self.remote_values = self.fetch_remote(apiurl)
conf_file = conf.config.get('conffile', os.environ.get('OSC_CONFIG', '~/.oscrc'))
self.conf_file = os.path.expanduser(conf_file)
self.remote_values = None
# Populate the configuration dictionary
self.populate_conf()
@ -186,7 +186,7 @@ class Config(object):
return conf
def populate_conf(self):
"""Add sane default into the configuration."""
"""Add sane default into the configuration and layer (defaults, remote, ~/.oscrc)."""
defaults = {}
default_ordered = OrderedDict(sorted(DEFAULT.items(), key=lambda i: int(i[1].get('_priority', 99))))
for prj_pattern in default_ordered:
@ -232,13 +232,12 @@ class Config(object):
else:
return defaults
def apply_remote(self, api):
"""Fetch remote config and re-process (defaults, remote, .oscrc)."""
config = attribute_value_load(api.apiurl, self.project, 'Config')
def fetch_remote(self, apiurl):
config = attribute_value_load(apiurl, self.project, 'Config')
if config:
cp = ConfigParser()
config = '[remote]\n' + config
cp.readfp(io.BytesIO(config))
self.remote_values = dict(cp.items('remote'))
self.populate_conf()
return dict(cp.items('remote'))
return None

5
pkglistgen.py
View File

@ -1159,10 +1159,9 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
# Store target project as opts.project will contain subprojects.
target_project = opts.project
config = Config(target_project)
apiurl = conf.config['apiurl']
config = Config(apiurl, target_project)
api = StagingAPI(apiurl, target_project)
config.apply_remote(api)
target_config = conf.config[target_project]
if opts.scope == 'ports':
@ -1387,7 +1386,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
project_family.extend(project_list_family(apiurl, family_include))
for project in project_family:
config = Config(project)
config = Config(apiurl, project)
project_config = conf.config[project]
baseurl = project_config.get('download-baseurl')

2
suppkg_rebuild.py
View File

@ -47,7 +47,7 @@ class StagingHelper(object):
def __init__(self, project):
self.project = project
self.apiurl = osc.conf.config['apiurl']
Config(self.project)
Config(self.apiurl, self.project)
self.api = StagingAPI(self.apiurl, self.project)
def get_support_package_list(self, project, repository):

2
tests/accept_tests.py
View File

@ -31,7 +31,7 @@ class TestAccept(unittest.TestCase):
Initialize the configuration
"""
self.obs = OBS()
Config('openSUSE:Factory')
Config(APIURL, 'openSUSE:Factory')
self.api = StagingAPI(APIURL, 'openSUSE:Factory')
def test_accept_comments(self):

2
tests/api_tests.py
View File

@ -43,7 +43,7 @@ class TestApiCalls(unittest.TestCase):
"""
self.obs = OBS()
Config('openSUSE:Factory')
Config(APIURL, 'openSUSE:Factory')
self.api = StagingAPI(APIURL, 'openSUSE:Factory')
def tearDown(self):

2
tests/check_tests.py
View File

@ -63,7 +63,7 @@ class TestCheckCommand(unittest.TestCase):
"""Initialize the configuration."""
self.obs = OBS()
Config('openSUSE:Factory')
Config(APIURL, 'openSUSE:Factory')
self.stagingapi = StagingAPI(APIURL, 'openSUSE:Factory')
self.checkcommand = CheckCommand(self.stagingapi)

29
tests/config_tests.py
View File

@ -2,6 +2,8 @@ import unittest
from osc import conf
from osclib.conf import DEFAULT
from osclib.conf import Config
#from osclib.core import attribute_value_load
from osclib.core import attribute_value_save
from osclib.stagingapi import StagingAPI
from obs import APIURL
@ -12,31 +14,32 @@ from obs import OBS
class TestConfig(unittest.TestCase):
def setUp(self):
self.obs = OBS()
self.config = Config(PROJECT)
self.load_config()
self.api = StagingAPI(APIURL, PROJECT)
def load_config(self, project=PROJECT):
self.config = Config(APIURL, project)
def test_basic(self):
self.assertEqual('openSUSE', conf.config[PROJECT]['lock-ns'])
def test_remote(self):
self.assertEqual('local', conf.config[PROJECT]['overridden-by-local'])
self.assertIsNone(conf.config[PROJECT].get('remote-only'))
self.config.apply_remote(self.api)
# Initial config present in fixtures/oscrc and obs.py attribute default.
# Local config fixture contains overridden-by-local and should win over
# the remote config value.
self.assertEqual('local', conf.config[PROJECT]['overridden-by-local'])
self.assertEqual('remote-indeed', conf.config[PROJECT]['remote-only'])
self.api.attribute_value_save('Config', 'remote-only = nope')
self.config.apply_remote(self.api)
# Change remote value.
attribute_value_save(APIURL, PROJECT, 'Config', 'remote-only = new value\n')
self.load_config()
self.assertEqual('local', conf.config[PROJECT]['overridden-by-local'])
self.assertEqual('nope', conf.config[PROJECT]['remote-only'])
self.assertEqual('new value', conf.config[PROJECT]['remote-only'])
def test_remote_none(self):
self.api.attribute_value_save('Config', '')
# don't crash
self.config.apply_remote(self.api)
self.load_config('not_real_project')
self.assertTrue(True) # Did not crash!
def test_pattern_order(self):
# Add pattern to defaults in order to identify which was matched.
@ -56,7 +59,7 @@ class TestConfig(unittest.TestCase):
# Ensure each pattern is match instead of catch-all pattern.
patterns = set()
for project in projects:
config = Config(project)
config = Config(APIURL, project)
patterns.add(conf.config[project]['pattern'])
self.assertEqual(len(patterns), len(DEFAULT))

2
tests/freeze_tests.py
View File

@ -33,7 +33,7 @@ class TestFreeze(unittest.TestCase):
Initialize the configuration
"""
self.obs = OBS()
Config('openSUSE:Factory')
Config(APIURL, 'openSUSE:Factory')
self.api = StagingAPI(APIURL, 'openSUSE:Factory')
def _get_fixture_path(self, filename):

2
tests/obslock_tests.py
View File

@ -11,7 +11,7 @@ from obs import OBS
class TestOBSLock(unittest.TestCase):
def setUp(self):
self.obs = OBS()
Config(PROJECT)
Config(APIURL, PROJECT)
def obs_lock(self, reason='list'):
return OBSLock(APIURL, PROJECT, reason=reason)

2
tests/select_tests.py
View File

@ -32,7 +32,7 @@ class TestSelect(unittest.TestCase):
Initialize the configuration
"""
self.obs = OBS()
Config('openSUSE:Factory')
Config(APIURL, 'openSUSE:Factory')
self.api = StagingAPI(APIURL, 'openSUSE:Factory')
def test_old_frozen(self):

2
tests/unselect_tests.py
View File

@ -11,7 +11,7 @@ from obs import OBS
class TestUnselect(unittest.TestCase):
def setUp(self):
self.obs = OBS()
Config(PROJECT)
Config(APIURL, PROJECT)
self.api = StagingAPI(APIURL, PROJECT)
def test_cleanup_filter(self):

2
totest-manager.py
View File

@ -1040,7 +1040,7 @@ class CommandlineInterface(cmdln.Cmdln):
if not self.options.obs_api_url:
self.options.obs_api_url = self.api_url[project_base]
Config(project)
Config(self.options.obs_api_url, project)
if project not in self.totest_class:
msg = 'Project %s not recognized. Possible values [%s]' % (
project, ', '.join(self.totest_class))

2
update_crawler.py
View File

@ -329,7 +329,7 @@ def main(args):
osc.conf.config['debug'] = args.osc_debug
# initialize stagingapi config
Config(args.to_prj)
Config(osc.conf.config['apiurl'], args.to_prj)
uc = UpdateCrawler(args.from_prj, args.to_prj)
uc.caching = args.cache_requests