chore: make permission registration synchronous.

Author: tjholm

nitric/resources/base.py

@@ -94,13 +94,8 @@ async def _register_policy_async(self, permissions: List[str]):
                                                                 policy=policy))
         except GRPCError as grpc_err:
             raise exception_from_grpc_error(grpc_err)
-        pass
 
     def _register_policy(self, permissions: List[str]):
-        try:
-            loop = asyncio.get_running_loop()
-            loop.create_task(self._register_policy_async(permissions))
-        except RuntimeError:
-            loop = asyncio.get_event_loop()
-            loop.run_until_complete(self._register_policy_async(permissions))
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(self._register_policy_async(permissions))
 

tests/resources/test_buckets.py

@@ -31,7 +31,7 @@ class Object(object):
 
 
 class BucketTest(IsolatedAsyncioTestCase):
-    async def test_create_allow_writing(self):
+    def test_create_allow_writing(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -49,7 +49,7 @@ async def test_create_allow_writing(self):
             )
         ))
 
-    async def test_create_allow_reading(self):
+    def test_create_allow_reading(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -67,7 +67,7 @@ async def test_create_allow_reading(self):
             )
         ))
 
-    async def test_create_allow_deleting(self):
+    def test_create_allow_deleting(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -85,7 +85,7 @@ async def test_create_allow_deleting(self):
             )
         ))
 
-    async def test_create_allow_all(self):
+    def test_create_allow_all(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -108,7 +108,7 @@ async def test_create_allow_all(self):
             )
         ))
 
-    async def test_create_allow_all_reversed_policy(self):
+    def test_create_allow_all_reversed_policy(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -131,37 +131,3 @@ async def test_create_allow_all_reversed_policy(self):
             )
         ))
 
-
-    async def test_write(self):
-        mock_declare = AsyncMock()
-        mock_write = AsyncMock()
-        mock_response = Object()
-        mock_declare.return_value = mock_response
-
-        contents = b"some text as bytes"
-
-        with patch("nitricapi.nitric.resource.v1.ResourceServiceStub.declare", mock_declare):
-            with patch("nitricapi.nitric.storage.v1.StorageServiceStub.write", mock_write):
-                b = bucket("test-bucket").allow(["writing"])
-                file = b.file("test-file")
-                await file.write(contents)
-
-        # Check expected resources were declared
-        mock_declare.assert_called_with(resource_declare_request=ResourceDeclareRequest(
-            resource=Resource(type=ResourceType.Policy),
-            policy=PolicyResource(
-                principals=[Resource(type=ResourceType.Function)],
-                actions=[
-                    Action.BucketFilePut,
-                ],
-                resources=[Resource(type=ResourceType.Bucket, name="test-bucket")]
-            )
-        ))
-
-        # Check correct data was written
-        mock_write.assert_called_with(storage_write_request=StorageWriteRequest(
-            bucket_name="test-bucket",
-            key="test-file",
-            body=contents
-
-        ))

tests/resources/test_collections.py

@@ -34,7 +34,7 @@ class Object(object):
 
 
 class CollectionTest(IsolatedAsyncioTestCase):
-    async def test_create_allow_writing(self):
+    def test_create_allow_writing(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -55,7 +55,7 @@ async def test_create_allow_writing(self):
             )
         ))
 
-    async def test_create_allow_reading(self):
+    def test_create_allow_reading(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -77,7 +77,7 @@ async def test_create_allow_reading(self):
             )
         ))
 
-    async def test_create_allow_deleting(self):
+    def test_create_allow_deleting(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -98,7 +98,7 @@ async def test_create_allow_deleting(self):
             )
         ))
 
-    async def test_create_allow_all(self):
+    def test_create_allow_all(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -124,7 +124,7 @@ async def test_create_allow_all(self):
             )
         ))
 
-    async def test_create_allow_all_reversed_policy(self):
+    def test_create_allow_all_reversed_policy(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response

tests/resources/test_queues.py

@@ -29,7 +29,7 @@ class Object(object):
 
 
 class QueueTest(IsolatedAsyncioTestCase):
-    async def test_create_allow_sending(self):
+    def test_create_allow_sending(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -51,7 +51,7 @@ async def test_create_allow_sending(self):
             )
         ))
 
-    async def test_create_allow_receiving(self):
+    def test_create_allow_receiving(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -73,7 +73,7 @@ async def test_create_allow_receiving(self):
             )
         ))
 
-    async def test_create_allow_all(self):
+    def test_create_allow_all(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response

tests/resources/test_secrets.py

@@ -29,7 +29,7 @@ class Object(object):
 
 
 class SecretTest(IsolatedAsyncioTestCase):
-    async def test_allow_put(self):
+    def test_allow_put(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response
@@ -50,7 +50,7 @@ async def test_allow_put(self):
         ))
 
 
-    async def test_allow_access(self):
+    def test_allow_access(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response

tests/resources/test_topics.py

@@ -36,7 +36,7 @@ def __init__(self):
 
 
 class TopicTest(IsolatedAsyncioTestCase):
-    async def test_create_allow_publishing(self):
+    def test_create_allow_publishing(self):
         mock_declare = AsyncMock()
         mock_response = Object()
         mock_declare.return_value = mock_response