From cf0117e4d8863566034ef72eefadc9d2464eb839 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 6 Apr 2022 15:12:01 +0000 Subject: [PATCH] Restyled by black --- .../minos/networks/discovery/connectors.py | 4 +- .../test_networks/test_decorators/test_api.py | 49 ++++++++++++++++--- .../test_decorators/test_collectors.py | 16 ++++-- .../tests/utils.py | 11 ++++- .../tests/test_graphql/test_decorators.py | 13 +++-- .../minos-router-graphql/tests/utils.py | 12 ++++- 6 files changed, 86 insertions(+), 19 deletions(-) diff --git a/packages/core/minos-microservice-networks/minos/networks/discovery/connectors.py b/packages/core/minos-microservice-networks/minos/networks/discovery/connectors.py index 4da9ec244..bb4acef18 100644 --- a/packages/core/minos-microservice-networks/minos/networks/discovery/connectors.py +++ b/packages/core/minos-microservice-networks/minos/networks/discovery/connectors.py @@ -104,8 +104,8 @@ def _endpoints_from_config(config: Config) -> list[dict[str, Any]]: for name in config.get_services(): decorators = EnrouteCollector(name, config).get_rest_command_query() endpoints += [ - {"url": decorator.url, "method": decorator.method} | decorator.kwargs for decorator in - set(chain(*decorators.values())) + {"url": decorator.url, "method": decorator.method} | decorator.kwargs + for decorator in set(chain(*decorators.values())) ] endpoints.sort(key=itemgetter("url", "method")) diff --git a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py index 077701675..ac9ba4ac4 100644 --- a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py +++ b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py @@ -17,21 +17,54 @@ def test_rest_command(self): self.assertEqual(RestCommandEnrouteDecorator("tickets/", "GET"), decorator) def test_rest_command_kwargs(self): - decorator = enroute.rest.command(path="tickets/", method="GET", authorized=True, - allowed_groups=['super_admin', 'admin', ]) + decorator = enroute.rest.command( + path="tickets/", + method="GET", + authorized=True, + allowed_groups=[ + "super_admin", + "admin", + ], + ) self.assertEqual( - RestCommandEnrouteDecorator("tickets/", "GET", authorized=True, allowed_groups=['super_admin', 'admin', ]), - decorator) + RestCommandEnrouteDecorator( + "tickets/", + "GET", + authorized=True, + allowed_groups=[ + "super_admin", + "admin", + ], + ), + decorator, + ) def test_rest_query(self): decorator = enroute.rest.query(path="tickets/", method="GET") self.assertEqual(RestQueryEnrouteDecorator("tickets/", "GET"), decorator) def test_rest_query_kwargs(self): - decorator = enroute.rest.query(path="tickets/", method="GET", authorized=True, - allowed_groups=['super_admin', 'admin', ]) - self.assertEqual(RestQueryEnrouteDecorator("tickets/", "GET", authorized=True, - allowed_groups=['super_admin', 'admin', ]), decorator) + decorator = enroute.rest.query( + path="tickets/", + method="GET", + authorized=True, + allowed_groups=[ + "super_admin", + "admin", + ], + ) + self.assertEqual( + RestQueryEnrouteDecorator( + "tickets/", + "GET", + authorized=True, + allowed_groups=[ + "super_admin", + "admin", + ], + ), + decorator, + ) def test_rest_event_raises(self): with self.assertRaises(AttributeError): diff --git a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_collectors.py b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_collectors.py index cf6f88f15..703c19086 100644 --- a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_collectors.py +++ b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_collectors.py @@ -14,7 +14,8 @@ ) from tests.utils import ( FakeService, - FakeServiceWithGetEnroute, FakeServiceWithKwargs, + FakeServiceWithGetEnroute, + FakeServiceWithKwargs, ) @@ -62,8 +63,17 @@ def test_get_rest_command_query_kwargs(self): observed = analyzer.get_rest_command_query() expected = { - "get_tickets": {RestQueryEnrouteDecorator("tickets/", "GET", authorized=True, - allowed_groups=['super_admin', 'admin', ])}, + "get_tickets": { + RestQueryEnrouteDecorator( + "tickets/", + "GET", + authorized=True, + allowed_groups=[ + "super_admin", + "admin", + ], + ) + }, } self.assertEqual(expected, observed) diff --git a/packages/core/minos-microservice-networks/tests/utils.py b/packages/core/minos-microservice-networks/tests/utils.py index 42c0fad67..a4521c97b 100644 --- a/packages/core/minos-microservice-networks/tests/utils.py +++ b/packages/core/minos-microservice-networks/tests/utils.py @@ -174,12 +174,21 @@ def bar(self, request: Request): class FakeServiceWithKwargs: """For testing purposes.""" - @enroute.rest.query(path="tickets/", method="GET", authorized=True, allowed_groups=['super_admin', 'admin', ]) + @enroute.rest.query( + path="tickets/", + method="GET", + authorized=True, + allowed_groups=[ + "super_admin", + "admin", + ], + ) @enroute.broker.query(topic="GetTickets") async def get_tickets(self, request: Request) -> Response: """For testing purposes.""" return Response(": ".join(("Get Tickets", await request.content()))) + class FakeServiceWithGetEnroute: """For testing purposes.""" diff --git a/packages/plugins/minos-router-graphql/tests/test_graphql/test_decorators.py b/packages/plugins/minos-router-graphql/tests/test_graphql/test_decorators.py index 99e6974ac..b6dfcddbb 100644 --- a/packages/plugins/minos-router-graphql/tests/test_graphql/test_decorators.py +++ b/packages/plugins/minos-router-graphql/tests/test_graphql/test_decorators.py @@ -43,9 +43,16 @@ def test_get_all_queries_with_kwargs(self): expected = { "get_order": { - GraphQlQueryEnrouteDecorator(name="order", argument=GraphQLField(GraphQLString), output=GraphQLString, - authorized=True, - allowed_groups=['super_admin', 'admin', ]) + GraphQlQueryEnrouteDecorator( + name="order", + argument=GraphQLField(GraphQLString), + output=GraphQLString, + authorized=True, + allowed_groups=[ + "super_admin", + "admin", + ], + ) }, } diff --git a/packages/plugins/minos-router-graphql/tests/utils.py b/packages/plugins/minos-router-graphql/tests/utils.py index 1740d20db..f4f31389d 100644 --- a/packages/plugins/minos-router-graphql/tests/utils.py +++ b/packages/plugins/minos-router-graphql/tests/utils.py @@ -83,8 +83,16 @@ class FakeQueryService2: """For testng purposes.""" # noinspection PyUnusedLocal - @enroute.graphql.query(name="order", argument=GraphQLField(GraphQLString), output=GraphQLString, authorized=True, - allowed_groups=['supèr_admin', 'admin', ]) + @enroute.graphql.query( + name="order", + argument=GraphQLField(GraphQLString), + output=GraphQLString, + authorized=True, + allowed_groups=[ + "supèr_admin", + "admin", + ], + ) def get_order(self, request: Request): """For testng purposes."""