Prep release 3.0 (#4776)

2022-01-21 09:42:36 -01:00 · 2022-01-21 09:42:36 -01:00 · a67412a5a9
commit a67412a5a9
parent d679a73a5f
28 changed files with 48593 additions and 112 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,25 @@
 Moto Changelog
 ===================

+3.0.0
+-----
+    This is a major release, and as such contains some breaking changes.
+
+    * Removed:
+        - All deprecated decorators have been removed
+
+    * Changes:
+        - The behaviour of the class-decorator has been reworked - the state is now reset before every test-method.
+        - ECS ARN's are now using the long format.
+
+    * Rebranded:
+        - The new mock_s3control-decorator has been introduced. The existing S3control methods (get/put/delete_public_access_block) are no longer available via mock_s3, only via mock_s3control.
+
+    * General:
+        - Python 3.5 support has been removed
+        - Python 3.10 is now supported
+
+
 2.3.2
 -----
    General:
--- a/IMPLEMENTATION_COVERAGE.md
+++ b/IMPLEMENTATION_COVERAGE.md
@ -2138,7 +2138,7 @@

 ## elb
 <details>
-<summary>37% implemented</summary>
+<summary>41% implemented</summary>

 - [ ] add_tags
 - [X] apply_security_groups_to_load_balancer
@ -2163,7 +2163,7 @@
 - [ ] detach_load_balancer_from_subnets
 - [ ] disable_availability_zones_for_load_balancer
 - [ ] enable_availability_zones_for_load_balancer
- [ ] modify_load_balancer_attributes
+- [X] modify_load_balancer_attributes
 - [ ] register_instances_with_load_balancer
 - [ ] remove_tags
 - [X] set_load_balancer_listener_ssl_certificate
--- a/docs/docs/services/elb.rst
+++ b/docs/docs/services/elb.rst
@ -48,7 +48,7 @@ elb
 - [ ] detach_load_balancer_from_subnets
 - [ ] disable_availability_zones_for_load_balancer
 - [ ] enable_availability_zones_for_load_balancer
- [ ] modify_load_balancer_attributes
+- [X] modify_load_balancer_attributes
 - [ ] register_instances_with_load_balancer
 - [ ] remove_tags
 - [X] set_load_balancer_listener_ssl_certificate
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json
@ -3287,6 +3287,46 @@
  "InstanceType": "m6g.xlarge",
  "Location": "apne2-az4"
 },
+ {
+  "InstanceType": "m6i.12xlarge",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.16xlarge",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.24xlarge",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.2xlarge",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.32xlarge",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.4xlarge",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.8xlarge",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.large",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "apne2-az4"
+ },
+ {
+  "InstanceType": "m6i.xlarge",
+  "Location": "apne2-az4"
+ },
 {
  "InstanceType": "mac1.metal",
  "Location": "apne2-az4"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json
@ -575,6 +575,46 @@
  "InstanceType": "m5d.xlarge",
  "Location": "aps1-az1"
 },
+ {
+  "InstanceType": "m6a.12xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.16xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.24xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.2xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.32xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.48xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.4xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.8xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.large",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "m6a.xlarge",
+  "Location": "aps1-az1"
+ },
 {
  "InstanceType": "m6g.12xlarge",
  "Location": "aps1-az1"
@ -955,6 +995,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "aps1-az1"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "aps1-az1"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "aps1-az1"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "aps1-az1"
@ -1715,6 +1791,46 @@
  "InstanceType": "m5d.xlarge",
  "Location": "aps1-az2"
 },
+ {
+  "InstanceType": "m6a.12xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.16xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.24xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.2xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.32xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.48xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.4xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.8xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.large",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "m6a.xlarge",
+  "Location": "aps1-az2"
+ },
 {
  "InstanceType": "m6g.12xlarge",
  "Location": "aps1-az2"
@ -2039,6 +2155,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "aps1-az2"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "aps1-az2"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "aps1-az2"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "aps1-az2"
@ -2779,6 +2931,46 @@
  "InstanceType": "m5d.xlarge",
  "Location": "aps1-az3"
 },
+ {
+  "InstanceType": "m6a.12xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.16xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.24xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.2xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.32xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.48xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.4xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.8xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.large",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "m6a.xlarge",
+  "Location": "aps1-az3"
+ },
 {
  "InstanceType": "m6g.12xlarge",
  "Location": "aps1-az3"
@ -3155,6 +3347,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "aps1-az3"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "aps1-az3"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "aps1-az3"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "aps1-az3"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json
@ -879,6 +879,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "cac1-az1"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "cac1-az1"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "cac1-az1"
+ },
 {
  "InstanceType": "t2.2xlarge",
  "Location": "cac1-az1"
@ -2579,6 +2615,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "cac1-az4"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "cac1-az4"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "cac1-az4"
+ },
 {
  "InstanceType": "t3.2xlarge",
  "Location": "cac1-az4"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json
@ -759,6 +759,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "euw3-az1"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "euw3-az1"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "euw3-az1"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "euw3-az1"
@ -1639,6 +1675,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "euw3-az2"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "euw3-az2"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "euw3-az2"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "euw3-az2"
@ -2567,6 +2639,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "euw3-az3"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "euw3-az3"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "euw3-az3"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "euw3-az3"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json
@ -151,6 +151,42 @@
  "InstanceType": "c5n.xlarge",
  "Location": "mes1-az1"
 },
+ {
+  "InstanceType": "c6g.12xlarge",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.16xlarge",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.2xlarge",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.4xlarge",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.8xlarge",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.large",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.medium",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.metal",
+  "Location": "mes1-az1"
+ },
+ {
+  "InstanceType": "c6g.xlarge",
+  "Location": "mes1-az1"
+ },
 {
  "InstanceType": "d2.2xlarge",
  "Location": "mes1-az1"
@ -587,6 +623,42 @@
  "InstanceType": "c5n.xlarge",
  "Location": "mes1-az2"
 },
+ {
+  "InstanceType": "c6g.12xlarge",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.16xlarge",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.2xlarge",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.4xlarge",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.8xlarge",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.large",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.medium",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.metal",
+  "Location": "mes1-az2"
+ },
+ {
+  "InstanceType": "c6g.xlarge",
+  "Location": "mes1-az2"
+ },
 {
  "InstanceType": "d2.2xlarge",
  "Location": "mes1-az2"
@ -1067,6 +1139,42 @@
  "InstanceType": "c5n.xlarge",
  "Location": "mes1-az3"
 },
+ {
+  "InstanceType": "c6g.12xlarge",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.16xlarge",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.2xlarge",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.4xlarge",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.8xlarge",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.large",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.medium",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.metal",
+  "Location": "mes1-az3"
+ },
+ {
+  "InstanceType": "c6g.xlarge",
+  "Location": "mes1-az3"
+ },
 {
  "InstanceType": "d2.2xlarge",
  "Location": "mes1-az3"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json
@ -2447,6 +2447,46 @@
  "InstanceType": "m6g.xlarge",
  "Location": "sae1-az3"
 },
+ {
+  "InstanceType": "m6i.12xlarge",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.16xlarge",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.24xlarge",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.2xlarge",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.32xlarge",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.4xlarge",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.8xlarge",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.large",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "sae1-az3"
+ },
+ {
+  "InstanceType": "m6i.xlarge",
+  "Location": "sae1-az3"
+ },
 {
  "InstanceType": "r3.2xlarge",
  "Location": "sae1-az3"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json
@ -4935,6 +4935,10 @@
  "InstanceType": "m6i.large",
  "Location": "use1-az4"
 },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "use1-az4"
+ },
 {
  "InstanceType": "m6i.xlarge",
  "Location": "use1-az4"
@ -8135,6 +8139,10 @@
  "InstanceType": "m6i.large",
  "Location": "use1-az6"
 },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "use1-az6"
+ },
 {
  "InstanceType": "m6i.xlarge",
  "Location": "use1-az6"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json
@ -2079,6 +2079,10 @@
  "InstanceType": "h1.8xlarge",
  "Location": "use2-az2"
 },
+ {
+  "InstanceType": "hpc6a.48xlarge",
+  "Location": "use2-az2"
+ },
 {
  "InstanceType": "i2.2xlarge",
  "Location": "use2-az2"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json
@ -3287,6 +3287,46 @@
  "InstanceType": "m6g.xlarge",
  "Location": "ap-northeast-2d"
 },
+ {
+  "InstanceType": "m6i.12xlarge",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.16xlarge",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.24xlarge",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.2xlarge",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.32xlarge",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.4xlarge",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.8xlarge",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.large",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "ap-northeast-2d"
+ },
+ {
+  "InstanceType": "m6i.xlarge",
+  "Location": "ap-northeast-2d"
+ },
 {
  "InstanceType": "mac1.metal",
  "Location": "ap-northeast-2d"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json
@ -575,6 +575,46 @@
  "InstanceType": "m5d.xlarge",
  "Location": "ap-south-1a"
 },
