Skip to content

Commit c2a987a

Browse files
authored
Merge pull request #2 from ImMin5/master
Fix error NoneType object error
2 parents 50eb742 + b299d95 commit c2a987a

File tree

5 files changed

+12
-61
lines changed

5 files changed

+12
-61
lines changed

Diff for: src/plugin/manager/advisor/recommendation_cost_manager.py

+6-16
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ def create_cloud_service(self, options: dict, secret_data: dict, schema: str):
3939
category = recommendation_info.get("category")
4040
self.cloud_service_type = category
4141

42-
potential_yearly_savings_based_on_retail_pricing = recommendation_info.get("extended_properties").get(
43-
"annualSavingsAmount")
44-
recommendation_info["potential_yearly_savings_based_on_retail_pricing_display"] = float(
45-
potential_yearly_savings_based_on_retail_pricing)
42+
extended_properties = recommendation_info.get("extended_properties", {}) or {}
43+
if extended_properties:
44+
potential_yearly_savings_based_on_retail_pricing = extended_properties.get("annualSavingsAmount")
45+
recommendation_info["potential_yearly_savings_based_on_retail_pricing_display"] = float(
46+
potential_yearly_savings_based_on_retail_pricing)
4647

4748
if recommendation_info.get("impacted_field") == "Microsoft.Subscriptions/subscriptions":
4849
recommendation_info["impacted_value_display"] = recommendation_info.get("subscription_name")
@@ -65,7 +66,7 @@ def create_cloud_service(self, options: dict, secret_data: dict, schema: str):
6566
)
6667
)
6768
except Exception as e:
68-
_LOGGER.error(f"[create_cloud_service] Error {self.service} {e}")
69+
_LOGGER.error(f"[create_cloud_service] Error {self.service} {e}", exc_info=True)
6970
error_responses.append(
7071
make_error_response(
7172
error=e,
@@ -93,17 +94,6 @@ def create_cloud_service_type(self):
9394
}
9495
)
9596

96-
@staticmethod
97-
def _create_impact_updates_display(updates: list, impacted_service: str, impacted_region: dict) -> list:
98-
impact_updates_display = []
99-
for update in updates:
100-
update.update(
101-
{"impacted_service_display": impacted_service,
102-
"impacted_region_display": impacted_region.get("impacted_region")}
103-
)
104-
impact_updates_display.append(update)
105-
return impact_updates_display
106-
10797
@staticmethod
10898
def _get_name_from_short_description(short_description: dict) -> str:
10999
return short_description["problem"]

Diff for: src/plugin/metadata/advisor/performance.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ table:
2020
- Impact: data.impact
2121
- Description: data.short_description.problem
2222
- Category: data.category
23-
- Potential yearly savings based on retail pricing: data.potential_yearly_savings_based_on_retail_pricing_display
24-
- Impacted resource name: data.impacted_resource_name
23+
- Impacted resource name: data.impacted_value_display
2524
- Impacted resource: data.impacted_field
2625
- Last updated at: data.last_updated
2726

Diff for: src/plugin/metadata/advisor/recommendations.yaml

-38
This file was deleted.

Diff for: src/plugin/metadata/advisor/reliability.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ table:
2020
- Impact: data.impact
2121
- Description: data.short_description.problem
2222
- Category: data.category
23-
- Impacted resource name: data.impacted_value
23+
- Impacted resource name: data.impacted_value_display
2424
- Impacted resource: data.impacted_field
2525
- Last updated at: data.last_updated
2626

Diff for: src/plugin/metadata/advisor/security.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ table:
1414
key: data.impact
1515
desc: true
1616
fields:
17+
- Recommendation name: data.name
1718
- Impact: data.impact
1819
- Description: data.short_description.problem
1920
- Category: data.category
20-
- Potential benefits: data.potential_benefits
21-
- Last updated at: data.last_update_time
22-
- Impact start time: data.impact_start_time
23-
- End time: data.impact_mitigation_time
21+
- Impacted resource name: data.impacted_value_display
22+
- Impacted resource: data.impacted_field
23+
- Last updated at: data.last_updated
2424

2525

2626
tabs.0:

0 commit comments

Comments
 (0)