From 7a9aac491e3e0072ad788c836caa478e7e38fdd3 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 16 Oct 2020 13:07:02 +0200 Subject: [PATCH] Use /info for resolution API (#2136) --- supervisor/api/__init__.py | 2 +- supervisor/api/resolution.py | 2 +- supervisor/api/security.py | 3 +-- tests/api/test_resolution.py | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/supervisor/api/__init__.py b/supervisor/api/__init__.py index b3562f64b..57ea4a680 100644 --- a/supervisor/api/__init__.py +++ b/supervisor/api/__init__.py @@ -199,7 +199,7 @@ class RestAPI(CoreSysAttributes): self.webapp.add_routes( [ - web.get("/resolution", api_resolution.base), + web.get("/resolution/info", api_resolution.info), web.post( "/resolution/suggestion/{suggestion}", api_resolution.apply_suggestion, diff --git a/supervisor/api/resolution.py b/supervisor/api/resolution.py index b2845471c..bf933f4fc 100644 --- a/supervisor/api/resolution.py +++ b/supervisor/api/resolution.py @@ -14,7 +14,7 @@ class APIResoulution(CoreSysAttributes): """Handle REST API for resoulution.""" @api_process - async def base(self, request: web.Request) -> Dict[str, Any]: + async def info(self, request: web.Request) -> Dict[str, Any]: """Return network information.""" return { ATTR_UNSUPPORTED: self.sys_resolution.unsupported, diff --git a/supervisor/api/security.py b/supervisor/api/security.py index cf5b9ea90..7f6d79ca9 100644 --- a/supervisor/api/security.py +++ b/supervisor/api/security.py @@ -44,7 +44,6 @@ NO_SECURITY_CHECK = re.compile( OBSERVER_CHECK = re.compile( r"^(?:" r"|/[^/]+/info" - r"|/resolution.*" r")$" ) @@ -95,7 +94,7 @@ ADDONS_ROLE_ACCESS = { r"|/network/.+" r"|/observer/.+" r"|/os/.+" - r"|/resolution.*" + r"|/resolution/.+" r"|/snapshots.*" r"|/supervisor/.+" r")$" diff --git a/tests/api/test_resolution.py b/tests/api/test_resolution.py index 9713300ec..78daa419c 100644 --- a/tests/api/test_resolution.py +++ b/tests/api/test_resolution.py @@ -24,7 +24,7 @@ async def test_api_resolution_base(coresys: CoreSys, api_client): ) coresys.resolution.create_issue(IssueType.FREE_SPACE, ContextType.SYSTEM) - resp = await api_client.get("/resolution") + resp = await api_client.get("/resolution/info") result = await resp.json() assert UnsupportedReason.OS in result["data"][ATTR_UNSUPPORTED] assert (