amazon-pricing 0.1.121 → 0.1.122

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzUyM2VjNDk5NzU3NTY0MzNkNjdlYTUxOTlkZjcxNWYyMzBkYWQ3OQ==
+    ZDUzYzExNjA2ZWQ1NTg2NjMxODkxMzUwOTQ5MWExNGNjMDAwNzU0NQ==
   data.tar.gz: !binary |-
-    ZmYwN2EwYzFmZjdkNDBlYTdkODMxN2Q5OWRlMWU1N2ZjMGEzYmUzNQ==
+    MjQzNmQ0Nzc4ZjQwMmUzNjllMzIwZWY4NThjYjEzMTM0NzliNGJjMw==
 SHA512:
   metadata.gz: !binary |-
-    YjgyNDZlZWM5Yzc2MjkxMjU2NDZmYjU1M2U4ZTkwMjQ0MDI0NzkwN2IzYWNm
-    ZTJhODM3OGUzNTQzYTMwYzBjNThjMzNlOGIyNzA3ZTA5Y2U4NmNjYWIzNWZj
-    NGQ2NTk5NGYxZDQ2OGZkOGY2OWUwMWQyMzViZTg4YmFiMmM0OTk=
+    OGQwYjE0MGE1NDFiNGM4YWRmNzJlMTAzNDA5NTFhN2Y5Yjk0OTI0YmM3ODlm
+    Njk3ZDUyY2Y5MTk4ZTRkMWU1YjY3ODVhOGQ2YTk5ZWM4MWQ5MGI5OWZmMzJh
+    Zjg4OTE4ODgyNTUzNjM1MjE2ZGFiMzE5NTA2OGM3YzEwMWY3ZmQ=
   data.tar.gz: !binary |-
-    MTljZjQ4OTUwZTRhZWI4ZTVmOGMyMGZhM2RlMTljYmY0NjViOTAxYzhjYWM2
-    NzM5ZmQxNjExYzY5MjRiOTcxNTAwNWVjMTAxZDZkY2ZjNWQyMGI3ZGZiNWRj
-    NjQ4NmNmNDM5M2Q0ZDQ3ZmRjNGQ0YjhjZGIzYjVhOWJlY2U5NGU=
+    YWQzMTg3NWY2Y2Y0MTU1Njc3NmY5NDMzOWNjMzg3M2QxODc0MzdmOGYwZTAw
+    YzZlYTg0NTUzNDNhOGRjMWZmZjBkMThmOTcxOGE1YTMzMWM1YjA2ZjE0MmVi
+    MmZkYzI5NThlM2I5MzRmMThhNDJmNjk3ZGMwZmVjNGFkYjdlZWM=

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

@@ -147,25 +147,8 @@ module AwsPricing
     # Input: String containing network capacity from amazon-pricing-api
     # Output: network throughput as a string, int containing network mbps
     def self.get_network_information(network_string)
-      throughput = nil
-      case network_string
-        when 'Very Low'
-          throughput = :very_low
-        when 'Low'
-          throughput = :low
-        when 'Low to Moderate'
-          throughput = :low_to_moderate
-        when 'Moderate'
-          throughput = :moderate
-        when 'High'
-          throughput = :high
-        when '10 Gigabit','Up to 10 Gigabit'
-          throughput = :ten_gigabit
-        when '20 Gigabit'
-          throughput = :twenty_gigabit
-        when '25 Gigabit'
-          throughput = :twentyfive_gigabit
-        else
+      throughput = @Network_String_To_Sym[network_string]
+      if throughput.nil?
           $stderr.puts "[#{__method__}] WARNING: unknown network throughput string:#{network_string}"
       end
       network_mbps = @Network_Throughput_MBits_Per_Second[throughput]
@@ -205,6 +188,20 @@ module AwsPricing
         :twentyfive_gigabit => 25000, # presumes ENA
     }
 
+    # Use in population of profiles, takes in string value that amazon uses to reflect network capacity
+    # Returns symbol we use to map to numeric value
+    @Network_String_To_Sym = {
+        'Very Low' =>  :very_low,
+        'Low' => :low,
+        'Low to Moderate' => :low_to_moderate,
+        'Moderate' => :moderate,
+        'High' => :high,
+        '10 Gigabit'=> :ten_gigabit,
+        'Up to 10 Gigabit' => :ten_gigabit,
+        '20 Gigabit' => :twenty_gigabit,
+        '25 Gigabit' => :twentyfive_gigabit
+    }
+
     # handy summary here: www.ec2instances.info
     @Network_Performance = {
       'c1.medium' => :moderate,
@@ -319,6 +316,7 @@ module AwsPricing
       'g3.4xlarge' => :twenty_gigabit,
       'g3.8xlarge' => :twenty_gigabit,
       'g3.16xlarge' => :twenty_gigabit,
+      'g3s.xlarge' => :ten_gigabit,
       'h1.2xlarge' => :ten_gigabit, # upto 10G
       'h1.4xlarge' => :ten_gigabit, # upto 10G
       'h1.8xlarge' => :ten_gigabit,

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

@@ -202,6 +202,7 @@ module AwsPricing
       'hs1.8xlarge' => 'High-Storage Eight Extra Large',
       'g2.2xlarge' => 'Cluster GPU Double Extra Large', 'g2.8xlarge' => 'Cluster GPU Eight Extra Large',
       'g3.4xlarge' => 'Cluster GPU-3 Quadruple Extra Large', 'g3.8xlarge' => 'Cluster GPU-3 Eight Extra Large', 'g3.16xlarge' => 'Cluster GPU-3 Hextuple Extra Large',
+      'g3s.xlarge' => 'Cluster GPU-3S Extra Large',
       'p2.xlarge' => 'GPU Compute Extra Large', 'p2.8xlarge' => 'GPU Compute Eight Extra Large', 'p2.16xlarge' => 'GPU Compute Hextuple Extra Large',
       'p3.2xlarge' => 'GPU-3 Compute Double Extra Large', 'p3.8xlarge' => 'GPU-3 Compute Eight Extra Large', 'p3.16xlarge' => 'GPU-3 Compute Hextuple Extra Large',
       'c3.large' => 'High-Compute Large', 'c3.xlarge' => 'High-Compute Extra Large', 'c3.2xlarge' => 'High-Compute Double Extra Large', 'c3.4xlarge' => 'High-Compute Quadruple Extra Large', 'c3.8xlarge' => 'High-Compute Eight Extra Large',
@@ -258,6 +259,7 @@ module AwsPricing
       'hs1.8xlarge' => 48000,
       'g2.2xlarge' => 60, 'g2.8xlarge' => 240,
       'g3.4xlarge' => 0, 'g3.8xlarge' => 0, 'g3.16xlarge' => 0, # g3 are ebs-only
+      'g3s.xlarge' => 0, # g3s are ebs-only
       'db.m1.small' => 160, 'db.m1.medium' => 410, 'db.m1.large' =>850, 'db.m1.xlarge' => 1690,
       'db.m2.xlarge' => 420, 'db.m2.2xlarge' => 850, 'db.m2.4xlarge' => 1690, 'db.cr1.8xlarge' => 1690,
       'db.t1.micro' => 160,
@@ -298,6 +300,7 @@ module AwsPricing
       'hs1.8xlarge' => 64,
       'g2.2xlarge' => 64, 'g2.8xlarge' => 64,
       'g3.4xlarge' => 64, 'g3.8xlarge' => 64, 'g3.16xlarge' => 64,
+      'g3s.xlarge' => 64,
       'db.m1.small' => 64, 'db.m1.medium' => 64, 'db.m1.large' => 64, 'db.m1.xlarge' => 64,
       'db.m2.xlarge' => 64, 'db.m2.2xlarge' => 64, 'db.m2.4xlarge' => 64, 'db.cr1.8xlarge' => 64,
       'db.t1.micro' => 64,
@@ -337,6 +340,7 @@ module AwsPricing
       'hs1.8xlarge' => :ephemeral,
       'g2.2xlarge' => :ssd, 'g2.8xlarge' => :ssd,
       'g3.4xlarge' => :ebs, 'g3.8xlarge' => :ebs, 'g3.16xlarge' => :ebs,
+      'g3s.xlarge' => :ebs,
       'unknown' => :ephemeral,
       'db.m1.small' => :ephemeral, 'db.m1.medium' => :ephemeral, 'db.m1.large' => :ephemeral, 'db.m1.xlarge' => :ephemeral,
       'db.m2.xlarge' => :ephemeral, 'db.m2.2xlarge' => :ephemeral, 'db.m2.4xlarge' => :ephemeral, 'db.cr1.8xlarge' => :ephemeral,
@@ -486,6 +490,7 @@ module AwsPricing
       'g3.4xlarge' => [ 437, 20000], # EBSOptimized
       'g3,8xlarge' => [ 875, 40000], # EBSOptimized
       'g3.16xlarge'=> [1750, 80000], # EBSOptimized
+      'g3s.xlarge' => [100, 5000], # EBSOptimized
       'h1.2xlarge'  => [ 218, 12000], # EBSOptimized
       'h1.4xlarge'  => [ 437, 20000], # EBSOptimized
       'h1.8xlarge'  => [ 875, 40000], # EBSOptimized

data/lib/amazon-pricing/ec2-dhi-price-list.rb

@@ -28,6 +28,7 @@ module AwsPricing
       'p3' => { "2xlarge"=>8, "8xlarge"=>2, "16xlarge"=>1 },
       'g2' => { "2xlarge"=>4, "8xlarge"=>1 },
       'g3' => { "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
+      'g3s' => { "xlarge" => 1},
       'f1' => { "2xlarge"=>8, "4xlarge"=>4, "16xlarge" =>1 },
       'm3' => { "medium"=>32, "large"=>16, "xlarge"=>8, "2xlarge"=>4 },
       'd2' => { "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },

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

@@ -65,6 +65,7 @@ module AwsPricing
             'CurrentGen' => { # G2=GPU Graphics, G3=GPU-3 Graphics, P2=GPU Computes, P3=GPU-3 Computes, F1=FPGA Accelerated
                 'G2'  => ['g2.2xlarge', 'g2.8xlarge'],
                 'G3'  => ['g3.4xlarge', 'g3.8xlarge', 'g3.16xlarge'],
+                'G3S' => ['g3s.xlarge'],
                 'P2'  => ['p2.xlarge', 'p2.8xlarge', 'p2.16xlarge'],
                 'P3'  => ['p3.2xlarge', 'p3.8xlarge', 'p3.16xlarge'],
                 'F1'  => ['f1.2xlarge', 'f1.4xlarge', 'f1.16xlarge'],

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-VERSION = '0.1.121' # [major,minor.fix]: adding support to allow instance profile population
+VERSION = '0.1.122' # [major,minor.fix]: Support for g3s.xlarge instances
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.121
+  version: 0.1.122
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: amazon-pricing
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem