amazon-pricing 0.1.67 → 0.1.68

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTFhNmIxNTliZWE1M2Y0NWRmMDJmOWFkOTFmYTQzZmEzNThkYzkwMA==
+    OWIyZjg3NWM2MzQ2OTE1MmM0ZGI2YzYzNTg5ZmI1OWZmODE4NTZkNw==
   data.tar.gz: !binary |-
-    MDBkNzhjNTVlYmY5YzY3NmJmOTcyMmVkMTZlMmU3NTRlMDg5NTY1NA==
+    NjAzM2YyM2VkY2RiODU3MDgxZTk1MTJmMDBiMjZiMTA2ZDEzZWE2NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmIyYTI0NzllOWY1MDJlODc1MzkxNDA4MjVkMjAzMjJkNzk1ZTJjMDNmMTg1
-    YjE3ZDI3NTRkZDQ4NDczOWY1OWIzYTFkYTIxMTExMmQyYzg5OGNmNDljNWY3
-    NDg5Y2IzMTllYTZlYjEyMWVjZTRjYzEyM2VhZGI1NzMwM2E4YzY=
+    NjY3YTQ1YTMzNTIwY2FiZWYxMTkzM2VlMDc4MzFjMjczYTQ4ZmQ4MWRiMjIy
+    MGViMGY1NTFhNWM0Y2E4NWZiYjQzZGI5N2MyMzlkYzRjMTk1NjM0ZjNhNzll
+    ZjZhMTUyMzNlMTVhZjkyYjM5MmQ4Y2UyNDRkNGRhNDc2YmZiZjI=
   data.tar.gz: !binary |-
-    NTA2NDA1ZjYyNjJlM2ZmMDIxZGJlYWNjMjc3MTBjNThkN2RjOGI2M2VjNmVi
-    ZTE0MGMxNjI1OGNiN2FhYTkxZDA4MDNjMTE4MWJmY2IwYzYxMWQ2ZmI1OTdl
-    YWU5ZDM4OGViNmNlZjIzZjZhNDUzYWRhZDk0NzkzZjJmZWVhNmI=
+    MmYxNjdlMjIzN2Q3YTY0YzgyYjI4MjUxNGVmOTlmODRkOGRkM2ZkMjM3NzMx
+    MDI4YmUwNjI0YjUwY2Q2OTczOWFjN2YzMDNhZGFlY2JjOThmOTg0MGEwNGUz
+    ZmFlOTQ3OThiMmM1ZGIxYzY5YzRhMjE2MzcxMmVmYzZiNjdmNTQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.67)
+    amazon-pricing (0.1.68)
 
 GEM
   remote: https://rubygems.org/

data/lib/amazon-pricing/definitions/database-type.rb

@@ -32,8 +32,13 @@ module AwsPricing
       'sqlserver_se_multiaz'    => 'Microsoft SQL Server Standard Edition (Multi-AZ)',
       'sqlserver_se_byol'       => 'Microsoft SQL Server Standard Edition (BYOL)',
       'sqlserver_se_byol_multiaz' => 'Microsoft SQL Server Standard Edition (BYOL Multi-AZ)',
+      'sqlserver_ee_standard'     => 'Microsoft SQL Server Enterprise Edition',
+      'sqlserver_ee_multiaz'      => 'Microsoft SQL Server Enterprise Edition (Multi-AZ)',
       'sqlserver_ee_byol'         => 'Microsoft SQL Server Enterprise Edition (BYOL)',
       'sqlserver_ee_byol_multiaz' => 'Microsoft SQL Server Enterprise Edition (BYOL Multi-AZ)',
+      'aurora_multiaz'          => 'Amazon Aurora (Multi-AZ)',
+      'mariadb_standard'        => 'MariaDB Standard',
+      'mariadb_multiaz'         => 'MariaDB (Multi-AZ)',
     }
 
     @@Display_Name_To_Qualified_Database_Name = @@Database_Name_Lookup.invert
@@ -55,6 +60,8 @@ module AwsPricing
       'oracle-ee(byol)_multiaz'  => 'oracle_ee_byol_multiaz',
       'sqlserver-ee(byol)'       => 'sqlserver_ee_byol',
       'sqlserver-ee(byol)_multiaz' => 'sqlserver_ee_byol_multiaz',
+      'sqlserver-ee(li)'         => 'sqlserver_ee_standard',
+      'sqlserver-ee(li)_multiaz' => 'sqlserver_ee_multiaz',
       'sqlserver-ex(li)'         => 'sqlserver_ex',
       'sqlserver-se(byol)'       => 'sqlserver_se_byol',
       'sqlserver-se(byol)_multiaz' => 'sqlserver_se_byol_multiaz',
@@ -63,31 +70,33 @@ module AwsPricing
       'sqlserver-web(li)'        => 'sqlserver_web',
     }
 
-	  @@DB_Deploy_Types = {
-	  	:mysql        => [:standard, :multiaz],
-	  	:postgresql   => [:standard, :multiaz],
-	  	:oracle_se1   => [:standard, :multiaz, :byol, :byol_multiaz],
-	  	:oracle_se    => [:byol, :byol_multiaz],
-	  	:oracle_ee    => [:byol, :byol_multiaz],
-	  	:sqlserver_se => [:standard, :multiaz, :byol, :byol_multiaz],
-	  	:sqlserver_ee => [:byol, :byol_multiaz]
-	  }
+    @@DB_Deploy_Types = {
+      :mysql        => [:standard, :multiaz],
+      :postgresql   => [:standard, :multiaz],
+      :oracle_se1   => [:standard, :multiaz, :byol, :byol_multiaz],
+      :oracle_se    => [:byol, :byol_multiaz],
+      :oracle_ee    => [:byol, :byol_multiaz],
+      :sqlserver_se => [:standard, :multiaz, :byol, :byol_multiaz],
+      :sqlserver_ee => [:byol, :byol_multiaz, :standard, :multiaz],
+      :aurora       => [:multiaz],
+      :mariadb      => [:standard, :multiaz],
+    }
 
   	def self.display_name(name)
 	    @@Database_Name_Lookup[name]
   	end
 
   	def self.get_database_name
-  	  [:mysql, :postgresql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_ex, :sqlserver_web, :sqlserver_se, :sqlserver_ee]
+  	  [:mysql, :postgresql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_ex, :sqlserver_web, :sqlserver_se, :sqlserver_ee, :aurora, :mariadb]
   	end
 
   	def self.get_available_types(db)
-  	  @@DB_Deploy_Types[db]	
+  	  @@DB_Deploy_Types[db]
   	end
 
   	def self.db_mapping(product, is_multi_az)
       if is_multi_az
-        display_name(@@ProductDescription["#{product}_multiaz"])  
+        display_name(@@ProductDescription["#{product}_multiaz"])
       else
         display_name(@@ProductDescription["#{product}"])
 	    end

data/lib/amazon-pricing/definitions/instance-type.rb

@@ -20,7 +20,7 @@ module AwsPricing
   #
   class InstanceType
     attr_accessor :name, :api_name, :memory_in_mb, :platform, :compute_units, :virtual_cores, :disk_type, :disk_in_gb
-    
+
     def initialize(region, api_name, name)
       @category_types = {}
 
@@ -65,14 +65,14 @@ module AwsPricing
     # term = :year_1, :year_3, nil
     def price_per_hour(category_type, type_of_instance, term = nil, is_multi_az = false, isByol = false)
       cat = get_category_type(category_type, is_multi_az, isByol)
-      cat.price_per_hour(type_of_instance, term) unless cat.nil?      
+      cat.price_per_hour(type_of_instance, term) unless cat.nil?
     end
 
     # type_of_instance = :ondemand, :light, :medium, :heavy
     # term = :year_1, :year_3, nil
     def prepay(category_type, type_of_instance, term = nil, is_multi_az = false, isByol = false)
       cat = get_category_type(category_type, is_multi_az, isByol)
-      cat.prepay(type_of_instance, term) unless cat.nil?      
+      cat.prepay(type_of_instance, term) unless cat.nil?
     end
 
     # type_of_instance = :ondemand, :light, :medium, :heavy
@@ -105,8 +105,8 @@ module AwsPricing
               begin
                 api_name = size["size"]
                 @@Memory_Lookup[api_name] = size["memoryGiB"].to_f * 1000
-                @@Compute_Units_Lookup[api_name] = size["ECU"].to_i 
-                @@Virtual_Cores_Lookup[api_name] = size["vCPU"].to_i 
+                @@Compute_Units_Lookup[api_name] = size["ECU"].to_i
+                @@Virtual_Cores_Lookup[api_name] = size["vCPU"].to_i
               rescue UnknownTypeError
                 $stderr.puts "[populate_lookups] WARNING: encountered #{$!.message}"
               end
@@ -172,7 +172,7 @@ module AwsPricing
       'cg1.4xlarge' => 'Cluster GPU Quadruple Extra Large',
       'cc1.4xlarge' => 'Cluster Compute Quadruple Extra Large', 'cc2.8xlarge' => 'Cluster Compute Eight Extra Large',
       't1.micro' => 'Micro',
-      'cr1.8xlarge' => 'High-Memory Cluster Eight Extra Large', 
+      'cr1.8xlarge' => 'High-Memory Cluster Eight Extra Large',
       'hs1.8xlarge' => 'High-Storage Eight Extra Large',
       'g2.2xlarge' => 'Cluster GPU Double Extra Large', 'g2.8xlarge' => 'Cluster GPU Eight Extra Large',
       'c3.large' => 'High-Compute Large', 'c3.xlarge' => 'High-Compute Extra Large', 'c3.2xlarge' => 'High-Compute Double Extra Large', 'c3.4xlarge' => 'High-Compute Quadruple Extra Large', 'c3.8xlarge' => 'High-Compute Eight Extra Large',
@@ -181,7 +181,7 @@ module AwsPricing
       'r3.large' => 'Memory Optimized Large', 'r3.xlarge' => 'Memory Optimized Extra Large', 'r3.2xlarge' => 'Memory Optimized Double Extra Large', 'r3.4xlarge' => 'Memory Optimized Quadruple Extra Large', 'r3.8xlarge' => 'Memory Optimized Eight Extra Large',
       't2.micro' => 'Burstable Performance Instance Micro', 't2.small' => 'Burstable Performance Instance Small', 't2.medium' => 'Burstable Performance Instance Medium', 't2.large' => 'Burstable Performance Instance Large',
       'c4.large' => 'Compute Optimized Large', 'c4.xlarge' => 'Compute Optimized Extra Large', 'c4.2xlarge' => 'Compute Optimized Double Extra Large', 'c4.4xlarge' => 'Compute Optimized Quadruple Extra Large', 'c4.8xlarge' => 'Compute Optimized Eight Extra Large',
