fog-aws 3.5.2 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5fc7b96fe4f26c5af84de803e8af393cee43b14b070a70be68b910da92cb61a
-  data.tar.gz: 2002ebf924fb5108475c69fbde9a0861455bb2087a237135781ae9e217adbe40
+  metadata.gz: 00fc42b895d14ab00b5e1f16425418ca937cfc3baef380f8b62b195eed0f712c
+  data.tar.gz: 2659d7e60f0744a45d07bfdb7ae0799d019d1db32011e0226a65215c93dcedf3
 SHA512:
-  metadata.gz: 76ee4f98fea0588666c18c65060d063b8a86215c2abcab505ad891411fd0639f449e54806d198973b6d117fc15be2b921b2e8932bc42d57ea11e89068f66b818
-  data.tar.gz: 005214de385e9474d415bb3780fbffddce311a552b81c60f3fcbaa67dc7116720d099e76cd69ffa6a41284d021e9b2cb53b14d129ecdc9be735a7128ca7295f6
+  metadata.gz: b0b5875cf43c3b3210ccd26330ad115a889e4802854200af17f57a4dc07a226141c3027cfe28f6d9310b451634a8a1d9cb7f817d47142e32b3af42266842a32a
+  data.tar.gz: 3d2ce1c9051d9806ac452adcf8992b85c8b3fe9e154834ca46136f3ab8defeab07a79ca45b76991f4d2001dc7e9f6bcf6f49d534a2eaf17e53573501565ceed1

data/.gitignore

@@ -14,3 +14,4 @@
 mkmf.log
 tests/.fog
 gemfiles/Gemfile-edge.lock
+.idea

data/CHANGELOG.md

@@ -1,8 +1,21 @@
 # Change Log
 
-## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
+## [v3.5.2](https://github.com/fog/fog-aws/tree/v3.5.2) (2019-07-16)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.5.1...v3.5.2)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v3.5.0...HEAD)
+**Closed issues:**
+
+- Support for Hong Kong Region \(ap-east-1\)? [\#527](https://github.com/fog/fog-aws/issues/527)
+- Make S3 Signature v4 Streaming Optional [\#523](https://github.com/fog/fog-aws/issues/523)
+
+**Merged pull requests:**
+
+- Add ap-east-1 \(Hong Kong\) to Fog::AWS.regions [\#528](https://github.com/fog/fog-aws/pull/528) ([tisba](https://github.com/tisba))
+- Update shared\_mock\_methods.rb [\#526](https://github.com/fog/fog-aws/pull/526) ([MiWieczo](https://github.com/MiWieczo))
+- WIP: Make S3 Signature v4 streaming optional [\#525](https://github.com/fog/fog-aws/pull/525) ([stanhu](https://github.com/stanhu))
+
+## [v3.5.1](https://github.com/fog/fog-aws/tree/v3.5.1) (2019-06-10)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.5.0...v3.5.1)
 
 **Merged pull requests:**
 
@@ -215,7 +228,7 @@
 - Add a top-level require that matches the gem name [\#367](https://github.com/fog/fog-aws/pull/367) ([lanej](https://github.com/lanej))
 - Fixed credential refresh when instance metadata host is inaccessible [\#366](https://github.com/fog/fog-aws/pull/366) ([ankane](https://github.com/ankane))
 - Handle multipart upload of empty files [\#365](https://github.com/fog/fog-aws/pull/365) ([fcheung](https://github.com/fcheung))
-- Add p2 instance types [\#362](https://github.com/fog/fog-aws/pull/362) ([Caged](https://github.com/Caged))
+- Add p2 instance types [\#362](https://github.com/fog/fog-aws/pull/362) ([caged](https://github.com/caged))
 - Exponential backoff [\#361](https://github.com/fog/fog-aws/pull/361) ([VVMichaelSawyer](https://github.com/VVMichaelSawyer))
 - Skip call to instance metadata host if region is specified [\#360](https://github.com/fog/fog-aws/pull/360) ([ankane](https://github.com/ankane))
 

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 [CONTRIBUTORS.md](https://github.com/fog/fog-aws/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2014-2019 [CONTRIBUTORS.md](https://github.com/fog/fog-aws/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -2,11 +2,9 @@
 
 ![Gem Version](https://badge.fury.io/rb/fog-aws.svg)
 [![Build Status](https://travis-ci.org/fog/fog-aws.svg?branch=master)](https://travis-ci.org/fog/fog-aws)
-[![Dependency Status](https://gemnasium.com/fog/fog-aws.svg)](https://gemnasium.com/fog/fog-aws)
 [![Test Coverage](https://codeclimate.com/github/fog/fog-aws/badges/coverage.svg)](https://codeclimate.com/github/fog/fog-aws)
 [![Code Climate](https://codeclimate.com/github/fog/fog-aws.svg)](https://codeclimate.com/github/fog/fog-aws)
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -39,7 +37,10 @@ default:
   aws_secret_access_key: <YOUR_SECRET_ACCESS_KEY>
 ```
 
-### Connecting to EC2 service
+### EC2
+
+#### Connecting to the EC2 Service:
+
 ```ruby
 ec2 = Fog::Compute.new :provider => 'AWS', :region => 'us-west-2'
 ```
@@ -50,7 +51,7 @@ You can review all the requests available with this service using ```#requests``
 ec2.requests # => [:allocate_address, :assign_private_ip_addresses, :associate_address, ...]
 ```
 
-### Launch an EC2 on-demand instance:
+#### Launch an EC2 on-demand instance:
 
 ```ruby
 response = ec2.run_instances(
@@ -67,19 +68,51 @@ instance.wait_for { ready? }
 puts instance.public_ip_address # => "356.300.501.20"
 ```
 
-### Terminate an EC2 instance:
+#### Terminate an EC2 instance:
 
 ```ruby
 instance = ec2.servers.get("i-02db5af4")
 instance.destroy
 ```
 
-Fog::AWS is more than EC2 since it supports many services provided by AWS. The best way to learn and to know about how many services are supported is to take a look at the source code. To review the tests directory and to play with the library in ```irb``` can be very helpful resources as well.
+`Fog::AWS` is more than EC2 since it supports many services provided by AWS. The best way to learn and to know about how many services are supported is to take a look at the source code. To review the tests directory and to play with the library in ```bin/console``` can be very helpful resources as well.
+
+### S3
+
+#### Connecting to the S3 Service:
+
+```ruby
+s3 = Fog::Storage.new(provider: 'AWS', region: 'eu-central-1')
+```
+
+#### Creating a file:
+
+```ruby
+directory = s3.directories.new(key: 'gaudi-portal-dev')
+file = directory.files.create(key: 'user/1/Gemfile', body: File.open('Gemfile'), tags: 'Org-Id=1&Service-Name=My-Service')
+```
+
+#### Listing files:
+
+```ruby
+directory = s3.directories.get('gaudi-portal-dev', prefix: 'user/1/')
+directory.files
+```
+
+#### Generating a URL for a file:
+
+```ruby
+directory.files.new(key: 'user/1/Gemfile').url(Time.now + 60)
+```
 
 ## Documentation
 
 See the [online documentation](http://www.rubydoc.info/github/fog/fog-aws) for a complete API reference.
 
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
 ## Contributing
 
 1. Fork it ( https://github.com/fog/fog-aws/fork )

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "fog-aws"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/fog-aws.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.14'
-  spec.add_development_dependency 'rake',    '~> 10.0'
-  spec.add_development_dependency 'rubyzip', '~> 1.2.1'
+  spec.add_development_dependency 'rake',    '>= 12.3.3'
+  spec.add_development_dependency 'rubyzip', '~> 1.3.0'
   spec.add_development_dependency 'shindo',  '~> 0.3'
 
   spec.add_dependency 'fog-core',  '~> 2.1'

data/lib/fog/aws.rb

@@ -26,6 +26,7 @@ module Fog
     autoload :ECS,              File.expand_path('../aws/ecs', __FILE__)
     autoload :EFS,              File.expand_path('../aws/efs', __FILE__)
     autoload :ELB,              File.expand_path('../aws/elb', __FILE__)
+    autoload :ELBV2,            File.expand_path('../aws/elbv2', __FILE__)
     autoload :EMR,              File.expand_path('../aws/emr', __FILE__)
     autoload :ElasticBeanstalk, File.expand_path('../aws/beanstalk', __FILE__)
     autoload :Elasticache,      File.expand_path('../aws/elasticache', __FILE__)
@@ -58,6 +59,7 @@ module Fog
     service(:ecs,             'ECS')
     service(:efs,             'EFS')
     service(:elb,             'ELB')
+    service(:elbv2,           'ELBV2')
     service(:emr,             'EMR')
     service(:federation,      'Federation')
     service(:glacier,         'Glacier')
@@ -228,9 +230,11 @@ module Fog
         'eu-central-1',
         'eu-north-1',
         'eu-west-1', 'eu-west-2', 'eu-west-3',
+        'me-south-1',
         'us-east-1', 'us-east-2',
         'us-west-1', 'us-west-2',
         'sa-east-1',
+        'us-gov-east-1',
         'us-gov-west-1'
       ]
     end

data/lib/fog/aws/elasticache.rb

@@ -171,8 +171,10 @@ module Fog
           @aws_credentials_expire_at = Time::now + 20
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1',
-                  'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+          unless ['ap-south-1', 'ap-northeast-1', 'ap-northeast-2', 'ap-northeast-3', 'ap-southeast-1', 'ap-southeast-2', 
+                  'eu-west-1', 'eu-west-2', 'eu-west-3', 'eu-central-1',
+                  'us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'ca-central-1',
+                  'sa-east-1', 'cn-north-1', 'cn-northwest-1', 'ap-east-1', 'us-gov-west-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/elb.rb

@@ -142,7 +142,7 @@ module Fog
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
-          @version    = options[:version] || '2012-06-01'
+          @version ||= options[:version] || '2012-06-01'
 
           setup_credentials(options)
         end

data/lib/fog/aws/elbv2.rb

@@ -0,0 +1,72 @@
+module Fog
+  module AWS
+    class ELBV2 < ELB
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :version, :instrumentor, :instrumentor_name
+
+      request_path 'fog/aws/requests/elbv2'
+      request :add_tags
+      request :create_load_balancer
+      request :describe_tags
+      request :remove_tags
+      request :describe_load_balancers
+      request :describe_listeners
+
+      class Real < ELB::Real
+        def initialize(options={})
+          @version = '2015-12-01'
+
+          super(options)
+        end
+      end
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            owner_id = Fog::AWS::Mock.owner_id
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :owner_id => owner_id,
+                :load_balancers_v2 => {}
+              }
+            end
+          end
+        end
+
+        def self.dns_name(name, region)
+          "#{name}-#{Fog::Mock.random_hex(8)}.#{region}.elb.amazonaws.com"
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        attr_reader :region
+
+        def initialize(options={})
+          @use_iam_profile = options[:use_iam_profile]
+
+          @region = options[:region] || 'us-east-1'
+          setup_credentials(options)
+
+          Fog::AWS.validate_region!(@region)
+        end
+
+        def setup_credentials(options)
+          @aws_access_key_id     = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key,@region,'elasticloadbalancing')
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,71 @@
 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 AWS
     class Compute
       FLAVORS = [
+        {
+          :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                     => 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                    => 'Micro Instance',
@@ -36,7 +98,7 @@ module Fog
         },
         {
           :id                      => 't2.small',
-          :name                    => 'Micro Instance',
+          :name                    => 'Small Instance',
           :bits                    => 64,
           :cores                   => 1,
           :disk                    => 0,
@@ -46,7 +108,7 @@ module Fog
         },
         {
           :id                      => 't2.medium',
-          :name                    => 'Micro Instance',
+          :name                    => 'Medium Instance',
           :bits                    => 64,
           :cores                   => 2,
           :disk                    => 0,
@@ -56,7 +118,7 @@ module Fog
         },
         {
           :id                      => 't2.large',
-          :name                    => 'Micro Instance',
+          :name                    => 'Large Instance',
           :bits                    => 64,
           :cores                   => 2,
           :disk                    => 0,
@@ -66,7 +128,7 @@ module Fog
         },
         {
           :id                      => 't2.xlarge',
-          :name                    => 'Micro Instance',
+          :name                    => 'Extra Large Instance',
           :bits                    => 64,
           :cores                   => 4,
           :disk                    => 0,
@@ -76,7 +138,7 @@ module Fog
         },
         {
           :id                      => 't2.2xlarge',
-          :name                    => 'Micro Instance',
+          :name                    => 'Double Extra Large Instance',
           :bits                    => 64,
           :cores                   => 8,
           :disk                    => 0,
@@ -154,6 +216,156 @@ module Fog
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
+        {
+          :id                      => 't3a.nano',
+          :name                    => 'T3a Nano',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 536,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't3a.micro',
+          :name                    => 'T3a Micro',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 1073,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't3a.small',
+          :name                    => 'T3a Small',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 2147,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't3a.medium',
+          :name                    => 'T3a Medium',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 4294,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't3a.large',
+          :name                    => 'T3a Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 8589,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't3a.xlarge',
+          :name                    => 'T3a Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 17179,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't3a.2xlarge',
+          :name                    => 'T3a Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 34359,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :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                     => 8590,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm6g.xlarge',
+          :name                    => 'M6G Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 17180,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm6g.2xlarge',
+          :name                    => 'M6G Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 34360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm6g.4xlarge',
+          :name                    => 'M6G Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 68719,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm6g.8xlarge',
+          :name                    => 'M6G Octuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 0,
+          :ram                     => 137439,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm6g.12xlarge',
+          :name                    => 'M6G Twelve Extra Large',
+          :bits                    => 64,
+          :cores                   => 48,
+          :disk                    => 0,
+          :ram                     => 206158,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm6g.16xlarge',
+          :name                    => 'M6G Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 274878,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
         {
           :id                      => 'm1.small',
           :name                    => 'Small Instance',
@@ -364,6 +576,16 @@ module Fog
           :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',
@@ -374,6 +596,26 @@ module Fog
           :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',
@@ -424,6 +666,16 @@ module Fog
           :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',
@@ -435,74 +687,164 @@ module Fog
           :instance_store_volumes  => 2
         },
         {
-          :id                      => 'g2.2xlarge',
-          :name                    => 'GPU Double Extra Large',
+          :id                      => 'c5d.24xlarge',
+          :name                    => 'C5d Twenty-four Extra Large',
           :bits                    => 64,
-          :cores                   => 8,
-          :disk                    => 60,
-          :ram                     => 16106,
+          :cores                   => 96,
+          :disk                    => 3600,
+          :ram                     => 206158,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 4
         },
         {
-          :id                      => 'g2.8xlarge',
-          :name                    => 'GPU Eight Extra Large',
+          :id                      => 'c5d.metal',
+          :name                    => 'C5d Metal',
           :bits                    => 64,
-          :cores                   => 32,
-          :disk                    => 240,
-          :ram                     => 64424,
+          :cores                   => 96,
+          :disk                    => 3600,
+          :ram                     => 206158,
           :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
+          :instance_store_volumes  => 4
         },
         {
-          :id                      => 'm2.xlarge',
-          :name                    => 'High-Memory Extra Large',
+          :id                      => 'c5n.large',
+          :name                    => 'C5n Large',
           :bits                    => 64,
           :cores                   => 2,
-          :disk                    => 420,
-          :ram                     => 18360,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 1
+          :disk                    => 0,
+          :ram                     => 5637,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'm2.2xlarge',
-          :name                    => 'High Memory Double Extra Large',
+          :id                      => 'c5n.xlarge',
+          :name                    => 'C5n Extra Large',
           :bits                    => 64,
           :cores                   => 4,
-          :disk                    => 850,
-          :ram                     => 36721,
+          :disk                    => 0,
+          :ram                     => 11274,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'm2.4xlarge',
-          :name                    => 'High Memory Quadruple Extra Large',
+          :id                      => 'c5n.2xlarge',
+          :name                    => 'C5n Double Extra Large',
           :bits                    => 64,
           :cores                   => 8,
-          :disk                    => 1690,
-          :ram                     => 73443,
+          :disk                    => 0,
+          :ram                     => 22549,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => 'cr1.8xlarge',
-          :name                    => 'High Memory Eight Extra Large',
+          :id                      => 'c5n.4xlarge',
+          :name                    => 'C5n Quadruple Extra Large',
           :bits                    => 64,
-          :cores                   => 32,
-          :disk                    => 240,
-          :ram                     => 261993,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 2
+          :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                      => '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',
@@ -684,6 +1026,106 @@ module Fog
           :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",
@@ -834,6 +1276,16 @@ module Fog
           :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",
@@ -844,6 +1296,16 @@ module Fog
           :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",
@@ -854,6 +1316,16 @@ module Fog
           :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",
@@ -894,6 +1366,16 @@ module Fog
           :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",
@@ -904,6 +1386,16 @@ module Fog
           :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",
@@ -914,6 +1406,16 @@ module Fog
           :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",
@@ -975,57 +1477,517 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "d2.xlarge",
-          :name                    => "D2 Extra Large",
+          :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                     => 32749,
-          :disk                    => 6000,
+          :ram                     => 34359,
+          :disk                    => 150,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 3
+          :instance_store_volumes  => 1
         },
         {
-          :id                      => "d2.2xlarge",
-          :name                    => "D2 Double Extra Large",
+          :id                      => "r5ad.2xlarge",
+          :name                    => "R5d (AMD) Double Extra Large",
           :bits                    => 64,
           :cores                   => 8,
-          :ram                     => 65498,
-          :disk                    => 12000,
+          :ram                     => 68719,
+          :disk                    => 300,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 6
+          :instance_store_volumes  => 1
         },
         {
-          :id                      => "d2.4xlarge",
-          :name                    => "D2 Quadruple Extra Large",
+          :id                      => "r5ad.4xlarge",
+          :name                    => "R5d (AMD) Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
-          :ram                     => 130996,
-          :disk                    => 24000,
+          :ram                     => 137438,
+          :disk                    => 600,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 12
+          :instance_store_volumes  => 2
         },
         {
-          :id                      => "d2.8xlarge",
-          :name                    => "D2 Eight Extra Large",
+          :id                      => "r5ad.12xlarge",
+          :name                    => "R5d (AMD) Twelve Extra Large",
           :bits                    => 64,
-          :cores                   => 36,
-          :ram                     => 261993,
-          :disk                    => 48000,
+          :cores                   => 48,
+          :ram                     => 412316,
+          :disk                    => 1800,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 24
+          :instance_store_volumes  => 2
         },
         {
-          :id                      => "m4.large",
-          :name                    => "M4 Large",
+          :id                      => "r5ad.24xlarge",
+          :name                    => "R5d (AMD) Twenty Four Extra Large",
           :bits                    => 64,
-          :cores                   => 2,
-          :ram                     => 8589,
-          :disk                    => 0,
+          :cores                   => 96,
+          :ram                     => 824633,
+          :disk                    => 3600,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 0
+          :instance_store_volumes  => 4
         },
         {
-          :id                      => "m4.xlarge",
+          :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                      => "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                    => "X1e Sixteen Extra Large",
+          :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,
@@ -1085,8 +2047,188 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.xlarge",
-          :name                    => "M5 Extra Large",
+          :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                   => 96,
+          :ram                     => 412316,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "m5d.metal",
+          :name                    => "M5d Metal",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 412316,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => "m5a.large",
+          :name                    => "M5 (AMD) Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8589,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5a.xlarge",
+          :name                    => "M5 (AMD) Extra Large",
           :bits                    => 64,
           :cores                   => 4,
           :ram                     => 17179,
@@ -1095,8 +2237,8 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.2xlarge",
-          :name                    => "M5 Double Extra Large",
+          :id                      => "m5a.2xlarge",
+          :name                    => "M5 (AMD) Double Extra Large",
           :bits                    => 64,
           :cores                   => 8,
           :ram                     => 34359,
@@ -1105,8 +2247,8 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.4xlarge",
-          :name                    => "M5 Quadruple Extra Large",
+          :id                      => "m5a.4xlarge",
+          :name                    => "M5 (AMD) Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
           :ram                     => 68719,
@@ -1115,8 +2257,18 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.12xlarge",
-          :name                    => "M5 Twelve Extra Large",
+          :id                      => "m5a.8xlarge",
+          :name                    => "M5 (AMD) Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 137438,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5a.12xlarge",
+          :name                    => "M5 (AMD) Twelve Extra Large",
           :bits                    => 64,
           :cores                   => 48,
           :ram                     => 206158,
@@ -1125,8 +2277,18 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5.24xlarge",
-          :name                    => "M5 Twenty Four Extra Large",
+          :id                      => "m5a.16xlarge",
+          :name                    => "M5 (AMD) Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 274877,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5a.24xlarge",
+          :name                    => "M5 (AMD) Twenty Four Extra Large",
           :bits                    => 64,
           :cores                   => 96,
           :ram                     => 412316,
@@ -1135,98 +2297,98 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5d.large",
-          :name                    => "M5d Large",
+          :id                      => "m5ad.large",
+          :name                    => "M5ad (AMD) Large",
           :bits                    => 64,
           :cores                   => 2,
           :ram                     => 8589,
           :disk                    => 75,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5d.xlarge",
-          :name                    => "M5d Extra Large",
+          :id                      => "m5ad.xlarge",
+          :name                    => "M5ad (AMD) Extra Large",
           :bits                    => 64,
           :cores                   => 4,
           :ram                     => 17179,
           :disk                    => 150,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5d.2xlarge",
-          :name                    => "M5d Double Extra Large",
+          :id                      => "m5ad.2xlarge",
+          :name                    => "M5ad (AMD) Double Extra Large",
           :bits                    => 64,
           :cores                   => 8,
           :ram                     => 34359,
           :disk                    => 300,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 1
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5d.4xlarge",
-          :name                    => "M5d Quadruple Extra Large",
+          :id                      => "m5ad.4xlarge",
+          :name                    => "M5ad (AMD) Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
           :ram                     => 68719,
           :disk                    => 600,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5d.12xlarge",
-          :name                    => "M5d Twelve Extra Large",
+          :id                      => "m5ad.12xlarge",
+          :name                    => "M5ad (AMD) Twelve Extra Large",
           :bits                    => 64,
           :cores                   => 48,
           :ram                     => 206158,
           :disk                    => 1800,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5d.24xlarge",
-          :name                    => "M5d Twenty Four Extra 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  => 4
+          :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5a.large",
-          :name                    => "M5 (AMD) Large",
+          :id                      => "m5n.large",
+          :name                    => "M5n Large",
           :bits                    => 64,
           :cores                   => 2,
-          :ram                     => 8589,
+          :ram                     => 8590,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5a.xlarge",
-          :name                    => "M5 (AMD) Extra Large",
+          :id                      => "m5n.xlarge",
+          :name                    => "M5n Extra Large",
           :bits                    => 64,
           :cores                   => 4,
-          :ram                     => 17179,
+          :ram                     => 17180,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5a.2xlarge",
-          :name                    => "M5 (AMD) Double Extra Large",
+          :id                      => "m5n.2xlarge",
+          :name                    => "M5n Double Extra Large",
           :bits                    => 64,
           :cores                   => 8,
-          :ram                     => 34359,
+          :ram                     => 34360,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5a.4xlarge",
-          :name                    => "M5 (AMD) Quadruple Extra Large",
+          :id                      => "m5n.4xlarge",
+          :name                    => "M5n Quadruple Extra Large",
           :bits                    => 64,
           :cores                   => 16,
           :ram                     => 68719,
@@ -1235,8 +2397,18 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5a.12xlarge",
-          :name                    => "M5 (AMD) Twelve Extra Large",
+          :id                      => "m5n.8xlarge",
+          :name                    => "M5n Octuple Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 137439,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5n.12xlarge",
+          :name                    => "M5n Twelve Extra Large",
           :bits                    => 64,
           :cores                   => 48,
           :ram                     => 206158,
@@ -1245,15 +2417,105 @@ module Fog
           :instance_store_volumes  => 0
         },
         {
-          :id                      => "m5a.24xlarge",
-          :name                    => "M5 (AMD) Twenty Four Extra Large",
+          :id                      => "m5n.16xlarge",
+          :name                    => "M5n Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 64,
+          :ram                     => 274878,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5n.24xlarge",
+          :name                    => "M5n Twenty-Four Extra Large",
           :bits                    => 64,
           :cores                   => 96,
-          :ram                     => 412316,
+          :ram                     => 412317,
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
+        {
+          :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                     => 68719,
+          :disk                    => 600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :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                     => 206158,
+          :disk                    => 1800,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :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                     => 412317,
+          :disk                    => 3600,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
         {
           :id                      => "p2.xlarge",
           :name                    => "General Purpose GPU Extra Large",
@@ -1314,6 +2576,66 @@ module Fog
           :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
+        },
         {
           :id                      => 'g3.4xlarge',
           :name                    => 'G3 Quadruple Extra Large',
@@ -1343,6 +2665,106 @@ module Fog
           :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
         }
       ]