From e7deacdc5ed9ca4faef3375e5b962d7b000ba9b5 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 18 Oct 2019 10:49:26 +0300 Subject: Revert "Drop: TransactionalState.has_resource (bad, racy)" This reverts commit 2cdb28a8350478a5d92607be8c95d5e5d43f4dfc. --- ick2/apibase.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ick2/apibase.py') diff --git a/ick2/apibase.py b/ick2/apibase.py index 19f70e4..b950c11 100644 --- a/ick2/apibase.py +++ b/ick2/apibase.py @@ -182,6 +182,8 @@ class ResourceApiBase(APIbase): as_dict = self.mangle_new_resource(body) name = self.get_resource_name(as_dict) + if self._trans.has_resource(token, self._type_name, name): + raise ick2.ExistsAlready(name) with self._trans.new(token, self._type_name, name) as resource: resource.from_dict(as_dict) @@ -196,6 +198,8 @@ class ResourceApiBase(APIbase): def update(self, body, name, token=None, **kwargs): name = self.get_resource_name(body) + if not self._trans.has_resource(token, self._type_name, name): + raise ick2.NotFound(kind=self._type_name, name=name) with self._trans.modify(token, self._type_name, name) as resource: as_dict = self.mangle_updated_resource(resource.as_dict(), body) @@ -207,4 +211,6 @@ class ResourceApiBase(APIbase): return new def delete(self, name, token=None, **kwargs): + if not self._trans.has_resource(token, self._type_name, name): + raise ick2.NotFound(kind=self._type_name, name=name) self._trans.remove_resource(token, self._type_name, name) -- cgit v1.2.1