-    } 
+    }
     @@Disk_Lookup = {
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
       'm2.xlarge' => 420, 'm2.2xlarge' => 850, 'm2.4xlarge' => 1690,
@@ -198,12 +198,12 @@ module AwsPricing
       'db.m1.small' => 160, 'db.m1.medium' => 410, 'db.m1.large' =>850, 'db.m1.xlarge' => 1690,
       'db.m2.xlarge' => 420, 'db.m2.2xlarge' => 850, 'db.m2.4xlarge' => 1690, 'db.cr1.8xlarge' => 1690,
       'db.t1.micro' => 160,
-      'c3.large' => 32, 'c3.xlarge' => 80, 'c3.2xlarge' => 160, 'c3.4xlarge' => 320, 'c3.8xlarge' => 640, 
+      'c3.large' => 32, 'c3.xlarge' => 80, 'c3.2xlarge' => 160, 'c3.4xlarge' => 320, 'c3.8xlarge' => 640,
       'i2.large' => 360, 'i2.xlarge' => 720, 'i2.2xlarge' => 1440, 'i2.4xlarge' => 2880, 'i2.8xlarge' => 5760,
       'd2.xlarge' => 6000, 'd2.2xlarge' => 12000, 'd2.4xlarge' => 24000, 'd2.8xlarge' => 48000,
       'r3.large' => 32, 'r3.xlarge' => 80, 'r3.2xlarge' => 160, 'r3.4xlarge' => 320, 'r3.8xlarge' => 640,
       't2.micro' => 0, 't2.small' => 0, 't2.medium' => 0, 't2.large' => 0,
-      'c4.large' => 0, 'c4.xlarge' => 0, 'c4.2xlarge' => 0, 'c4.4xlarge' => 0, 'c4.8xlarge' => 0, 
+      'c4.large' => 0, 'c4.xlarge' => 0, 'c4.2xlarge' => 0, 'c4.4xlarge' => 0, 'c4.8xlarge' => 0,
     }
     @@Platform_Lookup = {
       'm1.small' => 32, 'm1.medium' => 32, 'm1.large' => 64, 'm1.xlarge' => 64,
@@ -221,12 +221,12 @@ module AwsPricing
       'db.m1.small' => 64, 'db.m1.medium' => 64, 'db.m1.large' => 64, 'db.m1.xlarge' => 64,
       'db.m2.xlarge' => 64, 'db.m2.2xlarge' => 64, 'db.m2.4xlarge' => 64, 'db.cr1.8xlarge' => 64,
       'db.t1.micro' => 64,
-      'c3.large' => 64, 'c3.xlarge' => 64, 'c3.2xlarge' => 64, 'c3.4xlarge' => 64, 'c3.8xlarge' => 64, 
+      'c3.large' => 64, 'c3.xlarge' => 64, 'c3.2xlarge' => 64, 'c3.4xlarge' => 64, 'c3.8xlarge' => 64,
       'i2.large' => 64, 'i2.xlarge' => 64, 'i2.2xlarge' => 64, 'i2.4xlarge' => 64, 'i2.8xlarge' => 64,
       'd2.xlarge' => 64, 'd2.2xlarge' => 64, 'd2.4xlarge' => 64, 'd2.8xlarge' => 64,
       'r3.large' => 64, 'r3.xlarge' => 64, 'r3.2xlarge' => 64, 'r3.4xlarge' => 64, 'r3.8xlarge' => 64,
       't2.micro' => 64, 't2.small' => 64, 't2.medium' => 64, 't2.large' => 64,
-      'c4.large' => 64, 'c4.xlarge' => 64, 'c4.2xlarge' => 64, 'c4.4xlarge' => 64, 'c4.8xlarge' => 64, 
+      'c4.large' => 64, 'c4.xlarge' => 64, 'c4.2xlarge' => 64, 'c4.4xlarge' => 64, 'c4.8xlarge' => 64,
     }
     @@Disk_Type_Lookup = {
       'm1.small' => :ephemeral, 'm1.medium' => :ephemeral, 'm1.large' => :ephemeral, 'm1.xlarge' => :ephemeral,
@@ -241,16 +241,16 @@ module AwsPricing
       'cr1.8xlarge' => :ssd,
       'hs1.8xlarge' => :ephemeral,
       'g2.2xlarge' => :ssd, 'g2.8xlarge' => :ssd,
-      'unknown' => :ephemeral,      
+      'unknown' => :ephemeral,
       'db.m1.small' => :ephemeral, 'db.m1.medium' => :ephemeral, 'db.m1.large' => :ephemeral, 'db.m1.xlarge' => :ephemeral,
       'db.m2.xlarge' => :ephemeral, 'db.m2.2xlarge' => :ephemeral, 'db.m2.4xlarge' => :ephemeral, 'db.cr1.8xlarge' => :ephemeral,
       'db.t1.micro' => :ebs,
-      'c3.large' => :ssd, 'c3.xlarge' => :ssd, 'c3.2xlarge' => :ssd, 'c3.4xlarge' => :ssd, 'c3.8xlarge' => :ssd, 
+      'c3.large' => :ssd, 'c3.xlarge' => :ssd, 'c3.2xlarge' => :ssd, 'c3.4xlarge' => :ssd, 'c3.8xlarge' => :ssd,
       'i2.large' => :ssd, 'i2.xlarge' => :ssd, 'i2.2xlarge' => :ssd, 'i2.4xlarge' => :ssd, 'i2.8xlarge' => :ssd,
       'd2.xlarge' => :ephemeral, 'd2.2xlarge' => :ephemeral, 'd2.4xlarge' => :ephemeral, 'd2.8xlarge' => :ephemeral,
       'r3.large' => :ssd, 'r3.xlarge' => :ssd, 'r3.2xlarge' => :ssd, 'r3.4xlarge' => :ssd, 'r3.8xlarge' => :ssd,
       't2.micro' => :ebs, 't2.small' => :ebs, 't2.medium' => :ebs, 't2.large' => :ebs,
-      'c4.large' => :ebs, 'c4.xlarge' => :ebs, 'c4.2xlarge' => :ebs, 'c4.4xlarge' => :ebs, 'c4.8xlarge' => :ebs, 
+      'c4.large' => :ebs, 'c4.xlarge' => :ebs, 'c4.2xlarge' => :ebs, 'c4.4xlarge' => :ebs, 'c4.8xlarge' => :ebs,
     }
 
     # NOTE: These are populated by "populate_lookups"
