fog-aws 3.0.0 → 3.10.0

data/lib/fog/aws/kinesis.rb

@@ -125,23 +125,26 @@ module Fog
       end
 
       class Mock
-        def self.mutex
-          @mutex ||= Mutex.new
-        end
-        def mutex; self.class.mutex; end
+        @mutex = Mutex.new
 
         def self.data
-          @data ||= Hash.new do |hash, region|
-            hash[region] = Hash.new do |region_hash, key|
-              region_hash[key] = {
-                :kinesis_streams => {}
-              }
+          @mutex.synchronize do
+            @data ||= Hash.new do |hash, region|
+              hash[region] = Hash.new do |region_hash, key|
+                region_hash[key] = {
+                  :kinesis_streams => {}
+                }
+              end
             end
+            
+            yield @data if block_given?
           end
         end
 
         def self.reset
-          @data = nil
+          @mutex.synchronize do
+            @data = nil
+          end
         end
 
         def initialize(options={})
@@ -153,31 +156,36 @@ module Fog
         end
 
         def data
-          self.class.data[@region][@aws_access_key_id]
+          self.class.data do |data|
+            data[@region][@aws_access_key_id]
+          end
         end
 
         def reset_data
-          self.class.data[@region].delete(@aws_access_key_id)
+          self.class.data do |data|
+            data[@region].delete(@aws_access_key_id)
+          end
         end
 
         def self.next_sequence_number
-          mutex.synchronize do
+          @mutex.synchronize do
             @sequence_number ||= -1
             @sequence_number += 1
             @sequence_number.to_s
           end
         end
+        
         def next_sequence_number; self.class.next_sequence_number; end
 
         def self.next_shard_id
-          mutex.synchronize do
+          @mutex.synchronize do
             @shard_id ||= -1
             @shard_id += 1
             "shardId-#{@shard_id.to_s.rjust(12, "0")}"
           end
         end
+        
         def next_shard_id; self.class.next_shard_id; end
-
       end
 
     end

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -99,6 +99,16 @@ module Fog
           reload
         end
 
+        def set_instance_protection(instance_ids, protected_from_scale_in)
+          requires :id
+          service.set_instance_protection(
+            id,
+            'InstanceIds' => instance_ids,
+            'ProtectedFromScaleIn' => protected_from_scale_in
+          )
+          reload
+        end
+
         def instances
           Fog::AWS::AutoScaling::Instances.new(:service => service).load(attributes[:instances])
         end

data/lib/fog/aws/models/cdn/distribution.rb

@@ -2,10 +2,10 @@ require 'fog/aws/models/cdn/invalidations'
 require 'fog/aws/models/cdn/distribution_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Distribution < Fog::Model
-        include Fog::CDN::AWS::DistributionHelper
+        include Fog::AWS::CDN::DistributionHelper
 
         identity :id,                 :aliases => 'Id'
 
@@ -33,7 +33,7 @@ module Fog
 
         def invalidations
           @invalidations ||= begin
