diff options
author | Lars Wirzenius <liw@liw.fi> | 2017-11-25 00:08:39 +0100 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2017-11-25 00:08:39 +0100 |
commit | bdadf8cf1acddcbec060a529bedafd0abb5913f2 (patch) | |
tree | 272cec39f0f4f7b373ba3fe564ac00f00ab1b688 | |
parent | 1e141c37b49536fe65e2c7dde3eee69b14b3eb56 (diff) | |
download | ick2-bdadf8cf1acddcbec060a529bedafd0abb5913f2.tar.gz |
Fix: adapt to new keyword argument from apifw
Handle any keyword arguments that may happen in the future.
-rw-r--r-- | ick2/apibase.py | 20 | ||||
-rw-r--r-- | ick2/buildsapi.py | 6 | ||||
-rw-r--r-- | ick2/logapi.py | 6 | ||||
-rw-r--r-- | ick2/projectapi.py | 7 | ||||
-rw-r--r-- | ick2/versionapi.py | 2 | ||||
-rw-r--r-- | ick2/workapi.py | 4 |
6 files changed, 23 insertions, 22 deletions
diff --git a/ick2/apibase.py b/ick2/apibase.py index c7abc45..7694b47 100644 --- a/ick2/apibase.py +++ b/ick2/apibase.py @@ -113,19 +113,19 @@ class APIbase: return ick2.OK(body) return wrapper - def create(self, body): + def create(self, body, **kwargs): raise NotImplementedError() - def update(self, body, name): + def update(self, body, name, **kwargs): raise NotImplementedError() - def delete(self, name): + def delete(self, name, **kwargs): raise NotImplementedError() - def list(self): + def list(self, **kwargs): raise NotImplementedError() - def show(self, name): + def show(self, name, **kwargs): raise NotImplementedError() @@ -135,23 +135,23 @@ class ResourceApiBase(APIbase): super().__init__(state) self._type_name = type_name - def list(self): + def list(self, **kwargs): return { self._type_name: self._state.get_resources(self._type_name), } - def show(self, name): + def show(self, name, **kwargs): return self._state.get_resource(self._type_name, name) - def create(self, body): + def create(self, body, **kwargs): return self._state.add_resource( self._type_name, self.get_resource_name(body), body) def get_resource_name(self, resource): # pragma: no cover raise NotImplementedError() - def update(self, body, name): + def update(self, body, name, **kwargs): return self._state.update_resource(self._type_name, name, body) - def delete(self, name): + def delete(self, name, **kwargs): self._state.remove_resource(self._type_name, name) diff --git a/ick2/buildsapi.py b/ick2/buildsapi.py index 2d5b5f9..9ee00b7 100644 --- a/ick2/buildsapi.py +++ b/ick2/buildsapi.py @@ -24,13 +24,13 @@ class BuildsAPI(ick2.ResourceApiBase): # pragma: no cover def get_resource_name(self, resource): return resource['build'] - def create(self, body): # pragma: no cover + def create(self, body, **kwargs): # pragma: no cover raise ick2.MethodNotAllowed('Creating builds directly is not allowed') - def update(self, body, name): # pragma: no cover + def update(self, body, name, **kwargs): # pragma: no cover raise ick2.MethodNotAllowed('Updating builds directly is not allowed') - def list(self): + def list(self, **kwargs): result = super().list() items = result[self._type_name] items.sort(key=lambda x: x.get('build_id')) diff --git a/ick2/logapi.py b/ick2/logapi.py index 2a6f2f4..37bf6aa 100644 --- a/ick2/logapi.py +++ b/ick2/logapi.py @@ -24,13 +24,13 @@ class LogAPI(ick2.ResourceApiBase): # pragma: no cover def get_resource_name(self, resource): return resource['log'] - def create(self, body): # pragma: no cover + def create(self, body, **kwargs): # pragma: no cover raise ick2.MethodNotAllowed('Creating builds directly is not allowed') - def update(self, body, name): # pragma: no cover + def update(self, body, name, **kwargs): # pragma: no cover raise ick2.MethodNotAllowed('Updating builds directly is not allowed') - def show(self, name): + def show(self, name, **kwargs): log = self._state.get_resource('log', str(name)) ick2.log.log('info', msg_text='Returning log', log=log) return log['log'] diff --git a/ick2/projectapi.py b/ick2/projectapi.py index 89cad8f..b0c9da1 100644 --- a/ick2/projectapi.py +++ b/ick2/projectapi.py @@ -48,7 +48,7 @@ class ProjectAPI(ick2.ResourceApiBase): }, ] - def get_pipeline(self, project, pipeline): + def get_pipeline(self, project, pipeline, **kwargs): p = self._state.get_resource(self._type_name, project) for pl in p['pipelines']: if pl['name'] == pipeline: @@ -58,7 +58,7 @@ class ProjectAPI(ick2.ResourceApiBase): raise ick2.NotFound() def set_pipeline_callback( - self, body, project, pipeline): # pragma: no cover + self, body, project, pipeline, **kwargs): # pragma: no cover return self.set_pipeline(body['status'], project, pipeline) def set_pipeline(self, state, project, pipeline): @@ -80,5 +80,6 @@ class ProjectAPI(ick2.ResourceApiBase): # This needs to go away as it is not protected. Once an IDP is # added. - def trigger_pipeline(self, project, pipeline): # pragma: no cover + def trigger_pipeline( + self, project, pipeline, **kwargs): # pragma: no cover return self.set_pipeline('triggered', project, pipeline) diff --git a/ick2/versionapi.py b/ick2/versionapi.py index f17c333..a997fa5 100644 --- a/ick2/versionapi.py +++ b/ick2/versionapi.py @@ -30,7 +30,7 @@ class VersionAPI(ick2.APIbase): } ] - def get_version(self): + def get_version(self, **kwargs): return {'version': ick2.__version__} def create(self, *args): # pragma: no cover diff --git a/ick2/workapi.py b/ick2/workapi.py index 8c2572d..81bff66 100644 --- a/ick2/workapi.py +++ b/ick2/workapi.py @@ -38,7 +38,7 @@ class WorkAPI(ick2.APIbase): }, ] - def get_work(self, worker): + def get_work(self, worker, **kwargs): worker_state = self._workers.get_worker(worker) if not worker_state.get('doing'): project, pipeline = self._pick_triggered_pipeline() @@ -103,7 +103,7 @@ class WorkAPI(ick2.APIbase): } self._state.add_resource('log', str(build_id), log) - def update_work(self, update): + def update_work(self, update, **kwargs): if 'worker' not in update: # pragma: no cover raise ick2.BadUpdate('no worker specified') |