@@ -261,7 +261,7 @@ module AwsPricing
       'cache.m3.medium' => 2780, 'cache.m3.large' => 6050, 'cache.m3.xlarge' => 13300, 'cache.m3.2xlarge' => 27900,
       't2.micro' => 1000, 't2.small' => 2000, 't2.medium' => 4000, 't2.large' => 8000,
       'cache.t2.micro' => 555, 'cache.t2.small' =>  1550, 'cache.t2.medidium' => 3220,
-      
+
       'cache.m1.small' => 1300, 'cache.m1.medium' => 3350, 'cache.m1.large' => 7100, 'cache.m1.xlarge' => 14600,
       'cache.m2.xlarge' => 16700, 'cache.m2.2xlarge' => 33800, 'cache.m2.4xlarge' => 68000,
       'cache.c1.xlarge' => 6600,

data/lib/amazon-pricing/rds-price-list.rb

@@ -1,6 +1,6 @@
 module AwsPricing
   class RdsPriceList < PriceList
-    
+
     def initialize
       super
       InstanceType.populate_lookups
@@ -11,9 +11,11 @@ module AwsPricing
 
     protected
 
-    @@DB_TYPE = [:mysql, :postgresql, :oracle, :sqlserver]
+    # NOTE if you add to DB_TYPE, make sure to update self.get_database_name
+    # in amazon-pricing/lib/amazon-pricing/definitions/database-type.rb
+    @@DB_TYPE = [:mysql, :postgresql, :oracle, :sqlserver, :aurora, :mariadb]
     @@RES_TYPES = [:light, :medium, :heavy]
-    
+
     @@OD_DB_DEPLOY_TYPE = {
       :mysql => {:mysql=>["standard","multiAZ"]},
       :postgresql => {:postgresql=>["standard","multiAZ"]},
@@ -26,8 +28,10 @@ module AwsPricing
         :sqlserver_ex=>["li-ex"],
         :sqlserver_web=>["li-web"],
         :sqlserver_se=>["li-se", "li-se-multiAZ", "byol", "byol-multiAZ"],
-        :sqlserver_ee=>["byol", "byol-multiAZ"]
-      }
+        :sqlserver_ee=>["byol", "byol-multiAZ", "li-ee", 'li-ee-multiAZ']
+      },
+      :aurora => { :aurora => ["multiAZ"] },
+      :mariadb => { :mariadb => ["standard", "multiAZ"] }
     }
 
     @@RESERVED_DB_DEPLOY_TYPE = {
@@ -40,7 +44,9 @@ module AwsPricing
         :postgresql => {:postgresql=>["standard","multiAZ"]},
         :oracle => {:oracle_se1=>["license-included-standard", "license-included-multiAZ"],
                     :oracle_se=>["byol-standard", "byol-multiAZ"]},
-        :sqlserver=> {:sqlserver_se=>["byol-standard", "byol-multiAZ"]}
+        :sqlserver => {:sqlserver_se=>["byol-standard", "byol-multiAZ"]},
+        :aurora => {:aurora => ["multiAZ"]},
+        :mariadb => {:mariadb => ["standard", "multiAZ"]}
     }
 
     @@RESERVED_DB_WITH_SAME_PRICING2 = {
@@ -48,9 +54,15 @@ module AwsPricing
         :postgresql => [:postgresql],
         :oracle_se1 => [:oracle_se1],
         :oracle_se => [:oracle_se, :oracle_se1, :oracle_ee],
-        :sqlserver_se => [:sqlserver_se, :sqlserver_ee]
+        :sqlserver_se => [:sqlserver_se, :sqlserver_ee],
+        :aurora => [:aurora],
+        :mariadb => [:mariadb]
     }
 
+    # old RI pricing was broken out by utilization levels: light, medium & heavy.
+    # this data is not available for new offerings
+    @@NO_LEGACY_RI_PRICING_AVAILABLE = [:aurora, :mariadb]
+
     def is_multi_az?(type)
       return true if type.upcase.match("MULTI-AZ")
       false
@@ -59,7 +71,7 @@ module AwsPricing
     def is_byol?(type)
       return true if type.match("byol")
       false
-    end                                  
+    end
 
     def get_rds_on_demand_instance_pricing
       @@DB_TYPE.each do |db|
@@ -71,7 +83,7 @@ module AwsPricing
             is_multi_az = dp_type.upcase.include?("MULTIAZ")
             dp_type = dp_type.gsub('-multiAZ', '') if db == :sqlserver
 
