fix: await task instead of generated co-routine.

Author: tjholm

nitric/resources/base.py

@@ -20,6 +20,7 @@
 
 import asyncio
 from abc import ABC, abstractmethod
+from asyncio import Task
 
 from typing import TypeVar, Type, Coroutine, Union
 
@@ -33,7 +34,7 @@ class BaseResource(ABC):
 
     def __init__(self):
         """Construct a new resource."""
-        self._reg: Union[Coroutine, None] = None
+        self._reg: Union[Task, None] = None
 
     @abstractmethod
     async def _register(self):
@@ -48,10 +49,10 @@ def make(cls: Type[T], name: str) -> T:
         """
         # Todo: store the resource reference in a cache to avoid duplicate registrations
         r = cls(name)
-        r._reg = r._register()
+        # r._reg = r._register()
         try:
             loop = asyncio.get_running_loop()
-            loop.create_task(r._reg)
+            r._reg = loop.create_task(r._register())
         except RuntimeError:
             loop = asyncio.get_event_loop()
             loop.run_until_complete(r._reg)

nitric/resources/buckets.py

@@ -88,7 +88,7 @@ async def allow(self, permissions: List[str]) -> BucketRef:
         """Request the required permissions for this resource."""
         # Ensure registration of the resource is complete before requesting permissions.
         if self._reg is not None:
-            await asyncio.wait({self._reg})
+            await self._reg
 
         policy = PolicyResource(
             principals=[Resource(type=ResourceType.Function)],

nitric/resources/collections.py

@@ -86,7 +86,7 @@ async def allow(self, permissions: List[Union[CollectionPermission, str]]) -> Co
         """Request the required permissions for this collection."""
         # Ensure registration of the resource is complete before requesting permissions.
         if self._reg is not None:
-            await asyncio.wait({self._reg})
+            await self._reg
 
         policy = PolicyResource(
             principals=[Resource(type=ResourceType.Function)],

nitric/resources/queues.py

@@ -86,7 +86,7 @@ async def allow(self, permissions: List[Union[QueuePermission, str]]) -> QueueRe
         """Request the required permissions for this queue."""
         # Ensure registration of the resource is complete before requesting permissions.
         if self._reg is not None:
-            await asyncio.wait({self._reg})
+            await self._reg
 
         policy = PolicyResource(
             principals=[Resource(type=ResourceType.Function)],

nitric/resources/secrets.py

@@ -87,7 +87,7 @@ async def allow(self, permissions: List[Union[SecretPermission, str]]) -> Secret
         """Request the specified permissions to this resource."""
         # Ensure registration of the resource is complete before requesting permissions.
         if self._reg is not None:
-            await asyncio.wait({self._reg})
+            await self._reg
 
         policy = PolicyResource(
             principals=[Resource(type=ResourceType.Function)],