amazon-pricing 0.1.46 → 0.1.47

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGUyODcyODBiMTVhNGUxNTY5MDgwMzdjODkxNGMwOGFmNGY0ODA4OA==
+    NmNiNmQ3MDE4Zjc2MWUxYjg1ZTUxMjI0YTkwOGJhZjBjOGJlNzE2Ng==
   data.tar.gz: !binary |-
-    YjRlZjY1YWQ3YzVmZDgyN2EwZDE5N2Q3ZGRmMmFkYzJlZDA1NTA2Mg==
+    ZDRmZjc5ZWVjMzEyYjY1NzYxOGU0YmM2OTIyNTcyODRkOWRkY2M1Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZWEyYjkwYmFhNDU5Y2I0ZjI5ZGVjZWMxODI4YTllYmZmNWQ4MjRhMmNiY2Q4
-    ZTdlYzM5YzkyZGIyMWE5OGNkMTcxN2QwNGQ2NWNiZmYyNDQ0ZTAwN2RkNjYw
-    MDIyZGJkYmQ0ZjU1NWQ2NDkyNzhmOTFiZjZiZDU3ZTExNjJjMzI=
+    MjY3YWQ5NjNhZWI0ZmUxZjFmOWY2MjhmYjNmNDAwNTI1YzU5NjA1NzQ3Yjhh
+    NjhhMTdlZjI2ZmJlZTA0ZjhmOTA4N2E4YTNjMWY1ZjM3Y2VmOGVlYzQ5Yzcw
+    NDBhMDcxNzY3NGRjZTg4NjQ4NjYxYmYyNWU2YmIzYjRhMDA3MTU=
   data.tar.gz: !binary |-
-    MmE2ZTk3NzczODU1OTJjZmIxYmQ5NTYyNWEzNjEzNmE1MGRkY2I0MzZkOTNh
-    YTUxMTk4YzU1NjM0NGUzMWU2MTE2MGI3ZDQxYzVhN2ExODU2NTdkODQwMDIz
-    NjE3ZmM3NDkwYTY4ODMyYmQ0MGVjNjRkM2IyZjFlOTk1OTcwNmU=
+    MzU1ZTc0MWYwMzUwNjBmNTQxMjVjNTM5YTQ0NWI1MDgxNzVlNzA3NGRlOTRm
+    MmMzMmIyNTYwZWViOGRkNjhiZjJkMDM0Zjk4NTlkMGM5MmU4YjAwNDAyYzMx
+    NjdkNjU5YTk0ZjE1Yjg4MjNhMjQ5YWNmNDQ1MzY0OTIwYTQwNzE=

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

@@ -151,6 +151,6 @@ module AwsPricing
       [api_name, name]
     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.46'
+  VERSION = '0.1.47'
 end

data/lib/rds-price-list.rb

@@ -51,6 +51,14 @@ module AwsPricing
             elsif db == :sqlserver
               fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.min.js",:ondemand, db_type, is_byol, is_multi_az)
             end
+
+            # Now repeat for legacy instances
+            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
+              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
@@ -65,6 +73,13 @@ module AwsPricing
             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            
+
+            # 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
         else
           @@RESERVED_DB_DEPLOY_TYPE[db].each {|db_type, db_instance|
@@ -76,6 +91,14 @@ module AwsPricing
                 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) 
+                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            
           }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.46
+  version: 0.1.47
 platform: ruby
 authors:
 - Joe Kinsella