-            if [:mysql, :postgresql, :oracle].include? db
+            if [:mysql, :postgresql, :oracle, :aurora, :mariadb].include? db
               fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.min.js",:ondemand, db_type, is_byol, is_multi_az)
             elsif db == :sqlserver
               if is_multi_az
@@ -85,13 +97,13 @@ module AwsPricing
             if [:mysql, :postgresql, :oracle].include? db
               fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/pricing-#{dp_type}-deployments.min.js",:ondemand, db_type, is_byol, is_multi_az)
             elsif db == :sqlserver
+              next if dp_type == 'li-ee' || dp_type == 'li-ee-multiAZ'
               if is_multi_az
                 fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/sqlserver-#{dp_type}-ondemand-maz.min.js",:ondemand, db_type, is_byol, is_multi_az)
               else
                 fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/sqlserver-#{dp_type}-ondemand.min.js",:ondemand, db_type, is_byol, is_multi_az)
               end
             end
-
           end
         }
       end
@@ -152,21 +164,22 @@ module AwsPricing
     end
 
     def get_rds_reserved_instance_pricing
-       @@DB_TYPE.each do |db|
+      @@DB_TYPE.each do |db|
+        next if @@NO_LEGACY_RI_PRICING_AVAILABLE.include? db
         if [:mysql, :postgresql].include? db
           @@RES_TYPES.each do |res_type|
             if db == :postgresql and res_type == :heavy
               fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.min.js", res_type, db, false)
             elsif db == :mysql
               fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.min.js", res_type, db, false)
-            end            
+            end
 
             # Now repeat for legacy instances
             if db == :postgresql and res_type == :heavy
               fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/pricing-#{res_type}-utilization-reserved-instances.min.js", res_type, db, false)
             elsif db == :mysql
               fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/pricing-#{res_type}-utilization-reserved-instances.min.js", res_type, db, false)
-            end            
+            end
           end
         else
           @@RESERVED_DB_DEPLOY_TYPE[db].each {|db_type, db_instance|
@@ -174,20 +187,20 @@ module AwsPricing
               db_instance.each do |dp_type|
                 is_byol = is_byol? dp_type
                 if db == :oracle
-                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.min.js", res_type, db_type, is_byol) 
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.min.js", res_type, db_type, is_byol)
                 elsif db == :sqlserver
                   fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-#{res_type}-ri.min.js", res_type, db_type, is_byol)
                 end
 
                 # Now repeat for legacy instances
                 if db == :oracle
-                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.min.js", res_type, db_type, is_byol) 
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.min.js", res_type, db_type, is_byol)
                 elsif db == :sqlserver
                   fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/previous-generation/sqlserver-#{dp_type}-#{res_type}-ri.min.js", res_type, db_type, is_byol)
                 end
 
-              end    
-            end            
+              end
+            end
           }
         end
       end
@@ -207,16 +220,16 @@ module AwsPricing
               #  is_multi_az = true
               #else
               #  is_multi_az = is_multi_az? type["name"]
-              #end              
+              #end
               api_name, name = RdsInstanceType.get_name(type["name"], tier["name"], type_of_rds_instance != :ondemand)
-              
+
               instance_type = region.add_or_update_rds_instance_type(api_name, name)
               instance_type.update_pricing(db_type, type_of_rds_instance, tier, is_multi_az, is_byol)
             rescue UnknownTypeError
               $stderr.puts "[fetch_on_demand_rds_instance_pricing] WARNING: encountered #{$!.message}"
             end
           end
-        end                        
+        end
       end
     end
 
@@ -230,7 +243,7 @@ module AwsPricing
             begin
                 is_multi_az = is_multi_az? type["type"]
                 api_name, name = RdsInstanceType.get_name(type["type"], tier["size"], true)
-                
+
                 instance_type = region.add_or_update_rds_instance_type(api_name, name)
                 instance_type.update_pricing(db_type, type_of_rds_instance, tier, is_multi_az, is_byol)
             rescue UnknownTypeError
@@ -242,6 +255,6 @@ module AwsPricing
     rescue => ex
       $sterr.puts "Failed to fetch: #{url}"
       raise
-    end                              
+    end
   end
 end

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-  VERSION = '0.1.67'
+  VERSION = '0.1.68'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.67
+  version: 0.1.68
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: