reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

phabricator: kill PhabricatorLister's api_token argument

Browse source 
stick to the existing credentials mechanism provided by ListerHttpTransport.
This commit is contained in:
David Douard 2019-08-30 10:12:41 +02:00
parent 6f56d2c8d7
commit 83d138759c
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
swh/lister/phabricator/lister.py
View file

@ -18,13 +18,11 @@ class PhabricatorLister(IndexingHttpLister):
MODEL = PhabricatorModel
LISTER_NAME = 'phabricator'
def __init__(self, forge_url, instance=None, api_token=None,
override_config=None):
def __init__(self, forge_url, instance=None, override_config=None):
if forge_url.endswith("/"):
forge_url = forge_url[:-1]
self.forge_url = forge_url
api_baseurl = '%s/api/diffusion.repository.search' % forge_url
self.api_token = api_token
if not instance:
instance = urllib.parse.urlparse(forge_url).hostname
self.instance = instance
@ -63,8 +61,6 @@ class PhabricatorLister(IndexingHttpLister):
"""
params = {}
params['headers'] = self.request_headers() or {}
if self.api_token:
return self._build_query_params(params, self.api_token)
instance_creds = self.request_instance_credentials()
if not instance_creds:
raise ValueError(

11
swh/lister/phabricator/tests/test_lister.py
View file

@ -28,9 +28,14 @@ class PhabricatorListerTester(HttpListerTester, unittest.TestCase):
"""
if override_config or self.fl is None:
self.fl = self.Lister(forge_url='https://fakeurl', instance='fake',
api_token='a-1',
override_config=override_config)
credentials = {'phabricator': {'fake': [
{'password': 'toto'}
]}}
override_config = dict(credentials=credentials,
**(override_config or {}))
self.fl = self.Lister(
forge_url='https://fakeurl', instance='fake',
override_config=override_config)
self.fl.INITIAL_BACKOFF = 1
self.fl.reset_backoff()