amazon-pricing 0.1.79 → 0.1.80

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmQyMjM5MmQ3ZWRjMTIxYzk2MTMzNzQ0OTI1ODMxZWI4NmNlOWIxYw==
-  data.tar.gz: !binary |-
-    MWIzYmE4ZWJlNDZlMDY5MGZhZWFjMWUxNWFjMjIyNTYwNzNjYzFmYQ==
+SHA1:
+  metadata.gz: b5ff36ef9d065335f01c797f71e0f94c133403a7
+  data.tar.gz: ff0dd6b03824b91e55635338252c7b81090a297a
 SHA512:
-  metadata.gz: !binary |-
-    ZTVkZDY4NmIyNDM4NzExZWQxNmFhODQ1NjY1ZjJhNTQ3NTQ5NzE0OTgxNWQz
-    NjQyYjE2MGI5MmE3NWU2ZTM1ZGIyNDI4ZDY0NGE1NTY4OGZiNTcyODRmZDJi
-    MjY4MDgzYjZhYjgxMWI0MmNkMjY2MGVhYzM2ZjgwZDg0YmM4MjU=
-  data.tar.gz: !binary |-
-    NmU5YzMzN2RhZjhlMGYyYTFiMWNhYjI2OGM2NjM5NjMxZjEyMmEzOTUzNTY1
-    ZmE4ZjA0NTY4ZDAyNjA4MzY2NTE5ODU0ZmRhYmY3ZjhiZTFiOGU0YTVlNmQy
-    Y2YxOTRlZjJiNjI3YzAzMTBmN2MxMDQwYTNkYTlmYWM0N2MzZDA=
+  metadata.gz: 77d7a74737d375018197cb1387193e3eed503d118c0d1178e9cbc1e4000bcdfe4970632060b9fcf9a7702b4542fd457561ecb9f59d4f9ba54749486beaa61b1e
+  data.tar.gz: 76c4cd522a0438b13de357832d0f7b7250e7a672693740a6b7d854e9fc08b0f82e5332545898d60a7b97d7138b3184f868bb4959f01a516b47fc7c8b1dae3115

data/Gemfile.lock

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

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

@@ -116,12 +116,18 @@ module AwsPricing
       end
     end
 
+    # Returns the bytes/s capacity if defined, `nil` otherwise
     def self.disk_bytes_per_sec_capacity(api_name)
-      PER_SEC_CAPACITIES[api_name][0] * 1024 * 1024
+      if PER_SEC_CAPACITIES[api_name]
+        PER_SEC_CAPACITIES[api_name][0] * 1024 * 1024
+      end
     end
 
+    # Returns the ops/s capacity if defined, `nil` otherwise
     def self.disk_ops_per_sec_capacity(api_name)
-      PER_SEC_CAPACITIES[api_name][1]
+      if PER_SEC_CAPACITIES[api_name]
+        PER_SEC_CAPACITIES[api_name][1]
+      end
     end
 
     protected

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

@@ -119,6 +119,8 @@ module AwsPricing
           when 'upfront'
             db.set_prepay(type_of_instance, years, p.to_f) unless type_of_instance == :noupfront || p == "N/A"
           when 'monthlyStar'
+            # note for partialupfront, this purposely differs from AWS' "effective hourly" since we do not
+            # include the amortization of the partialupfront cost into this rate.
             db.set_price_per_hour(type_of_instance, years, p.to_f * 12 / 365 / 24) unless type_of_instance == :allupfront || p == "N/A"
           else
             # Do nothing for other names

data/lib/amazon-pricing/rds-price-list.rb

@@ -39,12 +39,18 @@ module AwsPricing
       :sqlserver=> {:sqlserver_ex=>["li-ex"], :sqlserver_web=>["li-web"], :sqlserver_se=>["li-se","byol"], :sqlserver_ee=>["byol"]}
     }
 
+    # the following cli will extract all the URLs referenced on the AWS pricing page that fetch_reserved_rds_instance_pricing2 uses:
+    # curl http://aws.amazon.com/rds/pricing/ 2>/dev/null | grep 'pricing' |grep reserved-instances
     @@RESERVED_DB_DEPLOY_TYPE2 = {
         :mysql => {:mysql=>["standard","multiAZ"]},
         :postgresql => {:postgresql=>["standard","multiAZ"]},
         :oracle => {:oracle_se1=>["license-included-standard", "license-included-multiAZ"],
                     :oracle_se=>["byol-standard", "byol-multiAZ"]},
-        :sqlserver => {:sqlserver_se=>["byol-standard", "byol-multiAZ"]},
+        :sqlserver => {
+            :sqlserver_ex =>["license-included-standard"],
+            :sqlserver_web=>["license-included-standard"],
+            :sqlserver_se =>["byol-standard", "byol-multiAZ", "license-included-standard", "license-included-multiAZ"],
+            :sqlserver_ee =>["byol-standard", "byol-multiAZ", "license-included-standard", "license-included-multiAZ"]},
         :aurora => {:aurora => ["multiAZ"]},
         :mariadb => {:mariadb => ["standard", "multiAZ"]}
     }
@@ -53,8 +59,11 @@ module AwsPricing
         :mysql => [:mysql],
         :postgresql => [:postgresql],
         :oracle_se1 => [:oracle_se1],
-        :oracle_se => [:oracle_se, :oracle_se1, :oracle_ee],
-        :sqlserver_se => [:sqlserver_se, :sqlserver_ee],
+        :oracle_se => [:oracle_se, :oracle_ee],
+        :sqlserver_ex => [:sqlserver_ex],
+        :sqlserver_web=> [:sqlserver_web],
+        :sqlserver_se => [:sqlserver_se],
+        :sqlserver_ee => [:sqlserver_ee],
         :aurora => [:aurora],
         :mariadb => [:mariadb]
     }
@@ -119,7 +128,23 @@ module AwsPricing
             # We believe Amazon made a mistake by hosting aurora's prices on a url that follows the multi-az pattern.
             # Therefore we'll construct the URL as multi-az, but still treat the prices as for single-az.
             is_multi_az = deploy_type.upcase.include?("MULTIAZ") && db != :aurora
-            db_str = db == :sqlserver_se ? 'sql-server-se' : db.to_s.gsub(/_/, '-')
+
+            # map sqlserver to aws strings (notice '-' between sql-server)
+            case db
+              when :sqlserver_se
+                db_str = 'sql-server-se'
+              when :sqlserver_ee
+                db_str = 'sql-server-ee'
+              when :sqlserver_web
+                db_str = 'sql-server-web'
+              when :sqlserver_ex
+                db_str = 'sql-server-express'
+              else
+                db_str = db.to_s.gsub(/_/, '-')
+            end
+
+            # nb: the intersection of @@RESERVED_DB_DEPLOY_TYPE2 and @@RESERVED_DB_WITH_SAME_PRICING2 should
+            #     not overlap, since they have different pricings
             dbs_with_same_pricing = @@RESERVED_DB_WITH_SAME_PRICING2[db]
             fetch_reserved_rds_instance_pricing2(RDS_BASE_URL+"reserved-instances/#{db_str}-#{deploy_type}.min.js", dbs_with_same_pricing, is_multi_az, is_byol)
           end
@@ -128,6 +153,7 @@ module AwsPricing
     end
 
     def fetch_reserved_rds_instance_pricing2(url, dbs, is_multi_az, is_byol)
+      #logger.debug "[#{__method__}] fetched #{url}"
       res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
@@ -211,6 +237,7 @@ module AwsPricing
     end
 
     def fetch_on_demand_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol, is_multi_az = false)
+      #logger.debug "[#{__method__}] fetched #{url}"
       res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
@@ -242,6 +269,7 @@ module AwsPricing
     end
 
     def fetch_reserved_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol)
+      #logger.debug "[#{__method__}] fetched #{url}"
       res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.79
+  version: 0.1.80
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -64,21 +64,21 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - amazon-pricing documentation
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []