AWS Reserved Instances Recommendation Currency Conversion Fix (#1540)

* fix * fix
flexera-public · Oct 12, 2023 · 50bcf49 · 50bcf49
1 parent 2c67a03
commit 50bcf49
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/cost/aws/reserved_instances/recommendations/CHANGELOG.md b/cost/aws/reserved_instances/recommendations/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.1
+
+- Fixed issue where policy would fail to do proper currency conversion
+
 ## v3.0
 
 - Policy now automatically converts savings to local currency when appropriate

diff --git a/cost/aws/reserved_instances/recommendations/aws_reserved_instance_recommendations.pt b/cost/aws/reserved_instances/recommendations/aws_reserved_instance_recommendations.pt
@@ -7,7 +7,7 @@ severity "medium"
 category "Cost"
 default_frequency "weekly"
 info(
-  version: "3.0",
+  version: "3.1",
   provider: "AWS",
   service: "Compute",
   policy_set: "Reserved Instances",
@@ -458,11 +458,11 @@ script "js_currency", type:"javascript" do
   result = ds_currency_target
   result['exchange_rate'] = 1
 
-  if (ds_currency_conversion['to'] != undefined) {
+  if (ds_currency_conversion[0]['to'] != undefined) {
     currency_code = ds_currency_target['code']
     current_month = parseInt(new Date().toISOString().split('-')[1])
 
-    conversion_block = _.find(ds_currency_conversion['to'][currency_code], function(item) {
+    conversion_block = _.find(ds_currency_conversion[0]['to'][currency_code], function(item) {
       return item['month'] == current_month
     })
 
@@ -605,14 +605,14 @@ script "js_ri_normalization", type: "javascript" do
 
   conversion_message = ""
 
-  if (ds_currency['code'] != currency && ds_currency_conversion['to'] != undefined && exchange_rate != 1) {
+  if (ds_currency['code'] != currency && ds_currency_conversion.length > 0 && exchange_rate != 1) {
     conversion_message = [
       "Savings values were converted from ", currency, " to ", ds_currency['code'],
       " using an exchange rate of ", exchange_rate, ".\n\n"
     ].join('')
   }
 
-  if (ds_currency['code'] != currency && ds_currency_conversion['to'] == undefined) {
+  if (ds_currency['code'] != currency && ds_currency_conversion.length == 0) {
     conversion_message = "Savings values are in ", currency, " due to a malfunction with Flexera's internal currency conversion API. Please contact Flexera support to report this issue."
   }