+ {
+  "InstanceType": "m6a.12xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.16xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.24xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.2xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.32xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.48xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.4xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.8xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.large",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "m6a.xlarge",
+  "Location": "ap-south-1a"
+ },
 {
  "InstanceType": "m6g.12xlarge",
  "Location": "ap-south-1a"
@ -955,6 +995,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "ap-south-1a"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "ap-south-1a"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "ap-south-1a"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "ap-south-1a"
@ -1775,6 +1851,46 @@
  "InstanceType": "m5d.xlarge",
  "Location": "ap-south-1b"
 },
+ {
+  "InstanceType": "m6a.12xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.16xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.24xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.2xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.32xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.48xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.4xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.8xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.large",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "m6a.xlarge",
+  "Location": "ap-south-1b"
+ },
 {
  "InstanceType": "m6g.12xlarge",
  "Location": "ap-south-1b"
@ -2151,6 +2267,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "ap-south-1b"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "ap-south-1b"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "ap-south-1b"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "ap-south-1b"
@ -2911,6 +3063,46 @@
  "InstanceType": "m5d.xlarge",
  "Location": "ap-south-1c"
 },
+ {
+  "InstanceType": "m6a.12xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.16xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.24xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.2xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.32xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.48xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.4xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.8xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.large",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "m6a.xlarge",
+  "Location": "ap-south-1c"
+ },
 {
  "InstanceType": "m6g.12xlarge",
  "Location": "ap-south-1c"
@ -3235,6 +3427,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "ap-south-1c"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "ap-south-1c"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "ap-south-1c"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "ap-south-1c"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json
@ -879,6 +879,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "ca-central-1a"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "ca-central-1a"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "ca-central-1a"
+ },
 {
  "InstanceType": "t2.2xlarge",
  "Location": "ca-central-1a"
@ -2579,6 +2615,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "ca-central-1d"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "ca-central-1d"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "ca-central-1d"
+ },
 {
  "InstanceType": "t3.2xlarge",
  "Location": "ca-central-1d"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json
@ -759,6 +759,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "eu-west-3a"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "eu-west-3a"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "eu-west-3a"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "eu-west-3a"
@ -1639,6 +1675,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "eu-west-3b"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "eu-west-3b"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "eu-west-3b"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "eu-west-3b"
@ -2567,6 +2639,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "eu-west-3c"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "eu-west-3c"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "eu-west-3c"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "eu-west-3c"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json
@ -151,6 +151,42 @@
  "InstanceType": "c5n.xlarge",
  "Location": "me-south-1a"
 },
+ {
+  "InstanceType": "c6g.12xlarge",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.16xlarge",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.2xlarge",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.4xlarge",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.8xlarge",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.large",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.medium",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.metal",
+  "Location": "me-south-1a"
+ },
+ {
+  "InstanceType": "c6g.xlarge",
+  "Location": "me-south-1a"
+ },
 {
  "InstanceType": "d2.2xlarge",
  "Location": "me-south-1a"
@ -587,6 +623,42 @@
  "InstanceType": "c5n.xlarge",
  "Location": "me-south-1b"
 },
+ {
+  "InstanceType": "c6g.12xlarge",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.16xlarge",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.2xlarge",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.4xlarge",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.8xlarge",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.large",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.medium",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.metal",
+  "Location": "me-south-1b"
+ },
+ {
+  "InstanceType": "c6g.xlarge",
+  "Location": "me-south-1b"
+ },
 {
  "InstanceType": "d2.2xlarge",
  "Location": "me-south-1b"
@ -1067,6 +1139,42 @@
  "InstanceType": "c5n.xlarge",
  "Location": "me-south-1c"
 },
+ {
+  "InstanceType": "c6g.12xlarge",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.16xlarge",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.2xlarge",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.4xlarge",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.8xlarge",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.large",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.medium",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.metal",
+  "Location": "me-south-1c"
+ },
+ {
+  "InstanceType": "c6g.xlarge",
+  "Location": "me-south-1c"
+ },
 {
  "InstanceType": "d2.2xlarge",
  "Location": "me-south-1c"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json
@ -2447,6 +2447,46 @@
  "InstanceType": "m6g.xlarge",
  "Location": "sa-east-1c"
 },
+ {
+  "InstanceType": "m6i.12xlarge",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.16xlarge",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.24xlarge",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.2xlarge",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.32xlarge",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.4xlarge",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.8xlarge",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.large",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "sa-east-1c"
+ },
+ {
+  "InstanceType": "m6i.xlarge",
+  "Location": "sa-east-1c"
+ },
 {
  "InstanceType": "r3.2xlarge",
  "Location": "sa-east-1c"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json
@ -4671,6 +4671,10 @@
  "InstanceType": "m6i.large",
  "Location": "us-east-1c"
 },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "us-east-1c"
+ },
 {
  "InstanceType": "m6i.xlarge",
  "Location": "us-east-1c"
@ -6463,6 +6467,10 @@
  "InstanceType": "m6i.large",
  "Location": "us-east-1d"
 },
+ {
+  "InstanceType": "m6i.metal",
+  "Location": "us-east-1d"
+ },
 {
  "InstanceType": "m6i.xlarge",
  "Location": "us-east-1d"
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json
@ -2079,6 +2079,10 @@
  "InstanceType": "h1.8xlarge",
  "Location": "us-east-2b"
 },
+ {
+  "InstanceType": "hpc6a.48xlarge",
+  "Location": "us-east-2b"
+ },
 {
  "InstanceType": "i2.2xlarge",
  "Location": "us-east-2b"
--- a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json
@ -599,6 +599,46 @@
  "InstanceType": "m5d.xlarge",
  "Location": "ap-south-1"
 },
+ {
+  "InstanceType": "m6a.12xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.16xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.24xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.2xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.32xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.48xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.4xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.8xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.large",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "m6a.xlarge",
+  "Location": "ap-south-1"
+ },
 {
  "InstanceType": "m6g.12xlarge",
  "Location": "ap-south-1"
@ -979,6 +1019,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "ap-south-1"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "ap-south-1"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "ap-south-1"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "ap-south-1"
--- a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json
@ -895,6 +895,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "ca-central-1"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "ca-central-1"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "ca-central-1"
+ },
 {
  "InstanceType": "t2.2xlarge",
  "Location": "ca-central-1"
--- a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json
+++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json
@ -759,6 +759,42 @@
  "InstanceType": "r6g.xlarge",
  "Location": "eu-west-3"
 },
+ {
+  "InstanceType": "r6gd.12xlarge",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.16xlarge",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.2xlarge",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.4xlarge",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.8xlarge",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.large",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.medium",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.metal",
+  "Location": "eu-west-3"
+ },
+ {
+  "InstanceType": "r6gd.xlarge",
+  "Location": "eu-west-3"
+ },
 {
  "InstanceType": "r6i.12xlarge",
  "Location": "eu-west-3"
--- a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json
@ -151,6 +151,42 @@
  "InstanceType": "c5n.xlarge",
  "Location": "me-south-1"
 },
+ {
+  "InstanceType": "c6g.12xlarge",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.16xlarge",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.2xlarge",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.4xlarge",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.8xlarge",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.large",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.medium",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.metal",
+  "Location": "me-south-1"
+ },
+ {
+  "InstanceType": "c6g.xlarge",
+  "Location": "me-south-1"
+ },
 {
  "InstanceType": "d2.2xlarge",
  "Location": "me-south-1"
--- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
@ -463,6 +463,10 @@
  "InstanceType": "h1.8xlarge",
  "Location": "us-east-2"
 },
+ {
+  "InstanceType": "hpc6a.48xlarge",
+  "Location": "us-east-2"
+ },
 {
  "InstanceType": "i2.2xlarge",
  "Location": "us-east-2"
--- a/moto/ec2/resources/instance_types.json
+++ b/moto/ec2/resources/instance_types.json
--- a/moto/iam/aws_managed_policies.py
+++ b/moto/iam/aws_managed_policies.py
--- a/scripts/get_instance_info.py
+++ b/scripts/get_instance_info.py
@ -47,7 +47,7 @@ def main():
    dest = os.path.join(root_dir, "moto/ec2/resources/instance_types.json")
    print("Writing data to {0}".format(dest))
    with open(dest, "w") as open_file:
-        json.dump(result, open_file, sort_keys=True)
+        json.dump(result, open_file, sort_keys=True, indent=1)


 if __name__ == "__main__":
--- a/tests/test_ec2/test_instance_type_offerings.py
+++ b/tests/test_ec2/test_instance_type_offerings.py
@ -57,7 +57,7 @@ def test_describe_instance_type_offering_filter_by_zone():
    offerings.should.have.key("InstanceTypeOfferings")
    offerings = offerings["InstanceTypeOfferings"]
    offerings.should_not.be.empty
-    offerings.should.have.length_of(448)
+    offerings.should.have.length_of(449)
    assert all([o["LocationType"] == "availability-zone" for o in offerings])
    assert all([o["Location"] == "us-east-1c" for o in offerings])
    assert any([o["InstanceType"] == "a1.2xlarge" for o in offerings])