amazon-pricing 0.1.74 → 0.1.75

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzEzMzA5NjEyOTkzYzczNTZhYWVmZGYzMmYwZTdiZTNiMTQxYmQ2Ng==
+    YWU5NmE4N2NiY2I0MDAyMzNkZGIwOGRiNDU4YmIyMzI5NzRkNTRkMg==
   data.tar.gz: !binary |-
-    YjViZDc3N2RkODA5MzdjYTBlZDQ4NWQ1MDlhZmNjNWQ2N2NhYzZjZg==
+    NmEzYzg0ZGI2Mzk5NDhjYmFiMWVmNTYzYTQ0MjM2NDQ3MzNmM2E0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmIwYzdmNjc4NDQ4Y2VmYzAzMmRmNTFhMDJmZWE1NjVjNWE2MzgwZWRhMjcw
-    MWEwNDhhNjE0NzQzYTg4YjMxYWJlMWRkNWRmN2EyNjBjY2ZiOWZiZWMwYjA3
-    MTQ3NWZmOTUyNzlmMWZhN2E0YmFiODg3YjU1ZTVlYmY0Zjc5OTA=
+    ZWVjOWQwYzIzZjdkYTY2ZWNmNGZjZGIzMTg0MGUyYjQ4OTgxMjNkOTk1ZDgz
+    NWUzOTBjYWRjYzI1MWU5NjA1YjZmNWNkMjU4NzIwY2Q3MDYzMTc5OWU0ZDUw
+    MmZmMWNkYzQzNzEzZjUxMzcwNDUzN2M0ZjU4ZmEwZTdiMTgxYjY=
   data.tar.gz: !binary |-
-    YTRkZDBkMjRkMzcwZmMxZTUzOTg4Mzg2YmYyYjVlOWU0ZGExZWM2ZjIxMzVk
-    MTU3ZjdlYTJiYjQwZjM0ODBkNjE4MTI3OWU4NjQ0NDBiMDkyNTA5NmU3NmJl
-    MDkyOWRhYzNiY2I3OTU3OGYwYmJiMWFjMWRiM2FlNjAxYTdmMGU=
+    YzI4N2E1NWNhNGEyZmY1ODgzZjVhYzI5ZjAzMzU1N2M3YjUxNzgzM2JiZTZm
+    MGMxMDYzYmI2ZjhlNTdmODE2NWU2NmQ0MGY0Y2YyYjZmNzFmNWZlM2EzNGU5
+    OWQzNWQ5MjllODQzNjI2Zjc1YzIyZmVmOTk0Njg4NzM1Y2E4NDQ=

data/Gemfile.lock

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

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

@@ -39,6 +39,11 @@ module AwsPricing
       'aurora_standard'         => 'Amazon Aurora',
       'mariadb_standard'        => 'MariaDB',
       'mariadb_multiaz'         => 'MariaDB (Multi-AZ)',
+
+      # Oracle SE2 BYOL prices are copied from Enterprise BYOL prices and not collected
+      # (so no need to add rds-price-list.rb)
+      'oracle_se2_byol'         => 'Oracle Database Standard Edition Two (BYOL)',
+      'oracle_se2_byol_multiaz' => 'Oracle Database Standard Edition Two (BYOL Multi-AZ)',
     }
 
     @@Display_Name_To_Qualified_Database_Name = @@Database_Name_Lookup.invert
@@ -71,6 +76,11 @@ module AwsPricing
       'aurora'                   => 'aurora_standard',
       'mariadb'                  => 'mariadb_standard',
       'mariadb_multiaz'          => 'mariadb_multiaz',
+
+      # Oracle SE2 BYOL prices are copied from Enterprise BYOL prices and not collected
+      # (so no need to add rds-price-list.rb)
+      'oracle-se2(byol)'         => 'oracle_se2_byol',
+      'oracle-se2(byol)_multiaz' => 'oracle_se2_byol_multiaz',
     }
 
     @@DB_Deploy_Types = {
@@ -83,6 +93,9 @@ module AwsPricing
       :sqlserver_ee => [:byol, :byol_multiaz, :standard, :multiaz],
       :aurora       => [:standard],
       :mariadb      => [:standard, :multiaz],
+
+      # oracle_se2 prices are copied, not collected
+      :oracle_se2   => [:byol, :byol_multiaz],
     }
 
   	def self.display_name(name)
@@ -90,7 +103,10 @@ module AwsPricing
   	end
 
   	def self.get_database_name
-  	  [:mysql, :postgresql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_ex, :sqlserver_web, :sqlserver_se, :sqlserver_ee, :aurora, :mariadb]
+      [:mysql, :postgresql, :oracle_se1, :oracle_se, :oracle_ee, :sqlserver_ex, :sqlserver_web,
+        :sqlserver_se, :sqlserver_ee, :aurora, :mariadb,
+        :oracle_se2 # oracle_se2 prices are copied, not collected
+      ]
   	end
 
   	def self.get_available_types(db)

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

@@ -85,6 +85,10 @@ module AwsPricing
           end
         end
       end
+      # Copy prices from oracle_se to oracle_se2
+      if database_type == :oracle_se && is_byol
+        update_pricing :oracle_se2, type_of_instance, json, is_multi_az, is_byol
+      end
     end
 
     def update_pricing_new(database_type, type_of_instance, prices, term = nil, is_multi_az, is_byol)
@@ -120,6 +124,10 @@ module AwsPricing
             # Do nothing for other names
         end
       end
+      # Copy prices from oracle_se to oracle_se2
+      if database_type == :oracle_se && is_byol
+        update_pricing_new :oracle_se2, type_of_instance, prices, term, is_multi_az, is_byol
+      end
     end
 
     def update_pricing2(database_type, type_of_instance, is_multi_az, is_byol, ondemand_pph = nil, year1_prepay = nil, year3_prepay = nil, year1_pph = nil, year3_pph = nil)

data/lib/amazon-pricing/version.rb

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

data/spec/lib/amazon-pricing/elasticache_pricing_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
 
 describe AwsPricing::ElastiCachePriceList do
-  NEW_REGIONS = ['ap-northeast-2']
+  # When new regions are introduced and elasticache prices are not available
+  # in the new regions yet, add the new regions to NEW_REGIONS.
+  NEW_REGIONS = []
   before(:all) do
     @pricing = AwsPricing::ElastiCachePriceList.new
     @node_types = [:memcached]
@@ -68,7 +70,7 @@ describe AwsPricing::ElastiCachePriceList do
       end
     end
 
-    it "should not yet have valid breakeven months for new region" do
+    it "should not yet have valid breakeven months for new regions" do
       @pricing.regions.each do |region|
         next unless NEW_REGIONS.include?(region.name)
         begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.74
+  version: 0.1.75
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -96,3 +96,4 @@ test_files:
 - spec/support/.gitignore
 - test/ec2_instance_types_test.rb
 - test/helper.rb
+has_rdoc: