Skip to content

Commit

Permalink
Merge pull request #73 from ImMin5/master
Browse files Browse the repository at this point in the history
Modify metadata field type 'additional_info' , list -> dict
  • Loading branch information
ImMin5 authored Jul 12, 2024
2 parents e5d234b + 854ede4 commit 684c00b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
13 changes: 7 additions & 6 deletions src/cloudforet/cost_analysis/manager/data_source_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ class DataSourceManager(BaseManager):
def init_response(options):
plugin_metadata = PluginMetadata()

plugin_metadata.additional_info = [
"Unit Price",
"Resource Id",
"Subscription Id",
"Charge Type",
]
plugin_metadata.additional_info = {
"Subscription Name": {"name": "Subscription Name", "visible": True},
"Unit Price": {"name": "Unit Price", "visible": False},
"Resource Id": {"name": "Resource Id", "visible": False},
"Subscription Id": {"name": "Subscription Id", "visible": False},
"Charge Type": {"name": "Charge Type", "visible": False},
}

if currency := options.get("currency"):
plugin_metadata.currency = currency
Expand Down
7 changes: 6 additions & 1 deletion src/cloudforet/cost_analysis/model/data_source_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ class MetadataDataInfo(Model):
unit = StringType(required=True)


class MetadataAdditionalInfo(Model):
name = StringType(required=True)
visible = BooleanType(default=False)


class PluginMetadata(Model):
data_source_rules = ListType(
ModelType(DataSourceRule), default=_DEFAULT_DATA_SOURCE_RULES
Expand All @@ -71,4 +76,4 @@ class PluginMetadata(Model):
exclude_license_cost = BooleanType(default=False)
cost_info = DictType(StringType, default={})
data_info = DictType(ModelType(MetadataDataInfo), default={})
additional_info = ListType(StringType, default=[])
additional_info = DictType(ModelType(MetadataAdditionalInfo), default={})

0 comments on commit 684c00b

Please sign in to comment.