amazon-pricing 0.1.19 → 0.1.20

data/Gemfile.lock

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

data/lib/amazon-pricing.rb

@@ -38,7 +38,11 @@ module AwsPricing
     def fetch_url(url)
       uri = URI.parse(url)
       page = Net::HTTP.get_response(uri)
-      JSON.parse(page.body)
+      # Now that AWS switched from json to jsonp, remove first/last lines
+      body = page.body.gsub("callback(", "").reverse.sub(")", "").reverse
+
+      #body = page.body.split("\n")[1..-2].join("\n")
+      JSON.parse(body)
     end
 
     protected
@@ -58,8 +62,8 @@ module AwsPricing
       region
     end
 
-    EC2_BASE_URL = "http://aws.amazon.com/ec2/pricing/"
-    RDS_BASE_URL = "http://aws.amazon.com/rds/pricing/"
+    EC2_BASE_URL = "http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/ec2/"
+    RDS_BASE_URL = "http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/rds/"
 
     # Lookup allows us to map to AWS API region names
     @@Region_Lookup = {
@@ -92,14 +96,14 @@ module AwsPricing
 
     def get_ec2_on_demand_instance_pricing
       @@OS_TYPES.each do |os|
-        fetch_ec2_instance_pricing(EC2_BASE_URL + "json/#{os}-od.json", :ondemand, os)
+        fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-od.js", :ondemand, os)
       end
     end
 
     def get_ec2_reserved_instance_pricing
       @@OS_TYPES.each do |os|
         @@RES_TYPES.each do |res_type|
-          fetch_ec2_instance_pricing(EC2_BASE_URL + "json/#{os}-ri-#{res_type}.json", res_type, os)
+          fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-ri-#{res_type}.js", res_type, os)
         end
       end
     end
@@ -114,7 +118,10 @@ module AwsPricing
         # e.g. type = {"type"=>"hiCPUODI", "sizes"=>[{"size"=>"med", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"N/A"}}]}, {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}]}
         reg['instanceTypes'].each do |type|
           # e.g. size = {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}
-          type['sizes'].each do |size|
+          # Amazon now can return array or hash here (hash = only 1 item)
+          items = type['sizes']
+          items = [type] if items.nil?
+          items.each do |size|
             begin
               api_name, name = Ec2InstanceType.get_name(type["type"], size["size"], type_of_instance != :ondemand)
               
@@ -128,7 +135,7 @@ module AwsPricing
     end
 
     def fetch_ec2_ebs_pricing
-      res = fetch_url(EC2_BASE_URL + "pricing-ebs.json")
+      res = fetch_url(EC2_BASE_URL + "pricing-ebs.js")
       res["config"]["regions"].each do |ebs_types|
         region = get_region(ebs_types["region"])
         region.ebs_price = EbsPrice.new(region, ebs_types)
@@ -183,9 +190,9 @@ module AwsPricing
             is_byol = is_byol? dp_type
 
             if [:mysql, :postgresql, :oracle].include? db
-              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.json",:ondemand, db_type, is_byol)
+              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.js",:ondemand, db_type, is_byol)
             elsif db == :sqlserver
-              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.json",:ondemand, db_type, is_byol)
+              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.js",:ondemand, db_type, is_byol)
             end
           end
         }
@@ -197,9 +204,9 @@ module AwsPricing
         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.json", res_type, db, false)
+              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.js", res_type, db, false)
             elsif db == :mysql
-              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.json", res_type, db, false)
+              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.js", res_type, db, false)
             end            
           end
         else
@@ -208,9 +215,9 @@ 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.json", res_type, db_type, is_byol) 
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.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.json", res_type, db_type, is_byol)
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-#{res_type}-ri.js", res_type, db_type, is_byol)
                 end
               end    
             end            
@@ -229,7 +236,7 @@ module AwsPricing
             begin
               #
               # this is special case URL, it is oracle - multiAZ type of deployment but it doesn't have mutliAZ attributes in json.