-            Fog::CDN::AWS::Invalidations.new(
+            Fog::AWS::CDN::Invalidations.new(
               :distribution => self,
               :service => service
             )

data/lib/fog/aws/models/cdn/distribution_helper.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       module DistributionHelper
         def destroy
           requires :identity, :etag, :caller_reference

data/lib/fog/aws/models/cdn/distributions.rb

@@ -2,12 +2,12 @@ require 'fog/aws/models/cdn/distribution'
 require 'fog/aws/models/cdn/distributions_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Distributions < Fog::Collection
-        include Fog::CDN::AWS::DistributionsHelper
+        include Fog::AWS::CDN::DistributionsHelper
 
-        model Fog::CDN::AWS::Distribution
+        model Fog::AWS::CDN::Distribution
 
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'

data/lib/fog/aws/models/cdn/distributions_helper.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       module DistributionsHelper
 
         def all(options = {})

data/lib/fog/aws/models/cdn/invalidation.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Invalidation < Fog::Model
         identity :id,                :aliases => 'Id'
 

data/lib/fog/aws/models/cdn/invalidations.rb

@@ -1,8 +1,8 @@
 require 'fog/aws/models/cdn/invalidation'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Invalidations < Fog::Collection
         attribute :is_truncated,            :aliases => ['IsTruncated']
         attribute :max_items,               :aliases => ['MaxItems']
@@ -11,7 +11,7 @@ module Fog
 
         attribute :distribution
 
-        model Fog::CDN::AWS::Invalidation
+        model Fog::AWS::CDN::Invalidation
 
         def all(options = {})
           requires :distribution

data/lib/fog/aws/models/cdn/streaming_distribution.rb

@@ -2,10 +2,10 @@ require 'fog/aws/models/cdn/invalidations'
 require 'fog/aws/models/cdn/distribution_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class StreamingDistribution < Fog::Model
-        include Fog::CDN::AWS::DistributionHelper
+        include Fog::AWS::CDN::DistributionHelper
 
         identity :id,                 :aliases => 'Id'
 

data/lib/fog/aws/models/cdn/streaming_distributions.rb

@@ -2,12 +2,12 @@ require 'fog/aws/models/cdn/streaming_distribution'
 require 'fog/aws/models/cdn/distributions_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class StreamingDistributions < Fog::Collection
-        include Fog::CDN::AWS::DistributionsHelper
+        include Fog::AWS::CDN::DistributionsHelper
 
-        model Fog::CDN::AWS::StreamingDistribution
+        model Fog::AWS::CDN::StreamingDistribution
 
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'

data/lib/fog/aws/models/compute/address.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Address < Fog::Model
         identity  :public_ip,                  :aliases => 'publicIp'
 
@@ -10,6 +10,7 @@ module Fog
         attribute :server_id,                  :aliases => 'instanceId'
         attribute :network_interface_id,       :aliases => 'networkInterfaceId'
         attribute :network_interface_owner_id, :aliases => 'networkInterfaceOwnerId'
+        attribute :tags,                       :aliases => 'tagSet'
         attribute :domain
 
         def initialize(attributes = {})

data/lib/fog/aws/models/compute/addresses.rb

@@ -1,13 +1,13 @@
 require 'fog/aws/models/compute/address'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Addresses < Fog::Collection
         attribute :filters
         attribute :server
 
-        model Fog::Compute::AWS::Address
+        model Fog::AWS::Compute::Address
 
         # Used to create an IP address
         #

data/lib/fog/aws/models/compute/dhcp_option.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class DhcpOption < Fog::Model
         identity  :id,                          :aliases => 'dhcpOptionsId'
         attribute :dhcp_configuration_set,      :aliases => 'dhcpConfigurationSet'

data/lib/fog/aws/models/compute/dhcp_options.rb

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/dhcp_option'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class DhcpOptions < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::DhcpOption
+        model Fog::AWS::Compute::DhcpOption
 
         # Creates a new dhcp option
         #
@@ -17,7 +17,7 @@ module Fog
         # Returns the details of the new DHCP options
         #
         #>> AWS.dhcp_options.new
-        #=>   <Fog::Compute::AWS::DhcpOption
+        #=>   <Fog::AWS::Compute::DhcpOption
         #id=nil,
         #dhcp_configuration_set=nil,
         #tag_set=nil
@@ -38,10 +38,10 @@ module Fog
         # Returns an array of all DhcpOptions
         #
         #>> AWS.dhcp_options.all
-        #<Fog::Compute::AWS::DhcpOptions
+        #<Fog::AWS::Compute::DhcpOptions
         #filters={}
         #[
-        #<Fog::Compute::AWS::DhcpOption
+        #<Fog::AWS::Compute::DhcpOption
         #id="dopt-some-id",
         #dhcp_configuration_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
         #tag_set={}
@@ -68,7 +68,7 @@ module Fog
         # ==== Returns
         #
         #>> AWS.dhcp_options.get("dopt-12345678")
-        #=>   <Fog::Compute::AWS::DhcpOption
+        #=>   <Fog::AWS::Compute::DhcpOption
         #id="dopt-12345678",
         #dhcp_configuration_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
         #tag_set={}

data/lib/fog/aws/models/compute/flavor.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Flavor < Fog::Model
         identity :id
 

data/lib/fog/aws/models/compute/flavors.rb

@@ -1,16 +1,78 @@
 require 'fog/aws/models/compute/flavor'
 
+# To compute RAM from AWS doc https://aws.amazon.com/fr/ec2/instance-types
+# we can use this formula: RAM (in MB) = AWS_RAM (in GiB) * 1073.742 MB/GiB
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       FLAVORS = [
         {
-          :id                      => 't1.micro',
-          :name                    => 'Micro Instance',
-          :bits                    => 0,
+          :id                      => 'a1.medium',
+          :name                    => 'A1 Medium Instance',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 0,
+          :ram                     => 2147,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'a1.large',
+          :name                    => 'A1 Large Instance',
+          :bits                    => 64,
           :cores                   => 2,
           :disk                    => 0,
-          :ram                     => 613,
+          :ram                     => 4295,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'a1.xlarge',
+          :name                    => 'A1 Extra Large Instance',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 8590,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'a1.2xlarge',
+          :name                    => 'A1 Double Extra Large Instance',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 17180,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'a1.4xlarge',
+          :name                    => 'A1 Quadruple Extra Large Instance',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 34360,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'a1.metal',
+          :name                    => 'A1 Metal',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 34360,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't1.micro',
+          :name                    => 'T1 Micro Instance',
+          :bits                    => 32,
+          :cores                   => 1,
+          :disk                    => 0,
+          :ram                     => 658,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
@@ -20,805 +82,2905 @@ module Fog
           :bits                    => 64,
           :cores                   => 1,
           :disk                    => 0,
-          :ram                     => 512,
+          :ram                     => 536,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
         {
           :id                      => 't2.micro',
-          :name                    => 'Micro Instance',
+          :name                    => 'T2 Micro Instance',
           :bits                    => 64,
           :cores                   => 1,
           :disk                    => 0,
-          :ram                     => 1024,
+          :ram                     => 1073,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
         {
           :id                      => 't2.small',
-          :name                    => 'Micro Instance',
+          :name                    => 'T2 Small Instance',
           :bits                    => 64,
           :cores                   => 1,
           :disk                    => 0,
-          :ram                     => 2048,
+          :ram                     => 2147,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
         {
           :id                      => 't2.medium',
-          :name                    => 'Micro Instance',
+          :name                    => 'T2 Medium Instance',
           :bits                    => 64,
           :cores                   => 2,
           :disk                    => 0,
-          :ram                     => 4096,
+          :ram                     => 4294,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
         {
           :id                      => 't2.large',
-          :name                    => 'Micro Instance',
+          :name                    => 'T2 Large Instance',
           :bits                    => 64,
           :cores                   => 2,
           :disk                    => 0,
-          :ram                     => 8192,
+          :ram                     => 8589,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
         {
           :id                      => 't2.xlarge',
-          :name                    => 'Micro Instance',
+          :name                    => 'T2 Extra Large Instance',
           :bits                    => 64,
           :cores                   => 4,
           :disk                    => 0,
-          :ram                     => 16384,
+          :ram                     => 17179,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
         {
           :id                      => 't2.2xlarge',
-          :name                    => 'Micro Instance',
+          :name                    => 'T2 Double Extra Large Instance',
           :bits                    => 64,
           :cores                   => 8,
           :disk                    => 0,
-          :ram                     => 32768,
+          :ram                     => 34359,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'm1.small',
-          :name                    => 'Small Instance',
-          :bits                    => 32,
-          :cores                   => 1,
-          :disk                    => 160,
-          :ram                     => 1740.8,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 1
-        },
-        {
-          :id                      => 'm1.medium',
-          :name                    => 'Medium Instance',
-          :bits                    => 32,
+          :id                      => 't3.nano',
+          :name                    => 'T3 Nano',
+          :bits                    => 64,
           :cores                   => 2,
-          :disk                    => 400,
-          :ram                     => 3750,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 1
+          :disk                    => 0,
+          :ram                     => 536,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'm1.large',
-          :name                    => 'Large Instance',
+          :id                      => 't3.micro',
+          :name                    => 'T3 Micro',
           :bits                    => 64,
-          :cores                   => 4,
-          :disk                    => 850,
-          :ram                     => 7680,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 1073,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'm1.xlarge',
-          :name                    => 'Extra Large Instance',
+          :id                      => 't3.small',
+          :name                    => 'T3 Small',
           :bits                    => 64,
-          :cores                   => 8,
-          :disk                    => 1690,
-          :ram                     => 15360,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 2147,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 4
-        },
-        {
-          :id                      => 'c1.medium',
-          :bits                    => 32,
-          :cores                   => 5,
-          :disk                    => 350,
-          :name                    => 'High-CPU Medium',
-          :ram                     => 1740.8,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c1.xlarge',
-          :name                    => 'High-CPU Extra Large',
+          :id                      => 't3.medium',
+          :name                    => 'T3 Medium',
           :bits                    => 64,
-          :cores                   => 20,
-          :disk                    => 1690,
-          :ram                     => 7168,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 4294,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 4
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c3.large',
-          :name                    => 'C3 Large',
+          :id                      => 't3.large',
+          :name                    => 'T3 Large',
           :bits                    => 64,
           :cores                   => 2,
-          :disk                    => 32,
-          :ram                     => 3750,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 2
+          :disk                    => 0,
+          :ram                     => 8589,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c3.xlarge',
-          :name                    => 'C3 Extra Large',
+          :id                      => 't3.xlarge',
+          :name                    => 'T3 Extra Large',
           :bits                    => 64,
           :cores                   => 4,
-          :disk                    => 80,
-          :ram                     => 7168,
+          :disk                    => 0,
+          :ram                     => 17179,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c3.2xlarge',
-          :name                    => 'C3 Double Extra Large',
+          :id                      => 't3.2xlarge',
+          :name                    => 'T3 Double Extra Large',
           :bits                    => 64,
           :cores                   => 8,
-          :disk                    => 160,
-          :ram                     => 15360,
+          :disk                    => 0,
+          :ram                     => 34359,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c3.4xlarge',
-          :name                    => 'C3 Quadruple Extra Large',
+          :id                      => 't3a.nano',
+          :name                    => 'T3a Nano',
           :bits                    => 64,
-          :cores                   => 16,
-          :disk                    => 320,
-          :ram                     => 30720,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 536,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c3.8xlarge',
-          :name                    => 'C3 Eight Extra Large',
+          :id                      => 't3a.micro',
+          :name                    => 'T3a Micro',
           :bits                    => 64,
-          :cores                   => 16,
-          :disk                    => 640,
-          :ram                     => 61440,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 2
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 1073,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c4.large',
-          :name                    => 'C4 Large',
+          :id                      => 't3a.small',
+          :name                    => 'T3a Small',
           :bits                    => 64,
           :cores                   => 2,
           :disk                    => 0,
-          :ram                     => 3750,
+          :ram                     => 2147,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c4.xlarge',
-          :name                    => 'C4 Extra Large',
+          :id                      => 't3a.medium',
+          :name                    => 'T3a Medium',
           :bits                    => 64,
-          :cores                   => 4,
+          :cores                   => 2,
           :disk                    => 0,
-          :ram                     => 7168,
+          :ram                     => 4294,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c4.2xlarge',
-          :name                    => 'C4 Double Extra Large',
+          :id                      => 't3a.large',
+          :name                    => 'T3a Large',
           :bits                    => 64,
-          :cores                   => 8,
+          :cores                   => 2,
           :disk                    => 0,
-          :ram                     => 15360,
+          :ram                     => 8589,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c4.4xlarge',
-          :name                    => 'C4 Quadruple Extra Large',
+          :id                      => 't3a.xlarge',
+          :name                    => 'T3a Extra Large',
           :bits                    => 64,
-          :cores                   => 16,
+          :cores                   => 4,
           :disk                    => 0,
-          :ram                     => 30720,
+          :ram                     => 17179,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c4.8xlarge',
-          :name                    => 'C4 Eight Extra Large',
+          :id                      => 't3a.2xlarge',
+          :name                    => 'T3a Double Extra Large',
           :bits                    => 64,
-          :cores                   => 36,
+          :cores                   => 8,
           :disk                    => 0,
-          :ram                     => 61440,
+          :ram                     => 34359,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c5.large',
-          :name                    => 'C5 Large',
+          :id                      => 'm6g.medium',
+          :name                    => 'M6G Medium',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 0,
+          :ram                     => 4295,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm6g.large',
+          :name                    => 'M6G Large',
           :bits                    => 64,
           :cores                   => 2,
           :disk                    => 0,
-          :ram                     => 4096,
+          :ram                     => 8590,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c5.xlarge',
-          :name                    => 'C5 Extra Large',
+          :id                      => 'm6g.xlarge',
+          :name                    => 'M6G Extra Large',
           :bits                    => 64,
           :cores                   => 4,
           :disk                    => 0,
-          :ram                     => 8192,
+          :ram                     => 17180,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c5.2xlarge',
-          :name                    => 'C5 Double Extra Large',
+          :id                      => 'm6g.2xlarge',
+          :name                    => 'M6G Double Extra Large',
           :bits                    => 64,
           :cores                   => 8,
           :disk                    => 0,
-          :ram                     => 16384,
+          :ram                     => 34360,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c5.4xlarge',
-          :name                    => 'C5 Quadruple Extra Large',
+          :id                      => 'm6g.4xlarge',
+          :name                    => 'M6G Quadruple Extra Large',
           :bits                    => 64,
           :cores                   => 16,
           :disk                    => 0,
-          :ram                     => 32768,
+          :ram                     => 68719,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c5.9xlarge',
-          :name                    => 'C5 Nine Extra Large',
+          :id                      => 'm6g.8xlarge',
+          :name                    => 'M6G Octuple Extra Large',
           :bits                    => 64,
-          :cores                   => 36,
+          :cores                   => 32,
           :disk                    => 0,
-          :ram                     => 73728,
+          :ram                     => 137439,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'c5.18xlarge',
-          :name                    => 'C5 Eighteen Extra Large',
+          :id                      => 'm6g.12xlarge',
+          :name                    => 'M6G Twelve Extra Large',
           :bits                    => 64,
-          :cores                   => 72,
+          :cores                   => 48,
           :disk                    => 0,
-          :ram                     => 147456,
+          :ram                     => 206158,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => 'g2.2xlarge',
-          :name                    => 'GPU Double Extra Large',
+          :id                      => 'm6g.16xlarge',
+          :name                    => 'M6G Sixteen Extra Large',
           :bits                    => 64,
-          :cores                   => 8,
-          :disk                    => 60,
-          :ram                     => 15360,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 274878,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'g2.8xlarge',
-          :name                    => 'GPU Eight Extra Large',
+          :id                      => 'm6g.metal',
+          :name                    => 'M6G Metal',
           :bits                    => 64,
-          :cores                   => 32,
-          :disk                    => 240,
-          :ram                     => 61440,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 274878,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
-        },
-        {
-          :id                      => 'hs1.8xlarge',
-          :name                    => 'High Storage Eight Extra Large',
-          :bits                    => 64,
-          :cores                   => 35,
-          :disk                    => 50331648,
-          :ram                     => 119808,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 24
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'm2.xlarge',
-          :name                    => 'High-Memory Extra Large',
+          :id                      => 'm6gd.medium',
+          :name                    => 'M6GD Medium',
           :bits                    => 64,
-          :cores                   => 6.5,
-          :disk                    => 420,
-          :ram                     => 17510.4,
-          :ebs_optimized_available => false,
+          :cores                   => 1,
+          :disk                    => 59,
+          :ram                     => 4295,
+          :ebs_optimized_available => true,
           :instance_store_volumes  => 1
         },
         {
-          :id                      => 'm2.2xlarge',
-          :name                    => 'High Memory Double Extra Large',
+          :id                      => 'm6gd.large',
+          :name                    => 'M6GD Large',
           :bits                    => 64,
-          :cores                   => 13,
-          :disk                    => 850,
-          :ram                     => 35020.8,
+          :cores                   => 2,
+          :disk                    => 118,
+          :ram                     => 8590,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 1
         },
         {
-          :id                      => 'm2.4xlarge',
-          :name                    => 'High Memory Quadruple Extra Large',
+          :id                      => 'm6gd.xlarge',
+          :name                    => 'M6GD Extra Large',
           :bits                    => 64,
-          :cores                   => 26,
-          :disk                    => 1690,
-          :ram                     => 70041.6,
+          :cores                   => 4,
+          :disk                    => 237,
+          :ram                     => 17180,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 1
         },
         {
-          :id                      => 'cr1.8xlarge',
-          :name                    => 'High Memory Eight Extra Large',
+          :id                      => 'm6gd.2xlarge',
+          :name                    => 'M6GD Double Extra Large',
           :bits                    => 64,
-          :cores                   => 88,
-          :disk                    => 240,
-          :ram                     => 249856,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 2
+          :cores                   => 8,
+          :disk                    => 474,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
         },
         {
-          :id                      => 'm3.medium',
-          :name                    => 'M3 Medium',
+          :id                      => 'm6gd.4xlarge',
+          :name                    => 'M6GD Quadruple Extra Large',
           :bits                    => 64,
-          :cores                   => 1,
-          :disk                    => 4,
-          :ram                     => 3840,
-          :ebs_optimized_available => false,
+          :cores                   => 16,
+          :disk                    => 950,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
           :instance_store_volumes  => 1
         },
         {
-          :id                      => 'm3.large',
-          :name                    => 'M3 Large',
+          :id                      => 'm6gd.8xlarge',
+          :name                    => 'M6GD Octuple Extra Large',
           :bits                    => 64,
-          :cores                   => 2,
-          :disk                    => 32,
-          :ram                     => 7680,
-          :ebs_optimized_available => false,
+          :cores                   => 32,
+          :disk                    => 1900,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
           :instance_store_volumes  => 1
         },
         {
-          :id                      => 'm3.xlarge',
-          :name                    => 'M3 Extra Large',
+          :id                      => 'm6gd.12xlarge',
+          :name                    => 'M6GD Twelve Extra Large',
           :bits                    => 64,
-          :cores                   => 4,
-          :disk                    => 80,
-          :ram                     => 15360,
+          :cores                   => 48,
+          :disk                    => 2850,
+          :ram                     => 206158,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 2
         },
         {
-          :id                      => 'm3.2xlarge',
-          :name                    => 'M3 Double Extra Large',
+          :id                      => 'm6gd.16xlarge',
+          :name                    => 'M6GD Sixteen Extra Large',
           :bits                    => 64,
-          :cores                   => 8,
-          :disk                    => 160,
-          :ram                     => 30720,
+          :cores                   => 64,
+          :disk                    => 3800,
+          :ram                     => 274878,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 2
         },
         {
-          :id                      => "hi1.4xlarge",
-          :name                    => "High I/O Quadruple Extra Large Instance",
+          :id                      => 'm6gd.metal',
+          :name                    => 'M6GD Metal',
           :bits                    => 64,
-          :cores                   =>  35,
-          :disk                    => 2048,
-          :ram                     => 61952,
-          :ebs_optimized_available => false,
+          :cores                   => 64,
+          :disk                    => 3800,
+          :ram                     => 274878,
+          :ebs_optimized_available => true,
           :instance_store_volumes  => 2
         },
         {
-          :id                      => 'cc1.4xlarge',
-          :name                    => 'Cluster Compute Quadruple Extra Large',
+          :id                      => 'm1.small',
+          :name                    => 'M1 Small Instance',
+          :bits                    => 32,
+          :cores                   => 1,
+          :disk                    => 160,
+          :ram                     => 1825,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm1.medium',
+          :name                    => 'M1 Medium Instance',
+          :bits                    => 32,
+          :cores                   => 1,
+          :disk                    => 400,
+          :ram                     => 4026,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm1.large',
+          :name                    => 'M1 Large Instance',
           :bits                    => 64,
-          :cores                   => 33.5,
+          :cores                   => 2,
+          :disk                    => 850,
+          :ram                     => 8053,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'm1.xlarge',
+          :name                    => 'M1 Extra Large Instance',
+          :bits                    => 64,
+          :cores                   => 4,
           :disk                    => 1690,
-          :ram                     => 23552,
+          :ram                     => 16106,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'c1.medium',
+          :bits                    => 32,
+          :cores                   => 2,
+          :disk                    => 350,
+          :name                    => 'High-CPU Medium',
+          :ram                     => 1825,
           :ebs_optimized_available => false,
-          :instance_store_volumes  => 0
+          :instance_store_volumes  => 1
         },
         {
-          :id                      => 'cc2.8xlarge',
-          :name                    => 'Cluster Compute Eight Extra Large',
+          :id                      => 'c1.xlarge',
+          :name                    => 'High-CPU Extra Large',
           :bits                    => 64,
-          :cores                   => 88,
-          :disk                    => 3370,
-          :ram                     => 61952,
-          :ebs_optimized_available => false,
+          :cores                   => 8,
+          :disk                    => 1690,
+          :ram                     => 7516,
+          :ebs_optimized_available => true,
           :instance_store_volumes  => 4
         },
         {
-          :id                      => 'cg1.4xlarge',
-          :name                    => 'Cluster GPU Quadruple Extra Large',
+          :id                      => 'c3.large',
+          :name                    => 'C3 Large',
           :bits                    => 64,
-          :cores                   => 33.5,
-          :disk                    => 1690,
-          :ram                     => 22528,
+          :cores                   => 2,
+          :disk                    => 32,
+          :ram                     => 4026,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 2
         },
         {
-          :id                      => 'i2.xlarge',
-          :name                    => 'I2 Extra Large',
+          :id                      => 'c3.xlarge',
+          :name                    => 'C3 Extra Large',
           :bits                    => 64,
           :cores                   => 4,
-          :disk                    => 800,
-          :ram                     => 31232,
+          :disk                    => 80,
+          :ram                     => 8053,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 2
         },
         {
-          :id                      => 'i2.2xlarge',
-          :name                    => 'I2 Double Extra Large',
+          :id                      => 'c3.2xlarge',
+          :name                    => 'C3 Double Extra Large',
           :bits                    => 64,
           :cores                   => 8,
-          :disk                    => 1600,
-          :ram                     => 62464,
+          :disk                    => 160,
+          :ram                     => 16106,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 2
         },
         {
-          :id                      => 'i2.4xlarge',
-          :name                    => 'I2 Quadruple Extra Large',
+          :id                      => 'c3.4xlarge',
+          :name                    => 'C3 Quadruple Extra Large',
           :bits                    => 64,
           :cores                   => 16,
-          :disk                    => 3200,
-          :ram                     => 124928,
+          :disk                    => 320,
+          :ram                     => 32212,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 4
+          :instance_store_volumes  => 2
         },
         {
-          :id                      => 'i2.8xlarge',
-          :name                    => 'I2 Eight Extra Large',
+          :id                      => 'c3.8xlarge',
+          :name                    => 'C3 Eight Extra Large',
           :bits                    => 64,
           :cores                   => 32,
-          :disk                    => 6400,
-          :ram                     => 249856,
+          :disk                    => 640,
+          :ram                     => 64424,
           :ebs_optimized_available => false,
-          :instance_store_volumes  => 8
+          :instance_store_volumes  => 2
         },
         {
-          :id                      => 'i3.large',
-          :name                    => 'I3 Large',
+          :id                      => 'c4.large',
+          :name                    => 'C4 Large',
           :bits                    => 64,
           :cores                   => 2,
-          :disk                    => 475,
-          :ram                     => 15616,
+          :disk                    => 0,
+          :ram                     => 4026,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'i3.xlarge',
-          :name                    => 'I3 Extra Large',
+          :id                      => 'c4.xlarge',
+          :name                    => 'C4 Extra Large',
           :bits                    => 64,
           :cores                   => 4,
-          :disk                    => 950,
-          :ram                     => 31232,
+          :disk                    => 0,
+          :ram                     => 8053,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'i3.2xlarge',
-          :name                    => 'I3 Double Extra Large',
+          :id                      => 'c4.2xlarge',
+          :name                    => 'C4 Double Extra Large',
           :bits                    => 64,
           :cores                   => 8,
-          :disk                    => 1900,
-          :ram                     => 62464,
+          :disk                    => 0,
+          :ram                     => 16106,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'i3.4xlarge',
-          :name                    => 'I3 Quadruple Extra Large',
+          :id                      => 'c4.4xlarge',
+          :name                    => 'C4 Quadruple Extra Large',
           :bits                    => 64,
           :cores                   => 16,
-          :disk                    => 3800,
-          :ram                     => 124928,
+          :disk                    => 0,
+          :ram                     => 32212,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'i3.8xlarge',
-          :name                    => 'I3 Eight Extra Large',
+          :id                      => 'c4.8xlarge',
+          :name                    => 'C4 Eight Extra Large',
           :bits                    => 64,
-          :cores                   => 32,
-          :disk                    => 7600,
-          :ram                     => 249856,
+          :cores                   => 36,
+          :disk                    => 0,
+          :ram                     => 64424,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 4
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'i3.16xlarge',
-          :name                    => 'I3 Sixteen Extra Large',
+          :id                      => 'c5.large',
+          :name                    => 'C5 Large',
           :bits                    => 64,
-          :cores                   => 32,
-          :disk                    => 15200,
-          :ram                     => 499712,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 4294,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 8
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "r3.large",
-          :name                    => "R3 Large",
+          :id                      => 'c5.xlarge',
+          :name                    => 'C5 Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 8589,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.2xlarge',
+          :name                    => 'C5 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 17179,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.4xlarge',
+          :name                    => 'C5 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 34359,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.9xlarge',
+          :name                    => 'C5 Nine Extra Large',
+          :bits                    => 64,
+          :cores                   => 36,
+          :disk                    => 0,
+          :ram                     => 77309,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.12xlarge',
+          :name                    => 'C5 Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 0,
+          :ram                     => 103079,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.18xlarge',
+          :name                    => 'C5 Eighteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 72,
+          :disk                    => 0,
+          :ram                     => 154618,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.24xlarge',
+          :name                    => 'C5 Twenty-Four Extra Large',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 0,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.metal',
+          :name                    => 'C5 Metal',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 0,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5d.large',
+          :name                    => 'C5d Large',
           :bits                    => 64,
           :cores                   => 2,
-          :ram                     => 15616,
-          :disk                    => 32,
-          :ebs_optimized_available => false,
+          :disk                    => 50,
+          :ram                     => 4294,
+          :ebs_optimized_available => true,
           :instance_store_volumes  => 1
         },
         {
-          :id                      => "r3.xlarge",
-          :name                    => "R3 Extra Large",
+          :id                      => 'c5d.xlarge',
+          :name                    => 'C5d Extra Large',
           :bits                    => 64,
           :cores                   => 4,
-          :ram                     => 31232,
-          :disk                    => 80,
+          :disk                    => 100,
+          :ram                     => 8589,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 1
         },
         {
-          :id                      => "r3.2xlarge",
-          :name                    => "R3 Double Extra Large",
+          :id                      => 'c5d.2xlarge',
+          :name                    => 'C5d Double Extra Large',
           :bits                    => 64,
           :cores                   => 8,
-          :ram                     => 62464,
-          :disk                    => 160,
+          :disk                    => 200,
+          :ram                     => 17179,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c5d.4xlarge',
+          :name                    => 'C5d Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 400,
+          :ram                     => 34359,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 1
         },
         {
-          :id                      => "r3.4xlarge",
-          :name                    => "R3 Quadruple Extra Large",
+          :id                      => 'c5d.9xlarge',
+          :name                    => 'C5d Nine Extra Large',
+          :bits                    => 64,
+          :cores                   => 36,
+          :disk                    => 900,
+          :ram                     => 77309,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c5d.12xlarge',
+          :name                    => 'C5d Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 1800,
+          :ram                     => 103079,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c5d.18xlarge',
+          :name                    => 'C5d Eighteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 72,
+          :disk                    => 1800,
+          :ram                     => 154618,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c5d.24xlarge',
+          :name                    => 'C5d Twenty-four Extra Large',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 3600,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'c5d.metal',
+          :name                    => 'C5d Metal',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 3600,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'c5n.large',
+          :name                    => 'C5n Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 5637,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5n.xlarge',
+          :name                    => 'C5n Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 11274,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5n.2xlarge',
+          :name                    => 'C5n Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 22549,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5n.4xlarge',
+          :name                    => 'C5n Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 45097,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5n.9xlarge',
+          :name                    => 'C5n Nine Extra Large',
+          :bits                    => 64,
+          :cores                   => 36,
+          :disk                    => 0,
+          :ram                     => 103079,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5n.18xlarge',
+          :name                    => 'C5n Eighteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 72,
+          :disk                    => 0,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5n.metal',
+          :name                    => 'C5n Metal',
+          :bits                    => 64,
+          :cores                   => 72,
+          :disk                    => 0,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.medium',
+          :name                    => 'C6G Medium',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 0,
+          :ram                     => 2147,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.large',
+          :name                    => 'C6G Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 4295,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.xlarge',
+          :name                    => 'C6G Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 8590,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.2xlarge',
+          :name                    => 'C6G Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 17180,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.4xlarge',
+          :name                    => 'C6G Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.8xlarge',
+          :name                    => 'C6G Octuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 0,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.12xlarge',
+          :name                    => 'C6G Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 0,
+          :ram                     => 103079,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.16xlarge',
+          :name                    => 'C6G Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6g.metal',
+          :name                    => 'C6G Metal',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c6gd.medium',
+          :name                    => 'C6GD Medium',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 59,
+          :ram                     => 2147,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c6gd.large',
+          :name                    => 'C6GD Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 118,
+          :ram                     => 4295,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c6gd.xlarge',
+          :name                    => 'C6GD Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 237,
+          :ram                     => 8590,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c6gd.2xlarge',
+          :name                    => 'C6GD Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 474,
+          :ram                     => 17180,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c6gd.4xlarge',
+          :name                    => 'C6GD Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 950,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c6gd.8xlarge',
+          :name                    => 'C6GD Octuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 1900,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c6gd.12xlarge',
+          :name                    => 'C6GD Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 2850,
+          :ram                     => 103079,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c6gd.16xlarge',
+          :name                    => 'C6GD Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 3800,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c6gd.metal',
+          :name                    => 'C6GD Metal',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 3800,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'g2.2xlarge',
+          :name                    => 'GPU Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 60,
+          :ram                     => 16106,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g2.8xlarge',
+          :name                    => 'GPU Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 240,
+          :ram                     => 64424,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'hs1.8xlarge',
+          :name                    => 'High Storage Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 50331648,
+          :ram                     => 125627,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 24
+        },
+        {
+          :id                      => 'm2.xlarge',
+          :name                    => 'High-Memory Extra Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 420,
+          :ram                     => 18360,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm2.2xlarge',
+          :name                    => 'High Memory Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 850,
+          :ram                     => 36721,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm2.4xlarge',
+          :name                    => 'High Memory Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 1690,
+          :ram                     => 73443,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'cr1.8xlarge',
+          :name                    => 'High Memory Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 240,
+          :ram                     => 261993,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'm3.medium',
+          :name                    => 'M3 Medium',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 4,
+          :ram                     => 4026,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm3.large',
+          :name                    => 'M3 Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 32,
+          :ram                     => 8053,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm3.xlarge',
+          :name                    => 'M3 Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 80,
+          :ram                     => 16106,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'm3.2xlarge',
+          :name                    => 'M3 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 160,
+          :ram                     => 32212,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "hi1.4xlarge",
+          :name                    => "High I/O Quadruple Extra Large Instance",
+          :bits                    => 64,
+          :cores                   =>  35,
+          :disk                    => 2048,
+          :ram                     => 61952,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'cc1.4xlarge',
+          :name                    => 'Cluster Compute Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 33.5,
+          :disk                    => 1690,
+          :ram                     => 23552,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'cc2.8xlarge',
+          :name                    => 'Cluster Compute Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 3370,
+          :ram                     => 64961,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'cg1.4xlarge',
+          :name                    => 'Cluster GPU Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 33.5,
+          :disk                    => 1690,
+          :ram                     => 22528,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i2.xlarge',
+          :name                    => 'I2 Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 800,
+          :ram                     => 32749,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i2.2xlarge',
+          :name                    => 'I2 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 1600,
+          :ram                     => 65498,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i2.4xlarge',
+          :name                    => 'I2 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 3200,
+          :ram                     => 130996,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'i2.8xlarge',
+          :name                    => 'I2 Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 6400,
+          :ram                     => 261993,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 8
+        },
+        {
+          :id                      => 'i3.large',
+          :name                    => 'I3 Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 475,
+          :ram                     => 16374,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3.xlarge',
+          :name                    => 'I3 Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 950,
+          :ram                     => 32749,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3.2xlarge',
+          :name                    => 'I3 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 1900,
+          :ram                     => 65498,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3.4xlarge',
+          :name                    => 'I3 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 3800,
+          :ram                     => 130996,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i3.8xlarge',
+          :name                    => 'I3 Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 7600,
+          :ram                     => 261993,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'i3.16xlarge',
+          :name                    => 'I3 Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 15200,
+          :ram                     => 523986,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 8
+        },
+        {
+          :id                      => 'i3.metal',
+          :name                    => 'I3 Metal',
+          :bits                    => 64,
+          :cores                   => 72,
+          :disk                    => 15200,
+          :ram                     => 549756,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 8
+        },
+        {
+          :id                      => 'i3en.large',
+          :name                    => 'I3en Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 1250,
+          :ram                     => 17180,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3en.xlarge',
+          :name                    => 'I3en Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 2500,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3en.2xlarge',
+          :name                    => 'I3en Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 5000,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i3en.3xlarge',
+          :name                    => 'I3en Triple Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 7500,
+          :ram                     => 103079,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3en.6xlarge',
+          :name                    => 'I3en Sextuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 24,
+          :disk                    => 15000,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i3en.12xlarge',
+          :name                    => 'I3en Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 24,
+          :disk                    => 15000,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i3en.16xlarge',
+          :name                    => 'I3en Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 30000,
+          :ram                     => 412317,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'i3en.24xlarge',
+          :name                    => 'I3en Twenty-four Extra Large',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 60000,
+          :ram                     => 824634,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 8
+        },
+        {
+          :id                      => 'i3en.metal',
+          :name                    => 'I3en Metal',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 60000,
+          :ram                     => 824634,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 8
+        },
+        {
+          :id                      => "r3.large",
+          :name                    => "R3 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 16374,
+          :disk                    => 32,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r3.xlarge",
+          :name                    => "R3 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 32749,
+          :disk                    => 80,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r3.2xlarge",
+          :name                    => "R3 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 65498,
+          :disk                    => 160,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r3.4xlarge",
+          :name                    => "R3 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 130996,
+          :disk                    => 320,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r3.8xlarge",
+          :name                    => "R3 Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 261993,
+          :disk                    => 640,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r4.large",
+          :name                    => "R4 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 16374,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.xlarge",
+          :name                    => "R4 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 32749,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.2xlarge",
+          :name                    => "R4 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 65498,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.4xlarge",
+          :name                    => "R4 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 130996,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.8xlarge",
+          :name                    => "R4 Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 261993,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.16xlarge",
+          :name                    => "R4 Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 523986,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.large",
+          :name                    => "R5 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 17179,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.xlarge",
+          :name                    => "R5 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 34359,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.2xlarge",
+          :name                    => "R5 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 68719,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.4xlarge",
+          :name                    => "R5 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 137438,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.8xlarge",
+          :name                    => "R5 Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 274878,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.12xlarge",
+          :name                    => "R5 Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.16xlarge",
+          :name                    => "R5 Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 549756,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.24xlarge",
+          :name                    => "R5 Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5.metal",
+          :name                    => "R5 Metal",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5d.large",
+          :name                    => "R5d Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 17179,
+          :disk                    => 75,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5d.xlarge",
+          :name                    => "R5d Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 34359,
+          :disk                    => 150,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5d.2xlarge",
+          :name                    => "R5d Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 68719,
+          :disk                    => 300,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5d.4xlarge",
+          :name                    => "R5d Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 137438,
+          :disk                    => 600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5d.8xlarge",
+          :name                    => "R5d Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 137438,
+          :disk                    => 600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5d.12xlarge",
+          :name                    => "R5d Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5d.16xlarge",
+          :name                    => "R5d Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 549756,
+          :disk                    => 2400,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "r5d.24xlarge",
+          :name                    => "R5d Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "r5d.metal",
+          :name                    => "R5d Metal",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "r5a.large",
+          :name                    => "R5 (AMD) Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 17179,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5a.xlarge",
+          :name                    => "R5 (AMD) Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 34359,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5a.2xlarge",
+          :name                    => "R5 (AMD) Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 68719,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5a.4xlarge",
+          :name                    => "R5 (AMD) Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 137438,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5a.12xlarge",
+          :name                    => "R5 (AMD) Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5a.24xlarge",
+          :name                    => "R5 (AMD) Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5ad.large",
+          :name                    => "R5d (AMD) Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 17179,
+          :disk                    => 75,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5ad.xlarge",
+          :name                    => "R5d (AMD) Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 34359,
+          :disk                    => 150,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5ad.2xlarge",
+          :name                    => "R5d (AMD) Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 68719,
+          :disk                    => 300,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5ad.4xlarge",
+          :name                    => "R5d (AMD) Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 137438,
+          :disk                    => 600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5ad.12xlarge",
+          :name                    => "R5d (AMD) Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5ad.24xlarge",
+          :name                    => "R5d (AMD) Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "r5n.large",
+          :name                    => "R5n Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 17179,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5n.xlarge",
+          :name                    => "R5n Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 34359,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5n.2xlarge",
+          :name                    => "R5n Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 68719,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5n.4xlarge",
+          :name                    => "R5n Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 137438,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5n.8xlarge",
+          :name                    => "R5n Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 274878,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5n.12xlarge",
+          :name                    => "R5n Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5n.16xlarge",
+          :name                    => "R5n Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 549756,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5n.24xlarge",
+          :name                    => "R5n Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r5dn.large",
+          :name                    => "R5dn Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 17179,
+          :disk                    => 75,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5dn.xlarge",
+          :name                    => "R5dn Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 34359,
+          :disk                    => 150,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5dn.2xlarge",
+          :name                    => "R5dn Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 68719,
+          :disk                    => 300,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "r5dn.4xlarge",
+          :name                    => "R5dn Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 137438,
+          :disk                    => 600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5dn.8xlarge",
+          :name                    => "R5dn Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 274878,
+          :disk                    => 1200,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5dn.12xlarge",
+          :name                    => "R5dn Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "r5dn.16xlarge",
+          :name                    => "R5dn Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 549756,
+          :disk                    => 2400,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "r5dn.24xlarge",
+          :name                    => "R5dn Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'r6g.medium',
+          :name                    => 'R6G Medium',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 0,
+          :ram                     => 8590,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.large',
+          :name                    => 'R6G Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 17180,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.xlarge',
+          :name                    => 'R6G Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.2xlarge',
+          :name                    => 'R6G Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.4xlarge',
+          :name                    => 'R6G Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.8xlarge',
+          :name                    => 'R6G Octuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 0,
+          :ram                     => 274878,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.12xlarge',
+          :name                    => 'R6G Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 0,
+          :ram                     => 412317,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.16xlarge',
+          :name                    => 'R6G Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 549756,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6g.metal',
+          :name                    => 'R6G Metal',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 549756,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'r6gd.medium',
+          :name                    => 'R6GD Medium',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 59,
+          :ram                     => 8590,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'r6gd.large',
+          :name                    => 'R6GD Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 118,
+          :ram                     => 17180,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'r6gd.xlarge',
+          :name                    => 'R6GD Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 237,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'r6gd.2xlarge',
+          :name                    => 'R6GD Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 474,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'r6gd.4xlarge',
+          :name                    => 'R6GD Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 950,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'r6gd.8xlarge',
+          :name                    => 'R6GD Octuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 1900,
+          :ram                     => 274878,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'r6gd.12xlarge',
+          :name                    => 'R6GD Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 2850,
+          :ram                     => 412317,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'r6gd.16xlarge',
+          :name                    => 'R6GD Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 3800,
+          :ram                     => 549756,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'r6gd.metal',
+          :name                    => 'R6GD Metal',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 3800,
+          :ram                     => 549756,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "x1.16xlarge",
+          :name                    => "X1 Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 1047972,
+          :disk                    => 1920,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "x1.32xlarge",
+          :name                    => "X1 Thirty-two Extra Large",
+          :bits                    => 64,
+          :cores                   => 128,
+          :ram                     => 2095944,
+          :disk                    => 3840,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "x1e.xlarge",
+          :name                    => "X1e Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 130997,
+          :disk                    => 120,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "x1e.2xlarge",
+          :name                    => "X1e Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 261993,
+          :disk                    => 240,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "x1e.4xlarge",
+          :name                    => "X1e Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 523986,
+          :disk                    => 480,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "x1e.8xlarge",
+          :name                    => "X1e Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 1043677,
+          :disk                    => 960,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "x1e.16xlarge",
+          :name                    => "X1e Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 2095944,
+          :disk                    => 1920,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "x1e.32xlarge",
+          :name                    => "X1e Thirty-two Extra Large",
+          :bits                    => 64,
+          :cores                   => 128,
+          :ram                     => 3118147,
+          :disk                    => 3840,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "u-6tb1.metal",
+          :name                    => "U 6TB Metal",
+          :bits                    => 64,
+          :cores                   => 448,
+          :ram                     => 6597071,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "u-9tb1.metal",
+          :name                    => "U 9 TB Metal",
+          :bits                    => 64,
+          :cores                   => 448,
+          :ram                     => 9895606,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "u-12tb1.metal",
+          :name                    => "U 12 TB Metal",
+          :bits                    => 64,
+          :cores                   => 448,
+          :ram                     => 13194141,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "u-18tb1.metal",
+          :name                    => "U 18 TB Metal",
+          :bits                    => 64,
+          :cores                   => 448,
+          :ram                     => 19791212,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "u-24tb1.metal",
+          :name                    => "U 24 TB Metal",
+          :bits                    => 64,
+          :cores                   => 448,
+          :ram                     => 26388283,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "z1d.large",
+          :name                    => "Z1d Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 17180,
+          :disk                    => 75,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "z1d.xlarge",
+          :name                    => "Z1d Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 34359,
+          :disk                    => 150,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "z1d.2xlarge",
+          :name                    => "Z1d Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 68719,
+          :disk                    => 300,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "z1d.3xlarge",
+          :name                    => "Z1d Triple Extra Large",
+          :bits                    => 64,
+          :cores                   => 12,
+          :ram                     => 103079,
+          :disk                    => 450,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "z1d.6xlarge",
+          :name                    => "Z1d Sextuple Large",
+          :bits                    => 64,
+          :cores                   => 24,
+          :ram                     => 206158,
+          :disk                    => 900,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "z1d.12xlarge",
+          :name                    => "Z1d Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "z1d.metal",
+          :name                    => "Z1d Metal",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "d2.xlarge",
+          :name                    => "D2 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 32749,
+          :disk                    => 6000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 3
+        },
+        {
+          :id                      => "d2.2xlarge",
+          :name                    => "D2 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 65498,
+          :disk                    => 12000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 6
+        },
+        {
+          :id                      => "d2.4xlarge",
+          :name                    => "D2 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 130996,
+          :disk                    => 24000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 12
+        },
+        {
+          :id                      => "d2.8xlarge",
+          :name                    => "D2 Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 36,
+          :ram                     => 261993,
+          :disk                    => 48000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 24
+        },
+        {
+          :id                      => "h1.2xlarge",
+          :name                    => "H1 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 34360,
+          :disk                    => 2000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "h1.4xlarge",
+          :name                    => "H1 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 68719,
+          :disk                    => 4000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "h1.8xlarge",
+          :name                    => "H1 Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 137439,
+          :disk                    => 8000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "h1.16xlarge",
+          :name                    => "H1 Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 274878,
+          :disk                    => 16000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 8
+        },
+        {
+          :id                      => "m4.large",
+          :name                    => "M4 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8589,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.xlarge",
+          :name                    => "M4 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 17179,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.2xlarge",
+          :name                    => "M4 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 34359,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.4xlarge",
+          :name                    => "M4 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 68719,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.10xlarge",
+          :name                    => "M4 Ten Extra Large",
+          :bits                    => 64,
+          :cores                   => 40,
+          :ram                     => 171798,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.16xlarge",
+          :name                    => "M4 Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 262144,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.large",
+          :name                    => "M5 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8589,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.xlarge",
+          :name                    => "M5 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 17179,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.2xlarge",
+          :name                    => "M5 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 34359,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.4xlarge",
+          :name                    => "M5 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 68719,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.8xlarge",
+          :name                    => "M5 Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 137439,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.12xlarge",
+          :name                    => "M5 Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 206158,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.16xlarge",
+          :name                    => "M5 Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 274878,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.24xlarge",
+          :name                    => "M5 Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 412316,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.metal",
+          :name                    => "M5 Metal",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 412316,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5d.large",
+          :name                    => "M5d Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8589,
+          :disk                    => 75,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "m5d.xlarge",
+          :name                    => "M5d Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 17179,
+          :disk                    => 150,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "m5d.2xlarge",
+          :name                    => "M5d Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 34359,
+          :disk                    => 300,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "m5d.4xlarge",
+          :name                    => "M5d Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 68719,
+          :disk                    => 600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "m5d.8xlarge",
+          :name                    => "M5d Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 137439,
+          :disk                    => 1200,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "m5d.12xlarge",
+          :name                    => "M5d Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 206158,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "m5d.16xlarge",
+          :name                    => "M5d Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 274878,
+          :disk                    => 2400,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "m5d.24xlarge",
+          :name                    => "M5d Twenty Four Extra Large",
           :bits                    => 64,
-          :cores                   => 16,
-          :ram                     => 124928,
-          :disk                    => 320,
+          :cores                   => 96,
+          :ram                     => 412316,
+          :disk                    => 3600,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 4
         },
         {
-          :id                      => "r3.8xlarge",
-          :name                    => "R3 Eight Extra Large",
+          :id                      => "m5d.metal",
+          :name                    => "M5d Metal",
           :bits                    => 64,
-          :cores                   => 32,
-          :ram                     => 249856,
-          :disk                    => 640,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 2
+          :cores                   => 96,
+          :ram                     => 412316,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
         },
         {
-          :id                      => "r4.large",
-          :name                    => "R4 Large",
+          :id                      => "m5a.large",
+          :name                    => "M5 (AMD) Large",
           :bits                    => 64,
           :cores                   => 2,
-          :ram                     => 15616,
+          :ram                     => 8589,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "r4.xlarge",
-          :name                    => "R4 Extra Large",
+          :id                      => "m5a.xlarge",
+          :name                    => "M5 (AMD) Extra Large",
           :bits                    => 64,
           :cores                   => 4,
-          :ram                     => 31232,
+          :ram                     => 17179,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "r4.2xlarge",
-          :name                    => "R4 Double Extra Large",
+          :id                      => "m5a.2xlarge",
+          :name                    => "M5 (AMD) Double Extra Large",
           :bits                    => 64,
           :cores                   => 8,
-          :ram                     => 62464,
+          :ram                     => 34359,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "r4.4xlarge",
-          :name                    => "R4 Quadruple Extra Large",
+          :id                      => "m5a.4xlarge",
+          :name                    => "M5 (AMD) Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
-          :ram                     => 124928,
+          :ram                     => 68719,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "r4.8xlarge",
-          :name                    => "R4 Eight Extra Large",
+          :id                      => "m5a.8xlarge",
+          :name                    => "M5 (AMD) Eight Extra Large",
           :bits                    => 64,
           :cores                   => 32,
-          :ram                     => 249856,
+          :ram                     => 137438,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "r4.16xlarge",
-          :name                    => "R4 Sixteen Extra Large",
+          :id                      => "m5a.12xlarge",
+          :name                    => "M5 (AMD) Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 206158,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5a.16xlarge",
+          :name                    => "M5 (AMD) Sixteen Extra Large",
           :bits                    => 64,
           :cores                   => 32,
-          :ram                     => 499712,
+          :ram                     => 274877,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "d2.xlarge",
-          :name                    => "D2 Extra Large",
+          :id                      => "m5a.24xlarge",
+          :name                    => "M5 (AMD) Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 412316,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5ad.large",
+          :name                    => "M5ad (AMD) Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8589,
+          :disk                    => 75,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5ad.xlarge",
+          :name                    => "M5ad (AMD) Extra Large",
           :bits                    => 64,
           :cores                   => 4,
-          :ram                     => 31232,
-          :disk                    => 6000,
+          :ram                     => 17179,
+          :disk                    => 150,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 3
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "d2.2xlarge",
-          :name                    => "D2 Double Extra Large",
+          :id                      => "m5ad.2xlarge",
+          :name                    => "M5ad (AMD) Double Extra Large",
           :bits                    => 64,
           :cores                   => 8,
-          :ram                     => 62464,
-          :disk                    => 12000,
+          :ram                     => 34359,
+          :disk                    => 300,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 6
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "d2.4xlarge",
-          :name                    => "D2 Quadruple Extra Large",
+          :id                      => "m5ad.4xlarge",
+          :name                    => "M5ad (AMD) Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
-          :ram                     => 124928,
-          :disk                    => 24000,
+          :ram                     => 68719,
+          :disk                    => 600,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 12
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "d2.8xlarge",
-          :name                    => "D2 Eight Extra Large",
+          :id                      => "m5ad.12xlarge",
+          :name                    => "M5ad (AMD) Twelve Extra Large",
           :bits                    => 64,
-          :cores                   => 36,
-          :ram                     => 249856,
-          :disk                    => 48000,
+          :cores                   => 48,
+          :ram                     => 206158,
+          :disk                    => 1800,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 24
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "m4.large",
-          :name                    => "M4 Large",
+          :id                      => "m5ad.24xlarge",
+          :name                    => "M5ad (AMD) Twenty-four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 412316,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5n.large",
+          :name                    => "M5n Large",
           :bits                    => 64,
           :cores                   => 2,
-          :ram                     => 8192,
+          :ram                     => 8590,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m4.xlarge",
-          :name                    => "M4 Extra Large",
+          :id                      => "m5n.xlarge",
+          :name                    => "M5n Extra Large",
           :bits                    => 64,
           :cores                   => 4,
-          :ram                     => 16384,
+          :ram                     => 17180,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m4.2xlarge",
-          :name                    => "M4 Double Extra Large",
+          :id                      => "m5n.2xlarge",
+          :name                    => "M5n Double Extra Large",
           :bits                    => 64,
           :cores                   => 8,
-          :ram                     => 31232,
+          :ram                     => 34360,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m4.4xlarge",
-          :name                    => "M4 Quadruple Extra Large",
+          :id                      => "m5n.4xlarge",
+          :name                    => "M5n Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
-          :ram                     => 62464,
+          :ram                     => 68719,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m4.10xlarge",
-          :name                    => "M4 Ten Extra Large",
+          :id                      => "m5n.8xlarge",
+          :name                    => "M5n Octuple Extra Large",
           :bits                    => 64,
-          :cores                   => 40,
-          :ram                     => 163840,
+          :cores                   => 32,
+          :ram                     => 137439,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.large",
-          :name                    => "M5 Large",
+          :id                      => "m5n.12xlarge",
+          :name                    => "M5n Twelve Extra Large",
           :bits                    => 64,
-          :cores                   => 2,
-          :ram                     => 8192,
+          :cores                   => 48,
+          :ram                     => 206158,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.xlarge",
-          :name                    => "M5 Extra Large",
+          :id                      => "m5n.16xlarge",
+          :name                    => "M5n Sixteen Extra Large",
           :bits                    => 64,
-          :cores                   => 4,
-          :ram                     => 16384,
+          :cores                   => 64,
+          :ram                     => 274878,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.2xlarge",
-          :name                    => "M5 Double Extra Large",
+          :id                      => "m5n.24xlarge",
+          :name                    => "M5n Twenty-Four Extra Large",
           :bits                    => 64,
-          :cores                   => 8,
-          :ram                     => 32768,
+          :cores                   => 96,
+          :ram                     => 412317,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.4xlarge",
-          :name                    => "M5 Quadruple Extra Large",
+          :id                      => "m5dn.large",
+          :name                    => "M5dn Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8590,
+          :disk                    => 75,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "m5dn.xlarge",
+          :name                    => "M5dn Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 17180,
+          :disk                    => 150,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "m5dn.2xlarge",
+          :name                    => "M5dn Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 34360,
+          :disk                    => 300,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => "m5dn.4xlarge",
+          :name                    => "M5dn Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
-          :ram                     => 65536,
-          :disk                    => 0,
+          :ram                     => 68719,
+          :disk                    => 600,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 0
+          :instance_store_volumes  => 2
         },
         {
-          :id                      => "m5.12xlarge",
-          :name                    => "M5 Twelve Extra Large",
+          :id                      => "m5dn.8xlarge",
+          :name                    => "M5dn Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 137439,
+          :disk                    => 1200,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "m5dn.12xlarge",
+          :name                    => "M5dn Twelve Extra Large",
           :bits                    => 64,
           :cores                   => 48,
-          :ram                     => 196608,
-          :disk                    => 0,
+          :ram                     => 206158,
+          :disk                    => 1800,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 0
+          :instance_store_volumes  => 2
         },
         {
-          :id                      => "m5.24xlarge",
-          :name                    => "M5 Twenty Four Extra Large",
+          :id                      => "m5dn.16xlarge",
+          :name                    => "M5dn Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 274878,
+          :disk                    => 2400,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "m5dn.24xlarge",
+          :name                    => "M5dn Twenty-Four Extra Large",
           :bits                    => 64,
           :cores                   => 96,
-          :ram                     => 393216,
-          :disk                    => 0,
+          :ram                     => 412317,
+          :disk                    => 3600,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 0
+          :instance_store_volumes  => 4
         },
         {
           :id                      => "p2.xlarge",
           :name                    => "General Purpose GPU Extra Large",
           :bits                    => 64,
-          :cores                   => 2496,
+          :cores                   => 4,
           :ram                     => 65498,
           :disk                    => 0,
           :ebs_optimized_available => true,
@@ -828,7 +2990,7 @@ module Fog
           :id                      => "p2.8xlarge",
           :name                    => "General Purpose GPU Eight Extra Large",
           :bits                    => 64,
-          :cores                   => 19968,
+          :cores                   => 32,
           :ram                     => 523986,
           :disk                    => 0,
           :ebs_optimized_available => true,
@@ -838,7 +3000,7 @@ module Fog
           :id                      => "p2.16xlarge",
           :name                    => "General Purpose GPU Sixteen Extra Large",
           :bits                    => 64,
-          :cores                   => 39936,
+          :cores                   => 64,
           :ram                     => 785979,
           :disk                    => 0,
           :ebs_optimized_available => true,
@@ -848,8 +3010,8 @@ module Fog
           :id                      => "p3.2xlarge",
           :name                    => "Tesla GPU Two Extra Large",
           :bits                    => 64,
-          :cores                   => 5120,
-          :ram                     => 6100,
+          :cores                   => 8,
+          :ram                     => 65498,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
@@ -858,8 +3020,8 @@ module Fog
           :id                      => "p3.8xlarge",
           :name                    => "Tesla GPU Eight Extra Large",
           :bits                    => 64,
-          :cores                   => 204080,
-          :ram                     => 244000,
+          :cores                   => 32,
+          :ram                     => 261993,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
@@ -868,9 +3030,69 @@ module Fog
           :id                      => "p3.16xlarge",
           :name                    => "Tesla GPU Sixteen Extra Large",
           :bits                    => 64,
-          :cores                   => 408160,
-          :ram                     => 488000,
+          :cores                   => 64,
+          :ram                     => 523986,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "p3dn.24xlarge",
+          :name                    => "Tesla GPU Twenty-four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 824634,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'inf1.xlarge',
+          :name                    => 'Inf1 Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 8590,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'inf1.2xlarge',
+          :name                    => 'Inf1 Double xtra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 17180,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'inf1.6xlarge',
+          :name                    => 'Inf1 Sextuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 24,
+          :disk                    => 0,
+          :ram                     => 51540,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'inf1.24xlarge',
+          :name                    => 'Inf1 Twenty-four Extra Large',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 0,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'g3s.xlarge',
+          :name                    => 'G3s Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
           :disk                    => 0,
+          :ram                     => 32749,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
@@ -880,7 +3102,7 @@ module Fog
           :bits                    => 64,
           :cores                   => 16,
           :disk                    => 0,
-          :ram                     => 124928,
+          :ram                     => 130996,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
@@ -890,7 +3112,7 @@ module Fog
           :bits                    => 64,
           :cores                   => 32,
           :disk                    => 0,
-          :ram                     => 249856,
+          :ram                     => 261993,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
@@ -900,14 +3122,114 @@ module Fog
           :bits                    => 64,
           :cores                   => 64,
           :disk                    => 0,
-          :ram                     => 499712,
+          :ram                     => 523986,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'g3dn.xlarge',
+          :name                    => 'G3dn Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 125,
+          :ram                     => 171780,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g3dn.2xlarge',
+          :name                    => 'G3dn Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 225,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g3dn.4xlarge',
+          :name                    => 'G3dn Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 225,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g3dn.8xlarge',
+          :name                    => 'G3dn Octuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 900,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g3dn.16xlarge',
+          :name                    => 'G3dn Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 900,
+          :ram                     => 274878,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g3dn.12xlarge',
+          :name                    => 'G3dn Twelve Extra Large (4GPU)',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 900,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g3dn.metal',
+          :name                    => 'G3dn Metal (8GPU)',
+          :bits                    => 64,
+          :cores                   => 96,
+          :disk                    => 1800,
+          :ram                     => 412317,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'f1.2xlarge',
+          :name                    => 'F1 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 470,
+          :ram                     => 130997,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'f1.4xlarge',
+          :name                    => 'F1 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 940,
+          :ram                     => 261993,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'f1.16xlarge',
+          :name                    => 'F1 Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 3760,
+          :ram                     => 1047972,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
         }
       ]
 
       class Flavors < Fog::Collection
-        model Fog::Compute::AWS::Flavor
+        model Fog::AWS::Compute::Flavor
 
         # Returns an array of all flavors that have been created
         #
@@ -1031,7 +3353,7 @@ module Fog
         #        ebs_optimized_available=false,
         #        instance_store_volumes=0
         #      >,
-        #      <Fog::Compute::AWS::Flavor
+        #      <Fog::AWS::Compute::Flavor
         #        id="m3.xlarge",
         #        bits=64,
         #        cores=13,
@@ -1041,7 +3363,7 @@ module Fog
         #        ebs_optimized_available=true,
         #        instance_store_volumes=2
         #      >,
-        #      <Fog::Compute::AWS::Flavor
+        #      <Fog::AWS::Compute::Flavor
         #        id="m3.2xlarge",
         #        bits=64,
         #        cores=26,
@@ -1076,7 +3398,7 @@ module Fog
         #
 
         def all
-          load(Fog::Compute::AWS::FLAVORS)
+          load(Fog::AWS::Compute::FLAVORS)
           self
         end