awscosts 0.0.8 → 0.0.9

data/lib/awscosts/cache.rb

@@ -1,15 +1,28 @@
 require 'httparty'
-require 'json'
+require 'oj'
 
 module AWSCosts::Cache
   extend self
 
   BASE_URI = "http://aws.amazon.com"
+  BASE_JSONP_URI = "http://a0.awsstatic.com"
 
   def get uri, base_uri = BASE_URI, &block
-    cache[uri] ||= begin
-      yield JSON.parse(HTTParty.get("#{base_uri}#{uri}").body)
-     end
+    cache["#{base_uri}#{uri}"] ||= Oj::load(HTTParty.get("#{base_uri}#{uri}").body)
+    yield cache["#{base_uri}#{uri}"]
+  end
+
+  def get_jsonp uri, base_uri = BASE_JSONP_URI, &block
+    attempts = 0
+    cache["#{base_uri}#{uri}"] ||= begin
+      extract_json_from_callback(HTTParty.get("#{base_uri}#{uri}").body)
+    rescue NoMethodError
+      attempts += 1
+      retry if attempts < 5
+      raise "Failed to retrieve or parse data for #{base_uri}#{uri}"
+    end
+
+    yield cache["#{base_uri}#{uri}"]
   end
 
   private
@@ -17,6 +30,15 @@ module AWSCosts::Cache
     @cache ||= {}
   end
 
+  def extract_json_from_callback body
+    body.match /^.*callback\((\{.*\})\);$/
+    body = $1
+
+    # Handle "json" with keys that are not quoted
+    # When we get {foo: "1"} instead of {"foo": "1"}
+    # http://stackoverflow.com/questions/2060356/parsing-json-without-quoted-keys
+    Oj::load(body.gsub(/(\w+)\s*:/, '"\1":'))
+  end
 end
 
 

data/lib/awscosts/ec2.rb

@@ -2,6 +2,7 @@ require 'awscosts/ec2_on_demand'
 require 'awscosts/ec2_reserved_instances'
 require 'awscosts/ec2_elb'
 require 'awscosts/ec2_ebs'
+require 'awscosts/ec2_ebs_optimized'
 require 'awscosts/ec2_elastic_ips'
 
 class AWSCosts::EC2
@@ -11,28 +12,48 @@ class AWSCosts::EC2
   TYPES = { windows: 'mswin', linux: 'linux', windows_with_sql: 'mswinSQL',
             windows_with_sql_web: 'mswinSQLWeb', rhel: 'rhel', sles: 'sles' }
 
+  REGION_MAPPING = {
+    'us-east-1' => "us-east",
+    'us-west-1' => "us-west",
+    'us-west-2' => "us-west-2",
+    'eu-west-1' => "eu-ireland",
+    'eu-central-1' => "eu-central-1",
+    'ap-southeast-1' => "apac-sin",
+    'ap-southeast-2' =>"apac-syd",
+    'ap-northeast-1' =>"apac-tokyo",
+    'sa-east-1' => "sa-east-1"
+  }
+
   def initialize region
     @region = region
   end
 
   def on_demand(type)
+    raise ArgumentError.new("Unknown platform: #{type}") if TYPES[type].nil?
     AWSCosts::EC2OnDemand.fetch(TYPES[type], self.region.name)
   end
 
-  def reserved(type, utilisation= :light)
-    AWSCosts::EC2ReservedInstances.fetch(TYPES[type], utilisation, self.region.name)
+  def reserved(type, utilisation = :light)
+    r = self.region.name
+    r = 'us-east' if r == 'us-east-1'
+    raise ArgumentError.new("Unknown platform: #{type}") if TYPES[type].nil?
+    AWSCosts::EC2ReservedInstances.fetch(TYPES[type], utilisation, r)
   end
 
   def elb
-    AWSCosts::ELB.fetch(self.region.price_mapping)
+    AWSCosts::ELB.fetch(REGION_MAPPING[self.region.name])
   end
 
   def ebs
-    AWSCosts::EBS.fetch(self.region.price_mapping)
+    AWSCosts::EBS.fetch(REGION_MAPPING[self.region.name])
+  end
+
+  def ebs_optimized
+    AWSCosts::EBSOptimized.fetch(REGION_MAPPING[self.region.name])
   end
 
   def elastic_ips
-    AWSCosts::ElasticIPs.fetch(self.region.price_mapping)
+    AWSCosts::ElasticIPs.fetch(REGION_MAPPING[self.region.name])
   end
 end
 

data/lib/awscosts/ec2_ebs.rb

@@ -1,11 +1,7 @@
 require 'httparty'
-require 'json'
 
 class AWSCosts::EBS
 
-  TYPES = { 'ebsVols' => :standard, 'ebsPIOPSVols' => :provisioned_iops,
-            'ebsSnapsToS3' => :snapshots_to_s3 }
-
   def initialize data
     @data= data
   end
@@ -15,17 +11,10 @@ class AWSCosts::EBS
   end
 
   def self.fetch region
-    transformed= AWSCosts::Cache.get('/ec2/pricing/pricing-ebs.json') do |data|
+    transformed = AWSCosts::Cache.get_jsonp('/pricing/1/ebs/pricing-ebs.min.js') do |data|
       result = {}
-      data['config']['regions'].each do |region|
-        container = {}
-        region['types'].each do |type|
-          container[TYPES[type['name']]] = {}
-          type['values'].each do |value|
-            container[TYPES[type['name']]][value['rate']] = value['prices']['USD'].to_f
-          end
-        end
-        result[region['region']] = container
+      data['config']['regions'].each do |r|
+        result[r['region']] = r['types']
       end
       result
     end

data/lib/awscosts/ec2_ebs_optimized.rb

@@ -0,0 +1,31 @@
+require 'httparty'
+
+class AWSCosts::EBSOptimized
+
+  def initialize data
+    @data = data
+  end
+
+  def price type = nil
+    type.nil? ? @data : @data[type]
+  end
+
+  def self.fetch region
+    transformed = AWSCosts::Cache.get_jsonp('/pricing/1/ec2/pricing-ebs-optimized-instances.min.js') do |data|
+      result = {}
+      data['config']['regions'].each do |r|
+        container = {}
+        r['instanceTypes'].each do |type|
+          type['sizes'].each do |size|
+            container[size['size']] = size['valueColumns'].select{|v| v['name'] == 'ebsOptimized'}.first['prices']['USD'].to_f
+          end
+        end
+        result[r['region']] = container
+      end
+      result
+    end
+    self.new(transformed[region])
+  end
+
+end
+

data/lib/awscosts/ec2_elastic_ips.rb

@@ -25,16 +25,16 @@ class AWSCosts::ElasticIPs
   end
 
   def self.fetch region
-    transformed= AWSCosts::Cache.get('/ec2/pricing/pricing-elastic-ips.json') do |data|
+    transformed = AWSCosts::Cache.get_jsonp('/pricing/1/ec2/pricing-elastic-ips.min.js') do |data|
       result = {}
-      data['config']['regions'].each do |region|
+      data['config']['regions'].each do |r|
         container = {}
-        region['types'].each do |type|
+        r['types'].each do |type|
           type['values'].each do |value|
             container[value['rate']] = value['prices']['USD'].to_f
           end
         end
-        result[region['region']] = container
+        result[r['region']] = container
       end
       result
     end

data/lib/awscosts/ec2_elb.rb

@@ -13,16 +13,16 @@ class AWSCosts::ELB
   end
 
   def self.fetch region
-    transformed= AWSCosts::Cache.get('/ec2/pricing/pricing-elb.json') do |data|
+    transformed = AWSCosts::Cache.get_jsonp('/pricing/1/ec2/pricing-elb.min.js') do |data|
       result = {}
-      data['config']['regions'].each do |region|
+      data['config']['regions'].each do |r|
         container = {}
-        region['types'].each do |type|
+        r['types'].each do |type|
           type['values'].each do |value|
             container[value['rate']] = value['prices']['USD'].to_f
           end
         end
-        result[region['region']] = container
+        result[r['region']] = container
       end
       result
     end

data/lib/awscosts/ec2_on_demand.rb

@@ -22,7 +22,7 @@ class AWSCosts::EC2OnDemand
                      'hiIoODI.xxxxl' => 'hi1.4xlarge' }
 
   def initialize data
-    @data= data
+    @data = data
   end
 
   def price size=nil
@@ -30,30 +30,35 @@ class AWSCosts::EC2OnDemand
   end
 
   def self.fetch type, region
-    transformed= AWSCosts::Cache.get("/pricing/1/deprecated/ec2/#{type}-od.json", 'https://a0.awsstatic.com') do |data|
-      result = {}
-      data['config']['regions'].each do |region|
-        platforms = {}
-        region['instanceTypes'].each do |instance_type|
-          instance_type['sizes'].each do |instance_size|
-            size = instance_size['size']
-            platform_cost = Hash.new({})
-            instance_size['valueColumns'].each do |value|
-              platform_cost[value['name']] = value['prices']['USD'].to_f
-            end
+    result = {}
+    ['/pricing/1/ec2/%s-od.min.js', '/pricing/1/ec2/previous-generation/%s-od.min.js'].each do |uri|
+      AWSCosts::Cache.get_jsonp(uri % type) do |data|
+        data['config']['regions'].each do |r|
+          result[r['region']] ||= {}
+          platforms = result[r['region']]
+          r['instanceTypes'].each do |instance_type|
+            instance_type['sizes'].each do |instance_size|
+              size = instance_size['size']
+              platform_cost = Hash.new({})
+              instance_size['valueColumns'].each do |value|
+                # Don't return 0.0 for "N/A" since that is misleading
+                platform_cost[value['name']] = value['prices']['USD'] == 'N/A' ? nil : value['prices']['USD'].to_f
+              end
 
-            platform_cost.each_pair do |p,v|
-              platforms[p] = {} unless platforms.key?(p)
-              platforms[p][size] = v
+              platform_cost.each_pair do |p,v|
+                platforms[p] = {} unless platforms.key?(p)
+                platforms[p][size] = v
+              end
             end
           end
         end
-        result[region['region']] = platforms
       end
-      result
     end
-    #type == 'sles' ? self.new(transformed[region]['linux']) :
-    self.new(transformed[region][type])
+
+    raise "No result for region #{region} while fetching EC2 OnDemand Pricing"            if result[region].nil?
+    raise "No result for #{type} in region #{region} while fetching EC2 OnDemand Pricing" if result[region][type].nil?
+
+    self.new(result[region][type])
   end
 
 end

data/lib/awscosts/ec2_reserved_instances.rb

@@ -1,5 +1,4 @@
 require 'httparty'
-require 'json'
 class AWSCosts::EC2ReservedInstances
 
   TERMS = { one_year: 'yrTerm1', three_year: 'yrTerm3' }
@@ -42,19 +41,19 @@ class AWSCosts::EC2ReservedInstances
     end
   end
 
-
   def self.fetch type, utilisation, region
-    transformed= AWSCosts::Cache.get("/pricing/1/deprecated/ec2/#{type}-ri-#{utilisation}.json", 'https://a0.awsstatic.com') do |data|
+    transformed = AWSCosts::Cache.get_jsonp("/pricing/1/ec2/#{type}-ri-#{utilisation}.min.js") do |data|
       result = {}
-      data['config']['regions'].each do |region|
+      data['config']['regions'].each do |r|
         platforms = {}
-        region['instanceTypes'].each do |instance_type|
+        r['instanceTypes'].each do |instance_type|
           instance_type['sizes'].each do |instance_size|
             size = instance_size['size']
             platform_cost = Hash.new({})
 
             instance_size['valueColumns'].each do |value|
-              platform_cost[value['name']] = value['prices']['USD']
+              # Don't return 0.0 for "N/A" since that is misleading
+              platform_cost[value['name']] = value['prices']['USD'] == 'N/A' ? nil : value['prices']['USD'].to_f
             end
 
             platform_cost.each_pair do |p,v|
@@ -63,11 +62,11 @@ class AWSCosts::EC2ReservedInstances
             end
           end
         end
-        result[region['region']] = platforms
+        result[r['region']] = platforms
       end
       result
     end
-    region == 'us-east-1' ? self.new(transformed['us-east']) : self.new(transformed[region])
+    self.new(transformed[region])
   end
 
 end

data/lib/awscosts/emr.rb

@@ -1,5 +1,4 @@
 require 'httparty'
-require 'json'
 
 class AWSCosts::EMR
 
@@ -45,7 +44,7 @@ class AWSCosts::EMR
             end
             platform_cost.each_pair do |p,v|
               platforms[p] = {} unless platforms.key?(p)
-              platforms[p][TYPE_TRANSLATION["#{type}.#{size}"]] = v
+              platforms[p][size] = v
             end
           end
         end

data/lib/awscosts/region.rb

@@ -1,17 +1,18 @@
 
 class AWSCosts::Region
 
-  attr_reader :name, :full_name, :price_mapping
+  attr_reader :name, :full_name, :price_mapping, :emr_mapping
 
   SUPPORTED =  {
-    'us-east-1' => { :full_name => 'US (Northern Virginia)', :price_mapping => 'us-east' },
-    'us-west-1' => { :full_name => 'US (Northern California)', :price_mapping => 'us-west' },
-    'us-west-2' => { :full_name => 'US (Oregon)', :price_mapping => 'us-west-2' },
-    'eu-west-1' => { :full_name => 'EU (Ireland)', :price_mapping => 'eu-ireland' },
-    'ap-southeast-1' => { :full_name => 'Asia Pacific (Singapore)', :price_mapping => 'apac-sin' },
-    'ap-southeast-2' => { :full_name => 'Asia Pacific (Sydney)', :price_mapping => 'apac-syd' },
-    'ap-northeast-1' => { :full_name => 'Asia Pacific (Tokyo)', :price_mapping => 'apac-tokyo' },
-    'sa-east-1' => { :full_name => 'South America (Sao Paulo)', :price_mapping => 'sa-east-1' }
+    'us-east-1' => { :full_name => 'US (Northern Virginia)', :price_mapping => 'us-east-1', :emr_mapping => 'us-east' },
+    'us-west-1' => { :full_name => 'US (Northern California)', :price_mapping => 'us-west-1', :emr_mapping => 'us-west' },
+    'us-west-2' => { :full_name => 'US (Oregon)', :price_mapping => 'us-west-2', :emr_mapping => 'us-west-2' },
+    'eu-west-1' => { :full_name => 'EU (Ireland)', :price_mapping => 'eu-west-1', :emr_mapping => 'eu-ireland' },
+    'eu-central-1' => { :full_name => 'EU (Frankfurt)' },
+    'ap-southeast-1' => { :full_name => 'Asia Pacific (Singapore)', :price_mapping => 'ap-southeast-1', :emr_mapping => 'apac-sin' },
+    'ap-southeast-2' => { :full_name => 'Asia Pacific (Sydney)', :price_mapping => 'ap-southeast-2', :emr_mapping => 'apac-syd' },
+    'ap-northeast-1' => { :full_name => 'Asia Pacific (Tokyo)', :price_mapping => 'ap-northeast-1', :emr_mapping => 'apac-tokyo' },
+    'sa-east-1' => { :full_name => 'South America (Sao Paulo)', :price_mapping => 'sa-east-1', :emr_mapping => 'sa-east-1' }
   }
 
   def self.find name
@@ -24,7 +25,7 @@ class AWSCosts::Region
   end
 
   def emr
-    AWSCosts::EMR.fetch(self.price_mapping)
+    AWSCosts::EMR.fetch(self.emr_mapping)
   end
 
   def s3
@@ -36,6 +37,7 @@ class AWSCosts::Region
     @name = name
     @full_name = SUPPORTED[name][:full_name]
     @price_mapping = SUPPORTED[name][:price_mapping]
+    @emr_mapping = SUPPORTED[name][:emr_mapping]
   end
 
 end

data/lib/awscosts/s3.rb

@@ -11,6 +11,7 @@ class AWSCosts::S3
        'us-west-1' => "us-west-1",
        'us-west-2' => "us-west-2",
        'eu-west-1' => "eu-west-1",
+        'eu-central-1' => "eu-central-1",
        'ap-southeast-1' => "ap-southeast-1",
        'ap-southeast-2' =>"ap-southeast-2",
        'ap-northeast-1' =>"ap-northeast-1",
@@ -22,15 +23,15 @@ class AWSCosts::S3
   end
 
   def storage
-    AWSCosts::S3Storage.fetch(self.region)
+    AWSCosts::S3Storage.fetch(@region)
   end
 
   def data_transfer
-    AWSCosts::S3DataTransfer.fetch(self.region)
+    AWSCosts::S3DataTransfer.fetch(@region)
   end
 
   def requests
-    AWSCosts::S3Requests.fetch(self.region)
+    AWSCosts::S3Requests.fetch(@region)
   end
 end
 

data/lib/awscosts/s3_data_transfer.rb

@@ -1,12 +1,11 @@
 require 'httparty'
-require 'json'
 
 class AWSCosts::S3DataTransfer
 
   TYPES = %w{dataXferInS3, dataXferOutS3CrossRegion, dataXferOutS3}
 
   def initialize data
-    @data= data
+    @data = data
   end
 
   def price type = nil
@@ -14,17 +13,18 @@ class AWSCosts::S3DataTransfer
   end
 
   def self.fetch region
-    transformed= AWSCosts::Cache.get("/s3/pricing/pricing-data-transfer.json") do |data|
+    transformed = AWSCosts::Cache.get_jsonp("/pricing/1/s3/pricing-data-transfer-s3.min.js") do |data|
       result = {}
-      data['config']['regions'].each do |region|
+      data['config']['regions'].each do |r|
         types = {}
-        region['types'].each do |type|
+        r['types'].each do |type|
           types[type['name']] = {}
           type['tiers'].each do |tier|
-            types[type['name']][tier['name']] = tier['prices']['USD'].to_f
+            # Don't return 0.0 for "contactus" since that is misleading
+            types[type['name']][tier['name']] = tier['prices']['USD'] == 'contactus' ? nil : tier['prices']['USD'].to_f
           end
         end
-        result[region['region']] = types
+        result[r['region']] = types
       end
       result
     end