Merge pull request #50 from stat-kwon/master

Change so that TOKEN can be obtained from GLOBAL when using SpaceConnector in worker
cloudforet-io · Jun 28, 2023 · 860b03d · 860b03d
2 parents 09e8d7a + 957e248
commit 860b03d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/spaceone/monitoring/manager/identity_manager.py b/src/spaceone/monitoring/manager/identity_manager.py
@@ -1,6 +1,7 @@
 import logging
 
 from spaceone.core import cache
+from spaceone.core import config
 from spaceone.core.manager import BaseManager
 from spaceone.core.connector.space_connector import SpaceConnector
 
@@ -16,7 +17,8 @@ class IdentityManager(BaseManager):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.identity_connector: SpaceConnector = self.locator.get_connector('SpaceConnector', service='identity')
+        self.identity_connector: SpaceConnector = self.locator.get_connector('SpaceConnector', service='identity',
+                                                                             token=config.get_global('TOKEN'))
 
     def get_domain(self, domain_id):
         return self.identity_connector.dispatch('Domain.get', {'domain_id': domain_id})

diff --git a/src/spaceone/monitoring/manager/notification_manager.py b/src/spaceone/monitoring/manager/notification_manager.py
@@ -1,5 +1,6 @@
 import logging
 
+from spaceone.core import config
 from spaceone.core.manager import BaseManager
 from spaceone.core.connector.space_connector import SpaceConnector
 
@@ -11,7 +12,8 @@ class NotificationManager(BaseManager):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.notification_connector: SpaceConnector = self.locator.get_connector('SpaceConnector',
-                                                                                 service='notification')
+                                                                                 service='notification',
+                                                                                 token=config.get_global('TOKEN'))
 
     def create_notification(self, message):
         _LOGGER.debug(f'Notify message: {message}')