Skip to content

Commit

Permalink
avoid merging account map
Browse files Browse the repository at this point in the history
  • Loading branch information
iakov-aws committed Nov 14, 2023
1 parent fc14033 commit 647f612
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion cid/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,9 @@ def __loadPlugins(self) -> dict:
print(f"\t{ep.name} loaded")
plugins.update({ep.value: plugin})
try:
self.resources = merge_objects(self.resources, plugin.provides(), depth=1)
resources = plugin.provides()
resources.get('views', {}).pop('account_map', None)
self.resources = merge_objects(self.resources, resources, depth=1)
except AttributeError:
logger.warning(f'Failed to load {ep.name}')
print('\n')
Expand Down Expand Up @@ -315,6 +317,7 @@ def load_resource_file(self, source):
except Exception as exc:
logger.warning(f'Failed to load resources from {source}: {exc}')
return
resources.get('views', {}).pop('account_map', None) # Exclude account map as it is a special view
self.resources = merge_objects(self.resources, resources, depth=1)

def load_catalog(self, catalog_url):
Expand Down

0 comments on commit 647f612

Please sign in to comment.