amazon-pricing 0.1.136 → 0.1.137

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmQ4MjBkNTg3OWExYWFmZDNhYTQ4MzgxNmQ4NDJhMWUwNmNkZTA3Yg==
-  data.tar.gz: !binary |-
-    ZmUzZjE3Yzg1MDNiOGFiNTU0YmNmYTY2ZmU1MWIyODA2YzQ1YTlhOQ==
+SHA256:
+  metadata.gz: 790677a6fedb03b64e29ead8d2b34797f62d1fdb9b75a9bb97c5a1f0768be3ce
+  data.tar.gz: 450f608cf9fa1a5561751ec78ae4e2f526fbf7bddd20921c64c09515ef43fad8
 SHA512:
-  metadata.gz: !binary |-
-    YzAxOTk3MTIxZmIyYWMxZTIzOTQwMGUzOGFmYmI4NWRhNTg2Zjk0YjI3NWQw
-    NTUwMTFkNTcxYzk1MGExNDBiMzExMTJjZDUyNzU3MmZkODdlZTRlODM0NmM5
-    ZGRhYmY1YTk0Y2RmNGVhMTU5YmZhMmE3YjRiNDViMjc3ZDI2Yjc=
-  data.tar.gz: !binary |-
-    MzZjOWI5ZDY2ZTEyOTVlYjZjN2Q4YTcyYmE0ODlkNjQxOTdmODRjZjkyMDU5
-    YTU1OGRlZGYyMWVjNWQ4OGMxOGRmNGVhNjhlYmJmZGU5ZWMzNjU1MzE5OTdh
-    ZTE5ZWVmNTI2ZjllOWE1ZjFiNzhjMDI4Y2I0ZTE5ZDIzNTAzZTE=
+  metadata.gz: 9d77ffe49ee02ecf7eed4d1975d9674ea9dd9517c0a89f34d00d7d6dd3aaba01423de97cd447bd3da5dc0bf8d9c876c2858c2f7922bf17bdcc596c19f103785b
+  data.tar.gz: da3d551b86923b73c770fe01decff12ff11d82e9736302fbd3beb39027472e20c12883c8180f0dd09d60826b02923ceed653fd12e8fa436cc5656d8893715ade

data/Jenkinsfile

@@ -12,7 +12,7 @@ if (env.BRANCH_NAME == 'master') {
 }
 
 // NODE FOR RUBY2.3.3-RAILS3.2
-node('testing') {
+node('management-testing') {
     try {
         timestamps {
             stage('Setup_2.3.3-3.0') {

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

@@ -394,6 +394,18 @@ module AwsPricing
       'm5d.12xlarge' => :ten_gigabit,
       'm5d.24xlarge' => :twentyfive_gigabit,
       'm5d.metal' => :twentyfive_gigabit,
+      'm5a.large' => :ten_gigabit, # upto 10G
+      'm5a.xlarge' => :ten_gigabit, # upto 10G
+      'm5a.2xlarge' => :ten_gigabit, # upto 10G
+      'm5a.4xlarge' => :ten_gigabit, # upto 10G
+      'm5a.12xlarge' => :ten_gigabit,
+      'm5a.24xlarge' => :twenty_gigabit,
+      'm5ad.large' => :ten_gigabit, # upto 10G
+      'm5ad.xlarge' => :ten_gigabit, # upto 10G
+      'm5ad.2xlarge' => :ten_gigabit, # upto 10G
+      'm5ad.4xlarge' => :ten_gigabit, # upto 10G
+      'm5ad.12xlarge' => :ten_gigabit,
+      'm5ad.24xlarge' => :twenty_gigabit,
       'p2.xlarge' =>   :high,
       'p2.8xlarge' =>  :ten_gigabit,
       'p2.16xlarge' => :twenty_gigabit,
@@ -426,6 +438,18 @@ module AwsPricing
       'r5d.12xlarge' => :ten_gigabit,
       'r5d.24xlarge' => :twentyfive_gigabit,
       'r5d.metal' => :twentyfive_gigabit,
+      'r5a.large' => :ten_gigabit, # upto 10G
+      'r5a.xlarge' => :ten_gigabit, # upto 10G
+      'r5a.2xlarge' => :ten_gigabit, # upto 10G
+      'r5a.4xlarge' => :ten_gigabit, # upto 10G
+      'r5a.12xlarge' => :ten_gigabit,
+      'r5a.24xlarge' => :twenty_gigabit,
+      'r5ad.large' => :ten_gigabit, # upto 10G
+      'r5ad.xlarge' => :ten_gigabit, # upto 10G
+      'r5ad.2xlarge' => :ten_gigabit, # upto 10G
+      'r5ad.4xlarge' => :ten_gigabit, # upto 10G
+      'r5ad.12xlarge' => :ten_gigabit,
+      'r5ad.24xlarge' => :twenty_gigabit,
       't1.micro' => :very_low,
       't2.large' => :low_to_moderate,
       't2.medium' => :low_to_moderate,
@@ -456,22 +480,9 @@ module AwsPricing
       'z1d.6xlarge' => :ten_gigabit,
       'z1d.12xlarge' => :twentyfive_gigabit,
       'z1d.metal' => :twentyfive_gigabit,
-      'm5a.large' => :ten_gigabit, # upto 10G
-      'm5a.xlarge' => :ten_gigabit, # upto 10G
-      'm5a.2xlarge' => :ten_gigabit, # upto 10G
-      'm5a.4xlarge' => :ten_gigabit, # upto 10G
-      'm5a.12xlarge' => :ten_gigabit,
-      'm5a.24xlarge' => :twenty_gigabit,
-      'r5a.large' => :ten_gigabit, # upto 10G
-      'r5a.xlarge' => :ten_gigabit, # upto 10G
-      'r5a.2xlarge' => :ten_gigabit, # upto 10G
-      'r5a.4xlarge' => :ten_gigabit, # upto 10G
-      'r5a.12xlarge' => :ten_gigabit,
-      'r5a.24xlarge' => :twenty_gigabit,
       'u-6tb1.metal' =>  :twentyfive_gigabit,
       'u-9tb1.metal' =>  :twentyfive_gigabit,
       'u-12tb1.metal' => :twentyfive_gigabit,
-
     }
 
   end

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

@@ -7,6 +7,7 @@
 # License::   Distributes under the same terms as Ruby
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
+
 module AwsPricing
 
   class UnknownTypeError < NameError
@@ -197,10 +198,12 @@ module AwsPricing
       'm5.4xlarge' => 'M5 Quadruple Extra Large Instance', 'm5.12xlarge' => 'M5 12XL Instance',
       'm5.24xlarge' => 'M5 24XL Instance',
       'm5.metal' => 'M5 Metal Instance',
+      'm5a.large' => 'General Purpose M5A Large', 'm5a.xlarge' => 'General Purpose M5A Extra Large', 'm5a.2xlarge' => 'General Purpose M5A Double Extra Large', 'm5a.4xlarge' => 'General Purpose M5A Quadruple Extra Large',
+        'm5a.12xlarge' => 'General Purpose M5A Twelve Extra Large',  'm5a.24xlarge' => 'General Purpose M5A Twenty Four Extra Large',
       'm5d.large' => 'M5d Large Instance', 'm5d.xlarge' => 'M5d Extra Large Instance', 'm5d.2xlarge' => 'M5d Double Extra Large Instance',
-      'm5d.4xlarge' => 'M5d Quadruple Extra Large Instance', 'm5d.12xlarge' => 'M5d 12XL Instance',
-      'm5d.24xlarge' => 'M5d 24XL Instance',
-      'm5d.metal' => 'M5d Metal Instance',
+      'm5d.4xlarge' => 'M5d Quadruple Extra Large Instance', 'm5d.12xlarge' => 'M5d 12XL Instance', 'm5d.24xlarge' => 'M5d 24XL Instance', 'm5d.metal' => 'M5d Metal Instance',
+      'm5ad.large' => 'General Purpose M5AD Large', 'm5ad.xlarge' => 'General Purpose M5AD Extra Large', 'm5ad.2xlarge' => 'General Purpose M5AD Double Extra Large', 'm5ad.4xlarge' => 'General Purpose M5AD Quadruple Extra Large',
+        'm5ad.12xlarge' => 'General Purpose M5AD Twelve Extra Large',  'm5ad.24xlarge' => 'General Purpose M5AD Twenty Four Extra Large',
       'c1.medium' => 'High-CPU Medium', 'c1.xlarge' => 'High-CPU Extra Large',
       'hi1.4xlarge' => 'High I/O Quadruple Extra Large',
       'cg1.4xlarge' => 'Cluster GPU Quadruple Extra Large',
@@ -229,8 +232,12 @@ module AwsPricing
         'r4.8xlarge' => 'Memory Optimized Eight Extra Large Enterprise', 'r4.16xlarge' => 'Memory Optimized Hextuple Extra Large Enterprise',
       'r5.large' => 'Memory Optimized Large', 'r5.xlarge' => 'Memory Optimized Extra Large', 'r5.2xlarge' => 'Memory Optimized Double Extra Large', 'r5.4xlarge' => 'Memory Optimized Quadruple Extra Large', 'r5.12xlarge' => 'Memory Optimized Twelve Extra Large',
         'r5.24xlarge' => 'Memory Optimized Twenty Four Extra Large', 'r5.metal'=> 'Memory Optimized Metal',
+      'r5a.large' => 'Memory Optimized R5A Large', 'r5a.xlarge' => 'Memory Optimized R5A Extra Large', 'r5a.2xlarge' => 'Memory Optimized R5A Double Extra Large', 'r5a.4xlarge' => 'Memory Optimized R5A Quadruple Extra Large',
+        'r5a.12xlarge' => 'Memory Optimized R5A Twelve Extra Large', 'r5a.24xlarge' => 'Memory Optimized R5A Twenty Four Extra Large',
       'r5d.large' => 'Memory Optimized Large', 'r5d.xlarge' => 'Memory Optimized Extra Large', 'r5d.2xlarge' => 'Memory Optimized Double Extra Large', 'r5d.4xlarge' => 'Memory Optimized Quadruple Extra Large', 'r5d.12xlarge' => 'Memory Optimized Twelve Extra Large',
         'r5d.24xlarge' => 'Memory Optimized Twenty Four Extra Large', 'r5d.metal' => 'Memory Optimized Metal',
+      'r5ad.large' => 'Memory Optimized R5AD Large', 'r5ad.xlarge' => 'Memory Optimized R5AD Extra Large', 'r5ad.2xlarge' => 'Memory Optimized R5AD Double Extra Large', 'r5ad.4xlarge' => 'Memory Optimized R5AD Quadruple Extra Large',
+        'r5ad.12xlarge' => 'Memory Optimized R5AD Twelve Extra Large', 'r5ad.24xlarge' => 'Memory Optimized R5AD Twenty Four Extra Large',
       't2.nano' => 'Burstable Performance Instance Nano', 't2.micro' => 'Burstable Performance Instance Micro', 't2.small' => 'Burstable Performance Instance Small', 't2.medium' => 'Burstable Performance Instance Medium', 't2.large' => 'Burstable Performance Instance Large',
         't2.xlarge' => 'Burstable Performance Instance Extra Large', 't2.2xlarge' => 'Burstable Performance Instance Double Extra Large',
       't3.nano' => 'Burstable Performance Instance Nano', 't3.micro' => 'Burstable Performance Instance Micro', 't3.small' => 'Burstable Performance Instance Small', 't3.medium' => 'Burstable Performance Instance Medium', 't3.large' => 'Burstable Performance Instance Large',
@@ -254,10 +261,6 @@ module AwsPricing
       'f1.2xlarge' => 'FPGA Hardware Acceleration Double Extra Large', 'f1.4xlarge' => 'FPGA Hardware Acceleration Quadruple Extra Large', 'f1.16xlarge' =>  'FPGA Hardware Acceleration Hextuple Extra Large',
       'z1d.large' => 'Memory Optimized Z1D Large', 'z1d.xlarge' => 'Memory Optimized Z1D Extra large', 'z1d.2xlarge' => 'Memory Optimized Z1D Double Extra Large', 'z1d.3xlarge' => 'Memory Optimized Z1D Triple Extra Large',
         'z1d.6xlarge' => 'Memory Optimized Z1D 6 Extra Large', 'z1d.12xlarge' => 'Memory Optimized Z1D 12 Extra Large', 'z1d.metal' => 'Memory Optimized Z1D Metal',
-      'm5a.large' => 'General Purpose M5A Large', 'm5a.xlarge' => 'General Purpose M5A Extra Large', 'm5a.2xlarge' => 'General Purpose M5A Double Extra Large', 'm5a.4xlarge' => 'General Purpose M5A Quadruple Extra Large',
-        'm5a.12xlarge' => 'General Purpose M5A Twelve Extra Large',  'm5a.24xlarge' => 'General Purpose M5A Twenty Four Extra Large',
-      'r5a.large' => 'Memory Optimized R5A Large', 'r5a.xlarge' => 'Memory Optimized R5A Extra Large', 'r5a.2xlarge' => 'Memory Optimized R5A Double Extra Large', 'r5a.4xlarge' => 'Memory Optimized R5A Quadruple Extra Large',
-        'r5a.12xlarge' => 'Memory Optimized R5A Twelve Extra Large', 'r5a.24xlarge' => 'Memory Optimized R5A Twenty Four Extra Large',
       'u-6tb1.metal' => "Memory Optimized u-6tb1 Metal",
       'u-9tb1.metal' => "Memory Optimized u-9tb1 Metal",
       'u-12tb1.metal' => "Memory Optimized u-12tb1 Metal",
@@ -270,6 +273,8 @@ module AwsPricing
       'm4.large' => 0, 'm4.xlarge' => 0, 'm4.2xlarge' => 0, 'm4.4xlarge' => 0, 'm4.10xlarge' => 0, 'm4.16xlarge' => 0,
       'm5.large' => 0, 'm5.xlarge' => 0, 'm5.2xlarge' => 0, 'm5.4xlarge' => 0, 'm5.12xlarge' => 0, 'm5.24xlarge' => 0, 'm5.metal' => 0,
       'm5d.large' =>75, 'm5d.xlarge' => 150, 'm5d.2xlarge' => 300, 'm5d.4xlarge' => 600, 'm5d.12xlarge' => 1800, 'm5d.24xlarge' => 3600, 'm5d.metal' => 3600,
+      'm5a.large' => 0, 'm5a.xlarge' => 0, 'm5a.2xlarge' => 0, 'm5a.4xlarge' => 0, 'm5a.12xlarge' => 0, 'm5a.24xlarge' => 0, #ebs-only
+      'm5ad.large' => 75, 'm5ad.xlarge' => 150, 'm5ad.2xlarge' => 300, 'm5ad.4xlarge' => 600, 'm5ad.12xlarge' => 1800, 'm5ad.24xlarge' => 3600, #NVMe
       'c1.medium' => 350, 'c1.xlarge' => 1680,
       'hi1.4xlarge' => 2048,
       'cg1.4xlarge' => 1690,
@@ -293,7 +298,9 @@ module AwsPricing
       'r3.large' => 32, 'r3.xlarge' => 80, 'r3.2xlarge' => 160, 'r3.4xlarge' => 320, 'r3.8xlarge' => 640,
       'r4.large' => 0, 'r4.xlarge' => 0, 'r4.2xlarge' => 0, 'r4.4xlarge' => 0, 'r4.8xlarge' => 0, 'r4.16xlarge' => 0,
       'r5.large' => 0, 'r5.xlarge' => 0, 'r5.2xlarge' => 0, 'r5.4xlarge' => 0, 'r5.12xlarge' => 0, 'r5.24xlarge' => 0, 'r5.metal' => 0, # ebs-optimized
+      'r5a.large' => 0, 'r5a.xlarge' => 0, 'r5a.2xlarge' => 0, 'r5a.4xlarge' => 0, 'r5a.12xlarge' => 0, 'r5a.24xlarge' => 0, #ebs-only
       'r5d.large' => 75, 'r5d.xlarge' => 150, 'r5d.2xlarge' => 300, 'r5d.4xlarge' => 600, 'r5d.12xlarge' => 1800, 'r5d.24xlarge' => 3600, 'r5d.metal' => 3600, #NVMe
+      'r5ad.large' => 75, 'r5ad.xlarge' => 150, 'r5ad.2xlarge' => 300, 'r5ad.4xlarge' => 600,  'r5ad.12xlarge' => 1800, 'r5ad.24xlarge' => 3200, # NVMe
       't2.nano' => 0, 't2.micro' => 0, 't2.small' => 0, 't2.medium' => 0, 't2.large' => 0, 't2.xlarge' => 0, 't2.2xlarge' => 0,
       't3.nano' => 0, 't3.micro' => 0, 't3.small' => 0, 't3.medium' => 0, 't3.large' => 0, 't3.xlarge' => 0, 't3.2xlarge' => 0, #ebs-only
       'c4.large' => 0, 'c4.xlarge' => 0, 'c4.2xlarge' => 0, 'c4.4xlarge' => 0, 'c4.8xlarge' => 0,
@@ -307,8 +314,6 @@ module AwsPricing
       'p3dn.24xlarge' => 1800,
       'f1.2xlarge' => 470, 'f1.4xlarge' => 940, 'f1.16xlarge' => 3760,
       'z1d.large' => 75, 'z1d.xlarge' => 150, 'z1d.2xlarge' => 300, 'z1d.3xlarge' => 450, 'z1d.6xlarge' => 900, 'z1d.12xlarge' => 1800, 'z1d.metal' => 1800, # NVMe
-      'm5a.large' => 0, 'm5a.xlarge' => 0, 'm5a.2xlarge' => 0, 'm5a.4xlarge' => 0, 'm5a.12xlarge' => 0, 'm5a.24xlarge' => 0, #ebs-only
-      'r5a.large' => 0, 'r5a.xlarge' => 0, 'r5a.2xlarge' => 0, 'r5a.4xlarge' => 0, 'r5a.12xlarge' => 0, 'r5a.24xlarge' => 0, #ebs-only
       'u-6tb1.metal' =>  0, #ebs-only
       'u-9tb1.metal' =>  0, #ebs-only
       'u-12tb1.metal' => 0, #ebs-only
@@ -321,6 +326,8 @@ module AwsPricing
       'm4.large' => 64, 'm4.xlarge' => 64, 'm4.2xlarge' => 64, 'm4.4xlarge' => 64, 'm4.10xlarge' => 64, 'm4.16xlarge' => 64,
       'm5.large' => 64, 'm5.xlarge' => 64, 'm5.2xlarge' => 64, 'm5.4xlarge' => 64, 'm5.12xlarge' => 64, 'm5.24xlarge' => 64,
       'm5d.large' => 64, 'm5d.xlarge' => 64, 'm5d.2xlarge' => 64, 'm5d.4xlarge' => 64, 'm5d.12xlarge' => 64, 'm5d.24xlarge' => 64, 'm5d.metal' => 64,
+      'm5a.large' => 64, 'm5a.xlarge' => 64, 'm5a.2xlarge' => 64, 'm5a.4xlarge' => 64, 'm5a.12xlarge' => 64, 'm5a.24xlarge' => 64,
+      'm5ad.large' => 64,  'm5ad.xlarge' => 64, 'm5ad.2xlarge' => 64, 'm5ad.4xlarge' => 64, 'm5ad.12xlarge' => 65, 'm5ad.24xlarge' => 64,
       'c1.medium' => 32, 'c1.xlarge' => 64,
       'hi1.4xlarge' => 64,
       'cg1.4xlarge' => 64,
@@ -345,6 +352,8 @@ module AwsPricing
       'r4.large' => 64, 'r4.xlarge' => 64, 'r4.2xlarge' => 64, 'r4.4xlarge' => 64, 'r4.8xlarge' => 64, 'r4.16xlarge' => 64,
       'r5.large' => 64, 'r5.xlarge' => 64, 'r5.2xlarge' => 64, 'r5.4xlarge' => 64, 'r5.12xlarge' => 64, 'r5.24xlarge' => 64, 'r5.metal' => 64,
       'r5d.large' => 64, 'r5d.xlarge' => 64, 'r5d.2xlarge' => 64, 'r5d.4xlarge' => 64, 'r5d.12xlarge' => 64, 'r5d.24xlarge' => 64, 'r5d.metal' => 64,
+      'r5a.large' => 64, 'r5a.xlarge' => 64, 'r5a.2xlarge' => 64, 'r5a.4xlarge' => 64, 'r5a.12xlarge' => 64, 'r5a.24xlarge' => 64,
+      'r5ad.large' => 64, 'r5ad.xlarge' => 64, 'r5ad.2xlarge' => 64, 'r5ad.4xlarge' => 64, 'r5ad.12xlarge' => 64, 'r5ad.24xlarge' => 64,
       't2.nano' => 64, 't2.micro' => 64, 't2.small' => 64, 't2.medium' => 64, 't2.large' => 64, 't2.xlarge' => 64, 't2.2xlarge' => 64,
       't3.nano' => 64, 't3.micro' => 64, 't3.small' => 64, 't3.medium' => 64, 't3.large' => 64, 't3.xlarge' => 64, 't3.2xlarge' => 64,
       'c4.large' => 64, 'c4.xlarge' => 64, 'c4.2xlarge' => 64, 'c4.4xlarge' => 64, 'c4.8xlarge' => 64,
@@ -357,8 +366,6 @@ module AwsPricing
       'p3.2xlarge' => 64, 'p3.8xlarge' => 64, 'p3.16xlarge' => 64,
       'p3dn.24xlarge' => 64,
       'z1d.large' => 64, 'z1d.xlarge' => 64, 'z1d.2xlarge' => 64, 'z1d.3xlarge' => 64, 'z1d.6xlarge' => 64, 'z1d.12xlarge' => 64, 'z1d.metal' => 64,
-      'm5a.large' => 64, 'm5a.xlarge' => 64, 'm5a.2xlarge' => 64, 'm5a.4xlarge' => 64, 'm5a.12xlarge' => 64, 'm5a.24xlarge' => 64,
-      'r5a.large' => 64, 'r5a.xlarge' => 64, 'r5a.2xlarge' => 64, 'r5a.4xlarge' => 64, 'r5a.12xlarge' => 64, 'r5a.24xlarge' => 64,
       'u-6tb1.metal' =>  64,
       'u-9tb1.metal' =>  64,
       'u-12tb1.metal' => 64,
@@ -371,6 +378,8 @@ module AwsPricing
       'm4.large' => :ebs, 'm4.xlarge' => :ebs, 'm4.2xlarge' => :ebs, 'm4.4xlarge' => :ebs, 'm4.10xlarge' => :ebs, 'm4.16xlarge' => :ebs,
       'm5.large' => :ebs, 'm5.xlarge' => :ebs, 'm5.2xlarge' => :ebs, 'm5.4xlarge' => :ebs, 'm5.12xlarge' => :ebs, 'm5.24xlarge' => :ebs, 'm5.metal' => :ebs,
       'm5d.large' => :ssd, 'm5d.xlarge' => :ssd, 'm5d.2xlarge' => :ssd, 'm5d.4xlarge' => :ssd, 'm5d.12xlarge' => :ssd, 'm5d.24xlarge' => :ssd, 'm5d.metal' => :ssd,
+      'm5a.large' => :ebs, 'm5a.xlarge' => :ebs, 'm5a.2xlarge' => :ebs, 'm5a.4xlarge' => :ebs, 'm5a.12xlarge' => :ebs, 'm5a.24xlarge' => :ebs,
+      'm5ad.large' => :ssd, 'm5ad.xlarge' => :ssd, 'm5ad.2xlarge' => :ssd, 'm5ad.4xlarge' => :ssd, 'm5ad.12xlarge' => :ssd, 'm5ad.24xlarge' => :ssd,
       'c1.medium' => :ephemeral, 'c1.xlarge' => :ephemeral,
       'hi1.4xlarge' => :ssd,
       'cg1.4xlarge' => :ephemeral,
@@ -395,7 +404,9 @@ module AwsPricing
       'r3.large' => :ssd, 'r3.xlarge' => :ssd, 'r3.2xlarge' => :ssd, 'r3.4xlarge' => :ssd, 'r3.8xlarge' => :ssd,
       'r4.large' => :ebs, 'r4.xlarge' => :ebs, 'r4.2xlarge' => :ebs, 'r4.4xlarge' => :ebs, 'r4.8xlarge' => :ebs, 'r4.16xlarge' => :ebs,
       'r5.large' => :ebs, 'r5.xlarge' => :ebs, 'r5.2xlarge' => :ebs, 'r5.4xlarge' => :ebs, 'r5.12xlarge' => :ebs, 'r5.24xlarge' => :ebs, 'r5.metal' => :ebs,
+      'r5a.large' => :ebs, 'r5a.xlarge' => :ebs, 'r5a.2xlarge' => :ebs, 'r5a.4xlarge' => :ebs, 'r5a.12xlarge' => :ebs, 'r5a.24xlarge' => :ebs,
       'r5d.large' => :ssd, 'r5d.xlarge' => :ssd, 'r5d.2xlarge' => :ssd, 'r5d.4xlarge' => :ssd, 'r5d.12xlarge' => :ssd, 'r5d.24xlarge' => :ssd, 'r5d.metal' => :ssd,
+      'r5ad.large' => :ssd, 'r5ad.xlarge' => :ssd, 'r5ad.2xlarge' => :ssd, 'r5ad.4xlarge' => :ssd, 'r5ad.12xlarge' => :ssd, 'r5ad.24xlarge' => :ssd,
       't2.nano' => :ebs, 't2.micro' => :ebs, 't2.small' => :ebs, 't2.medium' => :ebs, 't2.large' => :ebs, 't2.xlarge' => :ebs, 't2.2xlarge' => :ebs,
       't3.nano' => :ebs, 't3.micro' => :ebs, 't3.small' => :ebs, 't3.medium' => :ebs, 't3.large' => :ebs, 't3.xlarge' => :ebs, 't3.2xlarge' => :ebs,
       'c4.large' => :ebs, 'c4.xlarge' => :ebs, 'c4.2xlarge' => :ebs, 'c4.4xlarge' => :ebs, 'c4.8xlarge' => :ebs,
@@ -409,8 +420,6 @@ module AwsPricing
       'p3dn.24xlarge' => :ssd,
       'f1.2xlarge' => :ssd, 'f1.4xlarge' => :ssd,'f1.16xlarge' => :ssd,
       'z1d.large' => :ssd, 'z1d.xlarge' => :ssd, 'z1d.2xlarge' => :ssd, 'z1d.3xlarge' => :ssd, 'z1d.6xlarge' => :ssd, 'z1d.12xlarge' => :ssd, 'z1d.metal' => :ssd,
-      'm5a.large' => :ebs, 'm5a.xlarge' => :ebs, 'm5a.2xlarge' => :ebs, 'm5a.4xlarge' => :ebs, 'm5a.12xlarge' => :ebs, 'm5a.24xlarge' => :ebs,
-      'r5a.large' => :ebs, 'r5a.xlarge' => :ebs, 'r5a.2xlarge' => :ebs, 'r5a.4xlarge' => :ebs, 'r5a.12xlarge' => :ebs, 'r5a.24xlarge' => :ebs,
       'u-6tb1.metal' =>  :ebs,
       'u-9tb1.metal' =>  :ebs,
       'u-12tb1.metal' => :ebs,
@@ -639,6 +648,12 @@ module AwsPricing
       'm5.12xlarge'=> [ 875, 40000], # EBSOptimized
       'm5.24xlarge'=> [ 1750, 80000], # EBSOptimized
       'm5.metal' =>   [ 1750, 80000],
+      'm5a.large' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [60, 3600]
+      'm5a.xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [100, 6000]
+      'm5a.2xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [146, 8333]
+      'm5a.4xlarge' => [ 265, 16000 ], #EBSOptimized
+      'm5a.12xlarge' => [ 675, 30000 ], #EBSOptimized
+      'm5a.24xlarge' => [ 1250, 60000 ], #EBSOptimized
       'm5d.large'   => [ 437, 18750], # NVMe peak.30min/24hrs, else [60, 3600]
       'm5d.xlarge'  => [ 437, 18750], # NVMe peak.30min/24hrs, else [107, 6000]
       'm5d.2xlarge' => [ 437, 18750], # NVMe peak.30min/24hrs, else [213, 12000]
@@ -646,6 +661,12 @@ module AwsPricing
       'm5d.12xlarge'=> [ 875, 40000], # NVMe
       'm5d.24xlarge'=> [ 1750, 80000], # NVMe
       'm5d.metal' => [ 1750, 80000],
+      'm5ad.large' => [265, 16000], # EBS Optimized
+      'm5ad.xlarge' => [265, 16000], # EBS Optimized
+      'm5ad.2xlarge' => [265, 16000], # EBS Optimized
+      'm5ad.4xlarge' => [265, 16000],  # EBS Optimized
+      'm5ad.12xlarge' => [675, 30000],  # EBS Optimized
+      'm5ad.24xlarge' => [1250, 60000],  # EBS Optimized
       'p2.xlarge'  => [  94,  6000], # EBSOptimized
       'p2.8xlarge' => [ 625, 32500], # EBSOptimized
       'p2.16xlarge'=> [1250, 65000], # EBSOptimized
@@ -670,6 +691,12 @@ module AwsPricing
       'r5.12xlarge' => [ 875, 40000], # EBSOptimized
       'r5.24xlarge' => [ 1750, 80000], # EBSOptimized
       'r5.metal' => [ 1750, 80000],
+      'r5a.large' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [60, 3600]
+      'r5a.xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [100, 6000]
+      'r5a.2xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [146, 8333]
+      'r5a.4xlarge' => [ 265, 16000 ], #EBSOptimized
+      'r5a.12xlarge' => [ 625, 30000 ], #EBSOptimized
+      'r5a.24xlarge' => [ 1250, 60000 ], #EBSOptimized
       'r5d.large' => [ 437, 18750], # EBSOptimized peak.30min/24hrs, else [60, 3600]
       'r5d.xlarge' => [ 437, 18750], # EBSOptimized peak.30min/24hrs, else [107, 6000]
       'r5d.2xlarge' => [ 437, 18750], # EBSOptimized peak.30min/24hrs, else [213, 12000]
@@ -677,6 +704,12 @@ module AwsPricing
       'r5d.12xlarge' => [ 875, 40000], # EBSOptimized
       'r5d.24xlarge' => [ 1750, 80000], # EBSOptimized
       'r5d.metal' => [ 1750, 80000],
+      'r5ad.large' => [265, 16000],  # EBS Optimized
+      'r5ad.xlarge' => [265, 16000],  # EBS Optimized
+      'r5ad.2xlarge' => [265, 16000],  # EBS Optimized
+      'r5ad.4xlarge' => [265, 16000],  # EBS Optimized
+      'r5ad.12xlarge' => [675, 30000],  # EBS Optimized
+      'r5ad.24xlarge' => [1250, 60000],  # EBS Optimized
       # t1.micro is EBS-only
       # t2.large is EBS-only
       # t2.medium is EBS-only
@@ -707,21 +740,9 @@ module AwsPricing
       'z1d.6xlarge' => [ 875, 40000], # EBSOptimized
       'z1d.12xlarge' => [ 1750, 80000], # EBSOptimized
       'z1d.metal' => [ 1750, 80000],
-      'm5a.large' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [60, 3600]
-      'm5a.xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [100, 6000]
-      'm5a.2xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [146, 8333]
-      'm5a.4xlarge' => [ 265, 16000 ], #EBSOptimized
-      'm5a.12xlarge' => [ 675, 30000 ], #EBSOptimized
-      'm5a.24xlarge' => [ 1250, 60000 ], #EBSOptimized
-      'r5a.large' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [60, 3600]
-      'r5a.xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [100, 6000]
-      'r5a.2xlarge' => [ 265, 16000 ], #EBSOptimized peak.30min/24hrs, else [146, 8333]
-      'r5a.4xlarge' => [ 265, 16000 ], #EBSOptimized
-      'r5a.12xlarge' => [ 625, 30000 ], #EBSOptimized
-      'r5a.24xlarge' => [ 1250, 60000 ], #EBSOptimized
       'u-6tb1.metal' => [ 1750, 80000], #EBSOptimized
       'u-9tb1.metal' =>  [ 1750, 80000], #EBSOptimized
       'u-12tb1.metal' => [ 1750, 80000], #EBSOptimized
     }
   end
-end
+end

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

@@ -38,13 +38,15 @@ module AwsPricing
       'h1' => { "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
       'r3' => { "large"=>16, "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1 },
       'r4' => { "large"=>32, "xlarge"=>16, "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1 },
-      'r5' => { "large"=>36, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
-      'r5d' => { "large"=>36, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
-      'r5a' => { "large"=>36, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1 },
+      'r5' => { "large"=> 48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
+      'r5d' => { "large"=> 48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
+      'r5a' => { "large"=> 48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1 },
+      'r5ad' => { "large"=> 48, "xlarge"=> 24, "2xlarge"=> 12, "4xlarge"=> 6, "12xlarge"=> 2, "24xlarge" => 1},
       'm4' => { "large"=>22, "xlarge"=>11, "2xlarge"=>5, "4xlarge"=>4, "10xlarge"=>1, "16xlarge"=>1 },
       'm5' => { "large"=>48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
       'm5d' => { "large"=>48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1, "metal"=>1 },
       'm5a' => { "large"=>48, "xlarge"=>24, "2xlarge"=>12, "4xlarge"=>6, "12xlarge"=>2, "24xlarge"=>1 },
+      'm5ad' => { "large"=> 48, "xlarge"=> 24, "2xlarge"=> 12, "4xlarge"=> 6, "12xlarge"=> 2, "24xlarge" => 1},
       'i2' => { "xlarge"=>8, "2xlarge"=>4, "4xlarge"=>2, "8xlarge"=>1, "16xlarge"=>1 },
       'i3' => { "large"=>32, "xlarge"=>16, "2xlarge"=>8, "4xlarge"=>4, "8xlarge"=>2, "16xlarge"=>1, "metal"=>1},
       'i3p' => {"16xlarge"=>1},

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

@@ -3,7 +3,8 @@ module AwsPricing
     module InstanceType
 
 
-      VPC_ONLY_INSTANCE_FAMILIES = ['a1', 'c4', 'c5', 'c5d', 'c5n', 'f1', 'g3', 'g3s', 'h1', 'i3', 'i3p', 'm4', 'm5', 'm5d', 'm5a', 'p2', 'p3', 'p3dn', 'r4', 't2', 't3', 'x1', 'x1e', 'r5', 'r5d', 'r5a', 'z1d', 'u-6tb1', 'u-9tb1', 'u-12tb1']
+      VPC_ONLY_INSTANCE_FAMILIES = ['a1', 'c4', 'c5', 'c5d', 'c5n', 'f1', 'g3', 'g3s', 'h1', 'i3', 'i3p', 'm4', 'm5', 'm5d', 'm5a', 'm5ad',
+        'p2', 'p3', 'p3dn', 'r4', 't2', 't3', 'x1', 'x1e', 'r5', 'r5d', 'r5a', 'r5ad', 'z1d', 'u-6tb1', 'u-9tb1', 'u-12tb1']
 
       METAL = 'metal'.freeze
       # the following family sizes should be kept in size order, see #api_name_to_nf below
@@ -15,6 +16,8 @@ module AwsPricing
                 'M5' => ['m5.large', 'm5.xlarge', 'm5.2xlarge', 'm5.4xlarge', 'm5.12xlarge', 'm5.24xlarge', 'm5.metal'],
                 'M5D' => ['m5d.large', 'm5d.xlarge', 'm5d.2xlarge', 'm5d.4xlarge', 'm5d.12xlarge', 'm5d.24xlarge', 'm5d.metal'],
                 'M5A' => ['m5a.large', 'm5a.xlarge', 'm5a.2xlarge', 'm5a.4xlarge', 'm5a.12xlarge', 'm5a.24xlarge'],
+                'M5AD' => ['m5ad.large', 'm5ad.xlarge', 'm5ad.2xlarge', 'm5ad.4xlarge', 'm5ad.12xlarge', 'm5ad.24xlarge'],
+
             },
             'PreviousGen' => {
                 'M1' => ['m1.small', 'm1.medium', 'm1.large', 'm1.xlarge'],
@@ -47,6 +50,7 @@ module AwsPricing
                 'R5' => ['r5.large', 'r5.xlarge', 'r5.2xlarge', 'r5.4xlarge', 'r5.12xlarge', 'r5.24xlarge', 'r5.metal'],
                 'R5D' => ['r5d.large', 'r5d.xlarge', 'r5d.2xlarge', 'r5d.4xlarge', 'r5d.12xlarge', 'r5d.24xlarge', 'r5d.metal'],
                 'R5A' => ['r5a.large', 'r5a.xlarge', 'r5a.2xlarge', 'r5a.4xlarge', 'r5a.12xlarge', 'r5a.24xlarge'],
+                'R5AD' => ['r5ad.large', 'r5ad.xlarge', 'r5ad.2xlarge', 'r5ad.4xlarge', 'r5ad.12xlarge', 'r5ad.24xlarge'],
                 'X1'  => ['x1.16xlarge', 'x1.32xlarge'],
                 'X1E'  => ['x1e.xlarge', 'x1e.2xlarge', 'x1e.4xlarge', 'x1e.8xlarge', 'x1e.16xlarge', 'x1e.32xlarge'],
                 'Z1D' => ['z1d.large', 'z1d.xlarge', 'z1d.2xlarge', 'z1d.3xlarge', 'z1d.6xlarge', 'z1d.12xlarge', 'z1d.metal'],

data/lib/amazon-pricing/version.rb

@@ -9,6 +9,6 @@
 #++
 module AwsPricing
 
-VERSION = '0.1.136' # [major,minor.fix]: Adding support for xl instance sizes to InstanceType module
+VERSION = '0.1.137' # [major,minor.fix]: Adding support for m5ad, r5ad instances
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.136
+  version: 0.1.137
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-04-08 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
@@ -73,26 +73,25 @@ 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: []
-rubyforge_project: amazon-pricing
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem