amazon-pricing 0.1.106 → 0.1.107

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgyZGM4MjYwMDliZDYxOTA0ZDVlNWQ1MTcxY2Q2NzNkMGRjOGVkYg==
+    MDdiNTFmMjM1ZWFlYWU2ZTdiYjg2ZWE4ZmQ0ODcyNTA3OGQ3MmY0NQ==
   data.tar.gz: !binary |-
-    NGZjYjBjODg3ZjUxZDZhODcyNmY2MzI2ZDUzZjdjMjk2ZjMwZDk2Ng==
+    ZjJhNjA2ZjUyNjFkNTBmMjcwOGVhYmEwMWNkZDIzNzI2NTc3NGZjYQ==
 SHA512:
   metadata.gz: !binary |-
-    NjAyZGIyZTJlMDExYzhjMDQ3ZjExMzY0OTkzZDkyNDNlOTFhZTUyNjQ0M2Ey
-    NzNiYmE2NWY5OWEwZmUzNTRlMTg2MGViMzYxNmJmOGY1ZGI0ODdmMDVmMWZl
-    ODIzOWIyZDhmNWFlMDVjNDNiNzM0ZWE2NzFmNWE1M2E1NGU4NzI=
+    Yjg5OTA4ZTk1YmZhZjFkNjQ3Y2YwMDQ4MjA5NmI1ZDQxZTRmZmE3MmE4ODVk
+    M2Q0NTRlMTYzMzhlNWYzYzRhODU0YWJhZjExOTdlYmM2ZDkwMDFlZDE4MWNh
+    OWY0NjJhODYzODE2ZGJhZWVkOGViNTk2M2M0Y2QxODkyOGE4Yjg=
   data.tar.gz: !binary |-
-    M2NlOWU4NThiOWU1NWJkYTc1MWVjMDY0ZmM3NmE2NGRhZDE5MTYyNWRjZmUw
-    ZTU5MDgzOGE4ODFiYzIwODg1NjNkMTg2OGNiMTQ5NDFmMWU3MWQyMWYwZThl
-    ZGM4OWFiNDRiYjEyMjZjNGE2ODI5ZmY5YTE4ZWViNTE3NDkyNTA=
+    MmMxNGFkOTAzZjc4ZmE5ZTAwODMwYjc0ZTU5NTQwOTU0MWJmZmQzYjBjNTU5
+    MzIyNzA1Yjg4ZmM1ZTZiODgwMTg1OTc5NzJmODA4ZjNiNGVhOWNhYWFmNTcx
+    YmFjZDdjOTZiOWIxNDE1Mzg2YmQ0OTVkMjY3ODQ5YjgzYzkyMDE=

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

@@ -232,6 +232,28 @@ module AwsPricing
       database_name.include? 'byol'
     end
 
+    # example: database_sf_from_engine_name_and_license_type?('mysql', false) returns true
+    # Returns BOOL if database is RDS SF
+    # params:
+    # - engine_name[String]: product description database name string
+    # - is_byol[Bool]: true if the database is using a BYOL license
+    def self.database_sf_from_engine_name_and_license_type?(engine_name, is_byol)
+      engine_name_sym = engine_name.gsub('-', '_').to_sym
+      if @@DB_Deploy_Types[engine_name_sym] && @@DB_Deploy_Types[engine_name_sym].include?(:byol)
+        product_name = is_byol ? "#{engine_name}(byol)" : "#{engine_name}(li)"
+      else
+        product_name = engine_name
+      end
+      database_sf_from_product_name?(product_name)
+    end
+    # example: database_sf_from_product_name?('oracle-ee(byol)') returns true
+    # Returns BOOL if database is RDS SF
+    # params:
+    # - product_name[String]: product description database name string including license type
+    def self.database_sf_from_product_name?(product_name)
+      # Just look up by single-az because deployment type doesn't affect size-flex eligibility
+      database_sf?(db_mapping(product_name, false))
+    end
     # example: database_sf?('MySQL Community Edition (Multi-AZ)') returns true
     # Returns BOOL if database string is RDS SF
     # params:

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-VERSION = '0.1.106' # [major,minor.fix]: adding eu-west-3
+VERSION = '0.1.107' # [major,minor.fix]: adding more methods for rds sf
 end

data/solano.yml

@@ -2,3 +2,5 @@
 coverage:
   version: 2
   enabled: true
+environment:
+  TZ: UTC

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

@@ -41,6 +41,8 @@ describe AwsPricing::RdsPriceList do
       puts "rds_sf_database-1: display_name:#{display_name}"
       #
       expect(AwsPricing::DatabaseType.database_sf?(display_name)).to be true
+      expect(AwsPricing::DatabaseType.database_sf_from_product_name?(product_name)).to be true
+      expect(AwsPricing::DatabaseType.database_sf_from_engine_name_and_license_type?('oracle-se2', true)).to be true
       expect(AwsPricing::DatabaseType.database_multiaz?(display_name)).to be true
       expect(AwsPricing::DatabaseType.database_nf(display_name)).to eq(2)
 
@@ -50,15 +52,86 @@ describe AwsPricing::RdsPriceList do
       puts "rds_sf_database-2: display_name:#{display_name}"
       #
       expect(AwsPricing::DatabaseType.database_sf?(display_name)).to be false
+      expect(AwsPricing::DatabaseType.database_sf_from_product_name?(product_name)).to be false
+      expect(AwsPricing::DatabaseType.database_sf_from_engine_name_and_license_type?('sqlserver-se', true)).to be false
+      expect(AwsPricing::DatabaseType.database_multiaz?(display_name)).to be false
+      expect(AwsPricing::DatabaseType.database_nf(display_name)).to eq(1)
+
+      product_name = 'sqlserver-se(li)'  # known NOT RDS SF example: 'Microsoft SQL Server Standard Edition'
+      multiaz = false
+      display_name = AwsPricing::DatabaseType.db_mapping(product_name, multiaz)
+      puts "rds_sf_database-2: display_name:#{display_name}"
+      #
+      expect(AwsPricing::DatabaseType.database_sf?(display_name)).to be false
+      expect(AwsPricing::DatabaseType.database_sf_from_product_name?(product_name)).to be false
+      expect(AwsPricing::DatabaseType.database_sf_from_engine_name_and_license_type?('sqlserver-se', false)).to be false
       expect(AwsPricing::DatabaseType.database_multiaz?(display_name)).to be false
       expect(AwsPricing::DatabaseType.database_nf(display_name)).to eq(1)
 
       display_name = 'NuoDB'              # unknown db, returns default non RDS SF values
       #
       expect(AwsPricing::DatabaseType.database_sf?(display_name)).to be false
+      expect(AwsPricing::DatabaseType.database_sf_from_product_name?(product_name)).to be false
+      expect(AwsPricing::DatabaseType.database_sf_from_engine_name_and_license_type?('NuoDB', false)).to be false
       expect(AwsPricing::DatabaseType.database_multiaz?(display_name)).to be false
       expect(AwsPricing::DatabaseType.database_nf(display_name)).to eq(1)
     end
+
+    it 'verifies RDS SF api for product name' do
+      product_name_to_size_flex_map = {
+        'mysql'              => true,
+        'postgres'           => true,
+        'postgresql'         => true,
+        'oracle-se1(li)'     => false,
+        'oracle-se1(byol)'   => true,
+        'oracle-se2(li)'     => false,
+        'oracle-se2(byol)'   => true,
+        'oracle-se(byol)'    => true,
+        'oracle-ee(byol)'    => true,
+        'sqlserver-ex(li)'   => false,
+        'sqlserver-web(li)'  => false,
+        'sqlserver-se(li)'   => false,
+        'sqlserver-se(byol)' => false,
+        'sqlserver-ee(li)'   => false,
+        'sqlserver-ee(byol)' => false,
+        'aurora'             => true,
+        'aurora-postgresql'  => true,
+        'mariadb'            => true
+      }
+
+      product_name_to_size_flex_map.each do |product_name, expected_value|
+        expect(AwsPricing::DatabaseType.database_sf_from_product_name?(product_name)).to be expected_value
+      end
+    end
+
+    it 'verifies RDS SF api for engine name and license type' do
+      engine_name_and_license_type_to_size_flex_map = {
+        ['mysql', false]             => true,
+        ['postgres', false]          => true,
+        ['postgresql', false]        => true,
+        ['oracle-se1', false]        => false,
+        ['oracle-se1', true]         => true,
+        ['oracle-se2', false]        => false,
+        ['oracle-se2', true]         => true,
+        ['oracle-se', true]          => true,
+        ['oracle-ee', true]          => true,
+        ['sqlserver-ex', false]      => false,
+        ['sqlserver-web', false]     => false,
+        ['sqlserver-se', false]      => false,
+        ['sqlserver-se', true]       => false,
+        ['sqlserver-ee', false]      => false,
+        ['sqlserver-ee', true]       => false,
+        ['aurora', false]            => true,
+        ['aurora-postgresql', false] => true,
+        ['mariadb', false]           => true
+      }
+
+      engine_name_and_license_type_to_size_flex_map.each do |engine_and_license, expected_value|
+        engine = engine_and_license.first
+        license = engine_and_license.last
+        expect(AwsPricing::DatabaseType.database_sf_from_engine_name_and_license_type?(engine, license)).to be expected_value
+      end
+    end
   end
 
   describe 'rds_sf_operation' do
@@ -93,7 +166,7 @@ describe AwsPricing::RdsPriceList do
     end
   end
 
-  describe 'get_breakeven_months' do 
+  describe 'get_breakeven_months' do
     it "test_fetch_all_breakeven_months" do
       @pricing.regions.each do |region|
         region.rds_instance_types.each do |instance|
@@ -112,15 +185,15 @@ describe AwsPricing::RdsPriceList do
                       if deploy_type == :byol_multiaz
                         next if not instance.available?(db, res_type, true, true)
                         instance.get_breakeven_month(db, res_type, term, true, true).should_not be_nil
-                      else 
+                      else
                         next if not instance.available?(db, res_type, deploy_type == :multiaz, deploy_type == :byol)
                         instance.get_breakeven_month(db, res_type, term, deploy_type == :multiaz, deploy_type == :byol).should_not be_nil
-                      end  
+                      end
                     end
-                  end                      
+                  end
                end
              end
-          end          
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.106
+  version: 0.1.107
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: