Skip to content

Commit 3b1c4d0

Browse files
authored
Merge pull request #205 from ImMin5/master
Fix BaseDict' object has no attribute 'to_dict' error when sync
2 parents 28ec80e + 4c95ec2 commit 3b1c4d0

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from spaceone.identity.manager.plugin_manager import PluginManager

src/spaceone/identity/manager/account_collector_plugin_manager.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ def sync(
5656
return plugin_connector.dispatch("AccountCollector.sync", params)
5757

5858
def get_account_collector_plugin_endpoint_by_vo(self, provider_vo: Provider) -> str:
59-
plugin_info = provider_vo.plugin_info.to_dict()
59+
plugin_info = provider_vo.plugin_info
6060
endpoint, updated_version = self.get_account_collector_plugin_endpoint(
6161
plugin_info, provider_vo.domain_id
6262
)
6363

6464
if updated_version:
6565
_LOGGER.debug(
66-
f'[get_account_collector_plugin_endpoint_by_vo] upgrade plugin version: {plugin_info["version"]} -> {updated_version}'
66+
f'[get_account_collector_plugin_endpoint_by_vo] upgrade plugin version: {plugin_info.get("version")} -> {updated_version}'
6767
)
6868
self.upgrade_account_collector_plugin_version(
6969
provider_vo, endpoint, updated_version
@@ -80,7 +80,7 @@ def get_account_collector_plugin_endpoint(
8080
def upgrade_account_collector_plugin_version(
8181
self, provider_vo: Provider, endpoint: str, updated_version: str
8282
) -> None:
83-
plugin_info = provider_vo.plugin_info.to_dict()
83+
plugin_info = provider_vo.plugin_info
8484
domain_id = provider_vo.domain_id
8585

8686
self.initialize(endpoint)

src/spaceone/identity/service/trusted_account_service.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def sync(self, params: TrustedAccountSyncRequest) -> dict:
244244
JobResponse: 'dict'
245245
"""
246246

247-
job_service: JobService = self.locator.get_service("JobService")
247+
job_service = JobService()
248248

249249
trusted_account_id = params.trusted_account_id
250250
workspace_id = params.workspace_id

0 commit comments

Comments
 (0)