-              if url == "http://aws.amazon.com/rds/pricing/oracle/pricing-li-multiAZ-deployments.json"
+              if url == "http://aws.amazon.com/rds/pricing/oracle/pricing-li-multiAZ-deployments.js"
                 is_multi_az = true
               else
                 is_multi_az = is_multi_az? type["name"]

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

@@ -65,7 +65,7 @@ module AwsPricing
     @@Name_Lookup = {
       'm1.small' => 'Standard Small', 'm1.medium' => 'Standard Medium', 'm1.large' => 'Standard Large', 'm1.xlarge' => 'Standard Extra Large',
       'm2.xlarge' => 'Hi-Memory Extra Large', 'm2.2xlarge' => 'Hi-Memory Double Extra Large', 'm2.4xlarge' => 'Hi-Memory Quadruple Extra Large',
-      'm3.xlarge' => 'M3 Extra Large Instance', 'm3.2xlarge' => 'M3 Double Extra Large Instance',
+      'm3.medium' => 'M3 Medium Instance', 'm3.large'=>'M3 Large Instance', 'm3.xlarge' => 'M3 Extra Large Instance', 'm3.2xlarge' => 'M3 Double Extra Large Instance',
       'c1.medium' => 'High-CPU Medium', 'c1.xlarge' => 'High-CPU Extra Large',
       'hi1.4xlarge' => 'High I/O Quadruple Extra Large',
       'cg1.4xlarge' => 'Cluster GPU Quadruple Extra Large',

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

@@ -21,7 +21,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)
+    def initialize(region, api_name, name, json)
       @category_types = {}
 
       @region = region
@@ -113,13 +113,12 @@ module AwsPricing
     @@Memory_Lookup = {
       'm1.small' => 1700, 'm1.medium' => 3750, 'm1.large' => 7500, 'm1.xlarge' => 15000,
       'm2.xlarge' => 17100, 'm2.2xlarge' => 34200, 'm2.4xlarge' => 68400,
-      'm3.xlarge' => 15000, 'm3.2xlarge' => 30000,
+      'm3.medium' => 3750, 'm3.large' => 7500, 'm3.xlarge' => 15000, 'm3.2xlarge' => 30000,
       'c1.medium' => 1700, 'c1.xlarge' => 7000,
       'hi1.4xlarge' => 60500,
       'cg1.4xlarge' => 22000,
       'cc1.4xlarge' => 23000, 'cc2.8xlarge' => 60500,
       't1.micro' => 1700,
-      'm3.xlarge' => 15000, 'm3.xlarge' => 30000,
       'cr1.8xlarge' => 244000,
       'hs1.8xlarge' => 117000,
       'g2.2xlarge' => 15000,      
@@ -132,13 +131,12 @@ module AwsPricing
     @@Disk_Lookup = {
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
       'm2.xlarge' => 420, 'm2.2xlarge' => 850, 'm2.4xlarge' => 1690,
-      'm3.xlarge' => 0, 'm3.2xlarge' => 0,
+      'm3.medium' => 4, 'm3.large' => 32, 'm3.xlarge' => 80, 'm3.2xlarge' => 160,
       'c1.medium' => 350, 'c1.xlarge' => 1690,
       'hi1.4xlarge' => 2048,
       'cg1.4xlarge' => 1690,
       'cc1.4xlarge' => 1690, 'cc2.8xlarge' => 3370,
       't1.micro' => 160,
-      'm3.xlarge' => 0, 'm3.xlarge' => 0,
       'cr1.8xlarge' => 240,
       'hs1.8xlarge' => 48000,
       'g2.2xlarge' => 60,      
@@ -151,13 +149,12 @@ module AwsPricing
     @@Platform_Lookup = {
       'm1.small' => 32, 'm1.medium' => 32, 'm1.large' => 64, 'm1.xlarge' => 64,
       'm2.xlarge' => 64, 'm2.2xlarge' => 64, 'm2.4xlarge' => 64,
-      'm3.xlarge' => 64, 'm3.2xlarge' => 64,
+      'm3.medium' => 64, 'm3.large' => 64, 'm3.xlarge' => 64, 'm3.2xlarge' => 64,
       'c1.medium' => 32, 'c1.xlarge' => 64,
       'hi1.4xlarge' => 64,
       'cg1.4xlarge' => 64,
       'cc1.4xlarge' => 64, 'cc2.8xlarge' => 64,
       't1.micro' => 32,
-      'm3.xlarge' => 64, 'm3.xlarge' => 64,
       'cr1.8xlarge' => 64,
       'hs1.8xlarge' => 64,
       'g2.2xlarge' => 64,      
@@ -170,7 +167,7 @@ module AwsPricing
     @@Compute_Units_Lookup = {
       'm1.small' => 1, 'm1.medium' => 2, 'm1.large' => 4, 'm1.xlarge' => 8,
       'm2.xlarge' => 6.5, 'm2.2xlarge' => 13, 'm2.4xlarge' => 26,
-      'm3.xlarge' => 13, 'm3.2xlarge' => 26,
+      'm3.medium' => 3, 'm3.large' => 6.5, 'm3.xlarge' => 13, 'm3.2xlarge' => 26,
       'c1.medium' => 5, 'c1.xlarge' => 20,
       'hi1.4xlarge' => 35,
       'cg1.4xlarge' => 34,
@@ -190,7 +187,7 @@ module AwsPricing
     @@Virtual_Cores_Lookup = {
       'm1.small' => 1, 'm1.medium' => 1, 'm1.large' => 2, 'm1.xlarge' => 4,
       'm2.xlarge' => 2, 'm2.2xlarge' => 4, 'm2.4xlarge' => 8,
-      'm3.xlarge' => 4, 'm3.2xlarge' => 8,
+      'm3.medium' => 1, 'm3.large' => 2, 'm3.xlarge' => 4, 'm3.2xlarge' => 8,
       'c1.medium' => 2, 'c1.xlarge' => 8,
       'hi1.4xlarge' => 16,
       'cg1.4xlarge' => 8,
@@ -209,7 +206,7 @@ module AwsPricing
     @@Disk_Type_Lookup = {
       'm1.small' => :ephemeral, 'm1.medium' => :ephemeral, 'm1.large' => :ephemeral, 'm1.xlarge' => :ephemeral,
       'm2.xlarge' => :ephemeral, 'm2.2xlarge' => :ephemeral, 'm2.4xlarge' => :ephemeral,
-      'm3.xlarge' => :ephemeral, 'm3.2xlarge' => :ephemeral,
+      'm3.medium' => :ssd, 'm3.large' => :ssd, 'm3.xlarge' => :ssd, 'm3.2xlarge' => :ssd,
       'c1.medium' => :ephemeral, 'c1.xlarge' => :ephemeral,
       'hi1.4xlarge' => :ssd,
       'cg1.4xlarge' => :ephemeral,

data/lib/amazon-pricing/region.rb

@@ -49,7 +49,7 @@ module AwsPricing
     def add_or_update_ec2_instance_type(api_name, name, operating_system, type_of_instance, json)
       current = get_ec2_instance_type(api_name)
       if current.nil?
-        current = Ec2InstanceType.new(self, api_name, name)
+        current = Ec2InstanceType.new(self, api_name, name, json)
         @ec2_instance_types[api_name] = current
       end
       current.update_pricing(operating_system, type_of_instance, json)
@@ -59,7 +59,7 @@ module AwsPricing
     def add_or_update_rds_instance_type(api_name, name, db_type, type_of_instance, json, is_multi_az, is_byol)
       current = get_rds_instance_type(api_name)
       if current.nil?
-        current = RdsInstanceType.new(self, api_name, name)
+        current = RdsInstanceType.new(self, api_name, name, json)
         @rds_instance_types[api_name] = current
       end
       current.update_pricing(db_type, type_of_instance, json, is_multi_az, is_byol)

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -64,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4018300996554376891
+      hash: -574504011495470816
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4018300996554376891
+      hash: -574504011495470816
 requirements: []
 rubyforge_project: amazon-pricing
 rubygems_version: 1.8.25