Repository: getmoto/moto
Pull request #9019 (2025-06-27 14:27:51)

[NetworkFirewall] Fix logging_configs struct to prevent AttributeError
This PR modifies the `logging_configs` attribute. The [LoggingConfiguration ](https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/network-firewall/client/describe_logging_configuration.html)structure should have been a Dict and was List Type causing an `AttributeError: 'list' object has no attribute 'get'` when trying to call `describe_logging_configuration` on a Firewall that did not have a LoggingConfiguration set.


Patch:
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json
index 9163da90f..3d37ca53c 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json
@@ -863,10 +863,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "afs1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "afs1-az1"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "afs1-az1"
@@ -875,10 +871,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "afs1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "afs1-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "afs1-az1"
@@ -1887,10 +1879,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "afs1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "afs1-az2"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "afs1-az2"
@@ -2831,10 +2819,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "afs1-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "afs1-az3"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "afs1-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json
index 6cb9e5c07..55431a62d 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json
@@ -3051,10 +3051,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apne1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apne1-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apne1-az1"
@@ -3067,10 +3063,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "apne1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "apne1-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "apne1-az1"
@@ -5983,10 +5975,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apne1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apne1-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apne1-az2"
@@ -9167,10 +9155,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apne1-az4"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apne1-az4"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apne1-az4"
@@ -9183,10 +9167,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "apne1-az4"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "apne1-az4"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "apne1-az4"
diff --git 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
index 0b2341cb5..eb162ae86 100644
--- 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
@@ -1863,14 +1863,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apne2-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apne2-az1"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "apne2-az1"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "apne2-az1"
@@ -1879,10 +1871,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "apne2-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "apne2-az1"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "apne2-az1"
@@ -5139,14 +5127,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apne2-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apne2-az3"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "apne2-az3"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "apne2-az3"
@@ -5155,10 +5135,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "apne2-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "apne2-az3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "apne2-az3"
diff --git 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
index fff7247d9..e7b92694d 100644
--- 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
@@ -2215,10 +2215,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "aps1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "aps1-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "aps1-az1"
@@ -4339,10 +4335,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "aps1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "aps1-az2"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "aps1-az2"
@@ -6579,10 +6571,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "aps1-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "aps1-az3"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "aps1-az3"
@@ -6591,10 +6579,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "aps1-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "aps1-az3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "aps1-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json
index 691203913..abca1be8a 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-2.json
@@ -995,10 +995,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "aps2-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "aps2-az1"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "aps2-az1"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json
index 20d06ff73..78d2835d6 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json
@@ -2471,10 +2471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apse1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apse1-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apse1-az1"
@@ -2487,10 +2483,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "apse1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "apse1-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "apse1-az1"
@@ -5119,10 +5111,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apse1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apse1-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apse1-az2"
@@ -5135,10 +5123,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "apse1-az2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "apse1-az2"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "apse1-az2"
@@ -7487,10 +7471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apse1-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apse1-az3"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apse1-az3"
@@ -7503,10 +7483,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "apse1-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "apse1-az3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "apse1-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json
index 38f783825..8c4efae86 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json
@@ -1019,6 +1019,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "apse2-az1"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "apse2-az1"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "apse2-az1"
+ },
  {
   "InstanceType": "im4gn.16xlarge",
   "Location": "apse2-az1"
@@ -2727,10 +2771,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "apse2-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apse2-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apse2-az1"
@@ -3839,6 +3879,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "apse2-az2"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "apse2-az2"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "apse2-az2"
+ },
  {
   "InstanceType": "im4gn.16xlarge",
   "Location": "apse2-az2"
@@ -5475,10 +5559,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "apse2-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apse2-az2"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "apse2-az2"
@@ -6495,6 +6575,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "apse2-az3"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "apse2-az3"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "apse2-az3"
+ },
  {
   "InstanceType": "im4gn.16xlarge",
   "Location": "apse2-az3"
@@ -8159,10 +8283,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "apse2-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "apse2-az3"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "apse2-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json
index e3bfa1f86..df7b38db6 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-5.json
@@ -1615,6 +1615,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "apse5-az2"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "apse5-az2"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "apse5-az2"
+ },
  {
   "InstanceType": "m6g.12xlarge",
   "Location": "apse5-az2"
@@ -2699,6 +2743,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "apse5-az3"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "apse5-az3"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "apse5-az3"
+ },
  {
   "InstanceType": "m6g.12xlarge",
   "Location": "apse5-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json
index cf8c4780e..2c10edc46 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json
@@ -2895,14 +2895,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "euc1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "euc1-az1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "euc1-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "euc1-az1"
@@ -2915,10 +2907,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euc1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euc1-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "euc1-az1"
@@ -5963,14 +5951,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "euc1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "euc1-az2"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "euc1-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "euc1-az2"
@@ -5983,10 +5963,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euc1-az2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euc1-az2"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "euc1-az2"
@@ -9223,10 +9199,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "euc1-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "euc1-az3"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "euc1-az3"
@@ -9239,10 +9211,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euc1-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euc1-az3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "euc1-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json
index a1eeab986..99d09d804 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json
@@ -1899,10 +1899,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eun1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eun1-az1"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "eun1-az1"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json
index 3dae20162..20b99e3de 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json
@@ -1191,10 +1191,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eus1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eus1-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eus1-az1"
@@ -2475,10 +2471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eus1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eus1-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eus1-az2"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json
index 12f7e37e7..e01b4095d 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json
@@ -3019,18 +3019,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "euw1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "euw1-az1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "euw1-az1"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "euw1-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "euw1-az1"
@@ -3043,10 +3031,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euw1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euw1-az1"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "euw1-az1"
@@ -6251,18 +6235,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "euw1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "euw1-az2"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "euw1-az2"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "euw1-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "euw1-az2"
@@ -6275,10 +6247,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euw1-az2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euw1-az2"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "euw1-az2"
@@ -9443,10 +9411,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "euw1-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "euw1-az3"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "euw1-az3"
@@ -9459,10 +9423,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euw1-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euw1-az3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "euw1-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json
index 5d293fae1..fce083a01 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json
@@ -2019,10 +2019,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euw2-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euw2-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "euw2-az1"
@@ -6399,10 +6395,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euw2-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euw2-az3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "euw2-az3"
diff --git 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
index 6154e3317..33c5a3b5a 100644
--- 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
@@ -1599,10 +1599,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "euw3-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "euw3-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "euw3-az1"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/il-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/il-central-1.json
index 22e11b2c7..84d4f6c76 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/il-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/il-central-1.json
@@ -259,6 +259,42 @@
   "InstanceType": "c6in.xlarge",
   "Location": "ilc1-az1"
  },
+ {
+  "InstanceType": "c7g.12xlarge",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.16xlarge",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.2xlarge",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.4xlarge",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.8xlarge",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.large",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.medium",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.metal",
+  "Location": "ilc1-az1"
+ },
+ {
+  "InstanceType": "c7g.xlarge",
+  "Location": "ilc1-az1"
+ },
  {
   "InstanceType": "d3.2xlarge",
   "Location": "ilc1-az1"
@@ -1243,6 +1279,42 @@
   "InstanceType": "c6in.xlarge",
   "Location": "ilc1-az2"
  },
+ {
+  "InstanceType": "c7g.12xlarge",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.16xlarge",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.2xlarge",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.4xlarge",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.8xlarge",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.large",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.medium",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.metal",
+  "Location": "ilc1-az2"
+ },
+ {
+  "InstanceType": "c7g.xlarge",
+  "Location": "ilc1-az2"
+ },
  {
   "InstanceType": "d3.2xlarge",
   "Location": "ilc1-az2"
@@ -1951,10 +2023,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ilc1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ilc1-az2"
- },
  {
   "InstanceType": "c5.12xlarge",
   "Location": "ilc1-az3"
@@ -2215,6 +2283,42 @@
   "InstanceType": "c6in.xlarge",
   "Location": "ilc1-az3"
  },
+ {
+  "InstanceType": "c7g.12xlarge",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.16xlarge",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.2xlarge",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.4xlarge",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.8xlarge",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.large",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.medium",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.metal",
+  "Location": "ilc1-az3"
+ },
+ {
+  "InstanceType": "c7g.xlarge",
+  "Location": "ilc1-az3"
+ },
  {
   "InstanceType": "d3.2xlarge",
   "Location": "ilc1-az3"
@@ -2923,10 +3027,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ilc1-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ilc1-az3"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "ilc1-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json
index 122b22025..04c236ab0 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-central-1.json
@@ -935,6 +935,50 @@
   "InstanceType": "c6in.xlarge",
   "Location": "mec1-az2"
  },
+ {
+  "InstanceType": "c7i.12xlarge",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.16xlarge",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.24xlarge",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.2xlarge",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.48xlarge",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.4xlarge",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.8xlarge",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.large",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.metal-24xl",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.metal-48xl",
+  "Location": "mec1-az2"
+ },
+ {
+  "InstanceType": "c7i.xlarge",
+  "Location": "mec1-az2"
+ },
  {
   "InstanceType": "g5.12xlarge",
   "Location": "mec1-az2"
@@ -1783,6 +1827,50 @@
   "InstanceType": "c6in.xlarge",
   "Location": "mec1-az3"
  },
+ {
+  "InstanceType": "c7i.12xlarge",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.16xlarge",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.24xlarge",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.2xlarge",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.48xlarge",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.4xlarge",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.8xlarge",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.large",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.metal-24xl",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.metal-48xl",
+  "Location": "mec1-az3"
+ },
+ {
+  "InstanceType": "c7i.xlarge",
+  "Location": "mec1-az3"
+ },
  {
   "InstanceType": "i3.16xlarge",
   "Location": "mec1-az3"
diff --git 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
index 9d6e86375..aac8c0c71 100644
--- 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
@@ -2095,14 +2095,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "sae1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "sae1-az1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "sae1-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "sae1-az1"
@@ -2115,10 +2107,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "sae1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "sae1-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "sae1-az1"
@@ -3931,14 +3919,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "sae1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "sae1-az2"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "sae1-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "sae1-az2"
@@ -5855,10 +5835,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "sae1-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "sae1-az3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "sae1-az3"
diff --git 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
index 3233e01e2..69d80fb04 100644
--- 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
@@ -3159,18 +3159,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "use1-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "use1-az1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "use1-az1"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "use1-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "use1-az1"
@@ -3183,10 +3171,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "use1-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "use1-az1"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "use1-az1"
@@ -6743,18 +6727,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "use1-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "use1-az2"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "use1-az2"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "use1-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "use1-az2"
@@ -6767,10 +6739,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "use1-az2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "use1-az2"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "use1-az2"
@@ -10575,18 +10543,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "use1-az4"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "use1-az4"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "use1-az4"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "use1-az4"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "use1-az4"
@@ -10599,10 +10555,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "use1-az4"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "use1-az4"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "use1-az4"
@@ -17195,18 +17147,6 @@
   "InstanceType": "trn1n.32xlarge",
   "Location": "use1-az6"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "use1-az6"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "use1-az6"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "use1-az6"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "use1-az6"
@@ -17220,11 +17160,11 @@
   "Location": "use1-az6"
  },
  {
-  "InstanceType": "u-9tb1.112xlarge",
+  "InstanceType": "u7i-12tb.224xlarge",
   "Location": "use1-az6"
  },
  {
-  "InstanceType": "u7i-12tb.224xlarge",
+  "InstanceType": "u7i-6tb.112xlarge",
   "Location": "use1-az6"
  },
  {
diff --git 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
index 8eb30fdbc..a58762919 100644
--- 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
@@ -3139,18 +3139,6 @@
   "InstanceType": "trn2.48xlarge",
   "Location": "use2-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "use2-az1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "use2-az1"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "use2-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "use2-az1"
@@ -3163,10 +3151,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "use2-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "use2-az1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "use2-az1"
@@ -6487,10 +6471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "use2-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "use2-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "use2-az2"
@@ -6503,10 +6483,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "use2-az2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "use2-az2"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "use2-az2"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json
index 9e4d81c2a..a6638e6ed 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json
@@ -3331,18 +3331,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "usw2-az1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "usw2-az1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "usw2-az1"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "usw2-az1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "usw2-az1"
@@ -3355,10 +3343,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "usw2-az1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "usw2-az1"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "usw2-az1"
@@ -6919,18 +6903,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "usw2-az2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "usw2-az2"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "usw2-az2"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "usw2-az2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "usw2-az2"
@@ -6943,10 +6915,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "usw2-az2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "usw2-az2"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "usw2-az2"
@@ -10483,14 +10451,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "usw2-az3"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "usw2-az3"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "usw2-az3"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "usw2-az3"
@@ -10503,10 +10463,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "usw2-az3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "usw2-az3"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "usw2-az3"
@@ -13323,14 +13279,6 @@
   "InstanceType": "trn1n.32xlarge",
   "Location": "usw2-az4"
  },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "usw2-az4"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "usw2-az4"
- },
  {
   "InstanceType": "x2gd.12xlarge",
   "Location": "usw2-az4"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json
index 2d5da0d68..0d3587234 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json
@@ -863,10 +863,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "af-south-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "af-south-1a"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "af-south-1a"
@@ -875,10 +871,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "af-south-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "af-south-1a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "af-south-1a"
@@ -1887,10 +1879,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "af-south-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "af-south-1b"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "af-south-1b"
@@ -2831,10 +2819,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "af-south-1c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "af-south-1c"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "af-south-1c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json
index 72347b11a..47b50520b 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json
@@ -3091,10 +3091,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-northeast-1a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-northeast-1a"
@@ -3107,10 +3103,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-northeast-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-northeast-1a"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "ap-northeast-1a"
@@ -6307,10 +6299,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-1c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-northeast-1c"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-northeast-1c"
@@ -6323,10 +6311,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-northeast-1c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-northeast-1c"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-northeast-1c"
@@ -9239,10 +9223,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-1d"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-northeast-1d"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-northeast-1d"
diff --git 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
index 0cd439701..b5ea3edf9 100644
--- 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
@@ -1863,14 +1863,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-2a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-northeast-2a"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "ap-northeast-2a"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "ap-northeast-2a"
@@ -1879,10 +1871,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-northeast-2a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-northeast-2a"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "ap-northeast-2a"
@@ -5139,14 +5127,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-2c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-northeast-2c"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "ap-northeast-2c"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "ap-northeast-2c"
@@ -5155,10 +5135,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-northeast-2c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-northeast-2c"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-northeast-2c"
diff --git 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
index 3620d139e..2791ce8ed 100644
--- 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
@@ -2215,10 +2215,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-south-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-south-1a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-south-1a"
@@ -4531,10 +4527,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-south-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-south-1b"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "ap-south-1b"
@@ -4543,10 +4535,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-south-1b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-south-1b"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-south-1b"
@@ -6667,10 +6655,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "ap-south-1c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-south-1c"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "ap-south-1c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json
index ec8dbaee1..fac21cef4 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json
@@ -995,10 +995,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-south-2a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-south-2a"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "ap-south-2a"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json
index 9179ce3cd..4b089e076 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json
@@ -2471,10 +2471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-southeast-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-1a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-southeast-1a"
@@ -2487,10 +2483,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-southeast-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-southeast-1a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-southeast-1a"
@@ -5119,10 +5111,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-southeast-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-1b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-southeast-1b"
@@ -5135,10 +5123,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-southeast-1b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-southeast-1b"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-southeast-1b"
@@ -7487,10 +7471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-southeast-1c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-1c"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-southeast-1c"
@@ -7503,10 +7483,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-southeast-1c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-southeast-1c"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-southeast-1c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json
index c25366c0d..521655f62 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json
@@ -895,6 +895,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "ap-southeast-2a"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "ap-southeast-2a"
+ },
  {
   "InstanceType": "im4gn.16xlarge",
   "Location": "ap-southeast-2a"
@@ -2559,10 +2603,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-southeast-2a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-2a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-southeast-2a"
@@ -3675,6 +3715,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "ap-southeast-2b"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "ap-southeast-2b"
+ },
  {
   "InstanceType": "im4gn.16xlarge",
   "Location": "ap-southeast-2b"
@@ -5383,10 +5467,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "ap-southeast-2b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-2b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-southeast-2b"
@@ -6495,6 +6575,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "ap-southeast-2c"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "ap-southeast-2c"
+ },
  {
   "InstanceType": "im4gn.16xlarge",
   "Location": "ap-southeast-2c"
@@ -8131,10 +8255,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "ap-southeast-2c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-2c"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "ap-southeast-2c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json
index 2f164fbb0..997bfab89 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-5.json
@@ -1615,6 +1615,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "ap-southeast-5b"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "ap-southeast-5b"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "ap-southeast-5b"
+ },
  {
   "InstanceType": "m6g.12xlarge",
   "Location": "ap-southeast-5b"
@@ -2699,6 +2743,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "ap-southeast-5c"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "ap-southeast-5c"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "ap-southeast-5c"
+ },
  {
   "InstanceType": "m6g.12xlarge",
   "Location": "ap-southeast-5c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json
index 379425134..ebbce7d6d 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json
@@ -2887,14 +2887,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-central-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-central-1a"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "eu-central-1a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-central-1a"
@@ -2907,10 +2899,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-central-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-central-1a"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "eu-central-1a"
@@ -6147,10 +6135,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-central-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-central-1b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-central-1b"
@@ -6163,10 +6147,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-central-1b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-central-1b"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-central-1b"
@@ -9219,14 +9199,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-central-1c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-central-1c"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "eu-central-1c"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-central-1c"
@@ -9239,10 +9211,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-central-1c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-central-1c"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-central-1c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json
index 989cb5ff5..2b542b75c 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json
@@ -1899,10 +1899,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-north-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-north-1a"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "eu-north-1a"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json
index 2af347a3d..00413da8b 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json
@@ -1191,10 +1191,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-south-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-south-1a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-south-1a"
@@ -2475,10 +2471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-south-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-south-1b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-south-1b"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json
index 8872e91b1..4cc71c3bd 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json
@@ -2983,10 +2983,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-west-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-west-1a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-west-1a"
@@ -2999,10 +2995,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-1a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-west-1a"
@@ -6167,18 +6159,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-west-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-west-1b"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "eu-west-1b"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "eu-west-1b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-west-1b"
@@ -6191,10 +6171,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-1b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-1b"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "eu-west-1b"
@@ -9399,18 +9375,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-west-1c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-west-1c"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "eu-west-1c"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "eu-west-1c"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-west-1c"
@@ -9423,10 +9387,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-1c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-1c"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "eu-west-1c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json
index adbf1edb3..a6494b7f7 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json
@@ -4291,10 +4291,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-2b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-2b"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-west-2b"
@@ -6399,10 +6395,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-2c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-2c"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-west-2c"
diff --git 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
index fd459419c..0f05dfc33 100644
--- 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
@@ -1599,10 +1599,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-3a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-3a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-west-3a"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/il-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/il-central-1.json
index d1e3a005e..39a1ac224 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/il-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/il-central-1.json
@@ -259,6 +259,42 @@
   "InstanceType": "c6in.xlarge",
   "Location": "il-central-1a"
  },
+ {
+  "InstanceType": "c7g.12xlarge",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.16xlarge",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.2xlarge",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.4xlarge",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.8xlarge",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.large",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.medium",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.metal",
+  "Location": "il-central-1a"
+ },
+ {
+  "InstanceType": "c7g.xlarge",
+  "Location": "il-central-1a"
+ },
  {
   "InstanceType": "d3.2xlarge",
   "Location": "il-central-1a"
@@ -1243,6 +1279,42 @@
   "InstanceType": "c6in.xlarge",
   "Location": "il-central-1b"
  },
+ {
+  "InstanceType": "c7g.12xlarge",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.16xlarge",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.2xlarge",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.4xlarge",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.8xlarge",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.large",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.medium",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.metal",
+  "Location": "il-central-1b"
+ },
+ {
+  "InstanceType": "c7g.xlarge",
+  "Location": "il-central-1b"
+ },
  {
   "InstanceType": "d3.2xlarge",
   "Location": "il-central-1b"
@@ -1951,10 +2023,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "il-central-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "il-central-1b"
- },
  {
   "InstanceType": "c5.12xlarge",
   "Location": "il-central-1c"
@@ -2215,6 +2283,42 @@
   "InstanceType": "c6in.xlarge",
   "Location": "il-central-1c"
  },
+ {
+  "InstanceType": "c7g.12xlarge",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.16xlarge",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.2xlarge",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.4xlarge",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.8xlarge",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.large",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.medium",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.metal",
+  "Location": "il-central-1c"
+ },
+ {
+  "InstanceType": "c7g.xlarge",
+  "Location": "il-central-1c"
+ },
  {
   "InstanceType": "d3.2xlarge",
   "Location": "il-central-1c"
@@ -2923,10 +3027,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "il-central-1c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "il-central-1c"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "il-central-1c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json
index be7b228cd..1c7482eef 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-central-1.json
@@ -935,6 +935,50 @@
   "InstanceType": "c6in.xlarge",
   "Location": "me-central-1b"
  },
+ {
+  "InstanceType": "c7i.12xlarge",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.16xlarge",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.24xlarge",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.2xlarge",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.48xlarge",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.4xlarge",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.8xlarge",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.large",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.metal-24xl",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.metal-48xl",
+  "Location": "me-central-1b"
+ },
+ {
+  "InstanceType": "c7i.xlarge",
+  "Location": "me-central-1b"
+ },
  {
   "InstanceType": "g5.12xlarge",
   "Location": "me-central-1b"
@@ -1783,6 +1827,50 @@
   "InstanceType": "c6in.xlarge",
   "Location": "me-central-1c"
  },
+ {
+  "InstanceType": "c7i.12xlarge",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.16xlarge",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.24xlarge",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.2xlarge",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.48xlarge",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.4xlarge",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.8xlarge",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.large",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.metal-24xl",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.metal-48xl",
+  "Location": "me-central-1c"
+ },
+ {
+  "InstanceType": "c7i.xlarge",
+  "Location": "me-central-1c"
+ },
  {
   "InstanceType": "i3.16xlarge",
   "Location": "me-central-1c"
diff --git 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
index fc80b00ca..f3fc76e03 100644
--- 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
@@ -2095,14 +2095,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "sa-east-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "sa-east-1a"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "sa-east-1a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "sa-east-1a"
@@ -2115,10 +2107,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "sa-east-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "sa-east-1a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "sa-east-1a"
@@ -3931,14 +3919,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "sa-east-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "sa-east-1b"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "sa-east-1b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "sa-east-1b"
@@ -5855,10 +5835,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "sa-east-1c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "sa-east-1c"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "sa-east-1c"
diff --git 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
index 225f43685..4032a74b9 100644
--- 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
@@ -3327,18 +3327,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "us-east-1a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-1a"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-east-1a"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-east-1a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-1a"
@@ -3351,10 +3339,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-east-1a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-east-1a"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "us-east-1a"
@@ -6919,18 +6903,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "us-east-1b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-1b"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-east-1b"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-east-1b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-1b"
@@ -6943,10 +6915,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-east-1b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-east-1b"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "us-east-1b"
@@ -10555,18 +10523,6 @@
   "InstanceType": "trn1n.32xlarge",
   "Location": "us-east-1c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-1c"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-east-1c"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-east-1c"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-1c"
@@ -10580,11 +10536,11 @@
   "Location": "us-east-1c"
  },
  {
-  "InstanceType": "u-9tb1.112xlarge",
+  "InstanceType": "u7i-12tb.224xlarge",
   "Location": "us-east-1c"
  },
  {
-  "InstanceType": "u7i-12tb.224xlarge",
+  "InstanceType": "u7i-6tb.112xlarge",
   "Location": "us-east-1c"
  },
  {
@@ -13963,18 +13919,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "us-east-1d"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-1d"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-east-1d"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-east-1d"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-1d"
@@ -13987,10 +13931,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-east-1d"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-east-1d"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "us-east-1d"
diff --git 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
index 7cd4bacbd..b20a7c9f9 100644
--- 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
@@ -3139,18 +3139,6 @@
   "InstanceType": "trn2.48xlarge",
   "Location": "us-east-2a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-2a"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-east-2a"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-east-2a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-2a"
@@ -3163,10 +3151,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-east-2a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-east-2a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "us-east-2a"
@@ -6487,10 +6471,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "us-east-2b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-2b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-2b"
@@ -6503,10 +6483,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-east-2b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-east-2b"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "us-east-2b"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json
index 95b7d7e32..8add30a3c 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json
@@ -3307,18 +3307,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "us-west-2a"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-west-2a"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-west-2a"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-west-2a"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-west-2a"
@@ -3331,10 +3319,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-west-2a"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-west-2a"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "us-west-2a"
@@ -6883,18 +6867,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "us-west-2b"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-west-2b"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-west-2b"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-west-2b"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-west-2b"
@@ -6907,10 +6879,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-west-2b"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-west-2b"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "us-west-2b"
@@ -10483,14 +10451,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "us-west-2c"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-west-2c"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-west-2c"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-west-2c"
@@ -10503,10 +10463,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-west-2c"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-west-2c"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "us-west-2c"
@@ -13323,14 +13279,6 @@
   "InstanceType": "trn1n.32xlarge",
   "Location": "us-west-2d"
  },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-west-2d"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-west-2d"
- },
  {
   "InstanceType": "x2gd.12xlarge",
   "Location": "us-west-2d"
diff --git a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json
index b1ae30818..36d8ecdf5 100644
--- a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json
@@ -927,10 +927,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "af-south-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "af-south-1"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "af-south-1"
@@ -939,10 +935,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "af-south-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "af-south-1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "af-south-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json
index 905268428..af7eb2bae 100644
--- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json
@@ -3163,10 +3163,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-northeast-1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-northeast-1"
@@ -3179,10 +3175,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-northeast-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-northeast-1"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "ap-northeast-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json
index a1efe24c7..ab28de4d3 100644
--- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json
@@ -1895,14 +1895,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-northeast-2"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "ap-northeast-2"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "ap-northeast-2"
@@ -1911,10 +1903,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-northeast-2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-northeast-2"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "ap-northeast-2"
diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json
index 15ebbdba4..a8138a5d4 100644
--- a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json
@@ -2235,10 +2235,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "ap-south-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-south-1"
- },
  {
   "InstanceType": "u-6tb1.112xlarge",
   "Location": "ap-south-1"
@@ -2247,10 +2243,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-south-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-south-1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-south-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json
index ad95cc4cd..6bf86069f 100644
--- a/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-2.json
@@ -995,10 +995,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-south-2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-south-2"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "ap-south-2"
diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json
index 4cc00be8e..057d24129 100644
--- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json
@@ -2523,10 +2523,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-southeast-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-southeast-1"
@@ -2539,10 +2535,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "ap-southeast-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "ap-southeast-1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "ap-southeast-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json
index 266b2dfb3..0611ffa5c 100644
--- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json
@@ -1019,6 +1019,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "ap-southeast-2"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "ap-southeast-2"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "ap-southeast-2"
+ },
  {
   "InstanceType": "im4gn.16xlarge",
   "Location": "ap-southeast-2"
@@ -2731,10 +2775,6 @@
   "InstanceType": "trn1.32xlarge",
   "Location": "ap-southeast-2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "ap-southeast-2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "ap-southeast-2"
diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json
index 6993e3158..01ac772af 100644
--- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json
+++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-5.json
@@ -491,6 +491,50 @@
   "InstanceType": "i4i.xlarge",
   "Location": "ap-southeast-5"
  },
+ {
+  "InstanceType": "i7ie.12xlarge",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.18xlarge",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.24xlarge",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.2xlarge",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.3xlarge",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.48xlarge",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.6xlarge",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.large",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.metal-24xl",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.metal-48xl",
+  "Location": "ap-southeast-5"
+ },
+ {
+  "InstanceType": "i7ie.xlarge",
+  "Location": "ap-southeast-5"
+ },
  {
   "InstanceType": "m6g.12xlarge",
   "Location": "ap-southeast-5"
diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json
index 4e7e009d4..d5fd123f9 100644
--- a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json
@@ -3147,14 +3147,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-central-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-central-1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "eu-central-1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-central-1"
@@ -3167,10 +3159,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-central-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-central-1"
- },
  {
   "InstanceType": "u7i-6tb.112xlarge",
   "Location": "eu-central-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json
index 7eed160ed..c9c1f360f 100644
--- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json
@@ -2027,10 +2027,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-north-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-north-1"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "eu-north-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json
index 833986c02..8250ce585 100644
--- a/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json
@@ -1219,10 +1219,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-south-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-south-1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-south-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json
index 460ccafa1..394e1db92 100644
--- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json
@@ -3051,18 +3051,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "eu-west-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "eu-west-1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "eu-west-1"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "eu-west-1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "eu-west-1"
@@ -3075,10 +3063,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-1"
- },
  {
   "InstanceType": "vt1.24xlarge",
   "Location": "eu-west-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json
index 964693cab..0e37120b9 100644
--- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json
@@ -2211,10 +2211,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-2"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-west-2"
diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json
index 4675585c1..1e5a5877c 100644
--- a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json
+++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json
@@ -1731,10 +1731,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "eu-west-3"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "eu-west-3"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "eu-west-3"
diff --git a/moto/ec2/resources/instance_type_offerings/region/il-central-1.json b/moto/ec2/resources/instance_type_offerings/region/il-central-1.json
index 2cc757cf0..ca2105d6a 100644
--- a/moto/ec2/resources/instance_type_offerings/region/il-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/il-central-1.json
@@ -259,6 +259,42 @@
   "InstanceType": "c6in.xlarge",
   "Location": "il-central-1"
  },
+ {
+  "InstanceType": "c7g.12xlarge",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.16xlarge",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.2xlarge",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.4xlarge",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.8xlarge",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.large",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.medium",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.metal",
+  "Location": "il-central-1"
+ },
+ {
+  "InstanceType": "c7g.xlarge",
+  "Location": "il-central-1"
+ },
  {
   "InstanceType": "d3.2xlarge",
   "Location": "il-central-1"
@@ -967,10 +1003,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "il-central-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "il-central-1"
- },
  {
   "InstanceType": "x2idn.16xlarge",
   "Location": "il-central-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json
index a990b99fa..6583d869c 100644
--- a/moto/ec2/resources/instance_type_offerings/region/me-central-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/me-central-1.json
@@ -147,6 +147,50 @@
   "InstanceType": "c6in.xlarge",
   "Location": "me-central-1"
  },
+ {
+  "InstanceType": "c7i.12xlarge",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.16xlarge",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.24xlarge",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.2xlarge",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.48xlarge",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.4xlarge",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.8xlarge",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.large",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.metal-24xl",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.metal-48xl",
+  "Location": "me-central-1"
+ },
+ {
+  "InstanceType": "c7i.xlarge",
+  "Location": "me-central-1"
+ },
  {
   "InstanceType": "g5.12xlarge",
   "Location": "me-central-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json
index 7a956e787..030083b37 100644
--- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json
@@ -2119,14 +2119,6 @@
   "InstanceType": "t4g.xlarge",
   "Location": "sa-east-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "sa-east-1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "sa-east-1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "sa-east-1"
@@ -2139,10 +2131,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "sa-east-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "sa-east-1"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "sa-east-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json
index 763424a0f..93f7f2c3d 100644
--- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json
@@ -3375,18 +3375,6 @@
   "InstanceType": "trn1n.32xlarge",
   "Location": "us-east-1"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-1"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-east-1"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-east-1"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-1"
@@ -3399,10 +3387,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-east-1"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-east-1"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "us-east-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
index 119a6aea8..23f8e8265 100644
--- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
@@ -3195,18 +3195,6 @@
   "InstanceType": "trn2.48xlarge",
   "Location": "us-east-2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-east-2"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-east-2"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-east-2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-east-2"
@@ -3219,10 +3207,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-east-2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-east-2"
- },
  {
   "InstanceType": "x1.16xlarge",
   "Location": "us-east-2"
diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json
index 65ffd1441..5a6655817 100644
--- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json
@@ -3375,18 +3375,6 @@
   "InstanceType": "trn1n.32xlarge",
   "Location": "us-west-2"
  },
- {
-  "InstanceType": "u-12tb1.112xlarge",
-  "Location": "us-west-2"
- },
- {
-  "InstanceType": "u-18tb1.112xlarge",
-  "Location": "us-west-2"
- },
- {
-  "InstanceType": "u-24tb1.112xlarge",
-  "Location": "us-west-2"
- },
  {
   "InstanceType": "u-3tb1.56xlarge",
   "Location": "us-west-2"
@@ -3399,10 +3387,6 @@
   "InstanceType": "u-6tb1.56xlarge",
   "Location": "us-west-2"
  },
- {
-  "InstanceType": "u-9tb1.112xlarge",
-  "Location": "us-west-2"
- },
  {
   "InstanceType": "u7i-12tb.224xlarge",
   "Location": "us-west-2"
diff --git a/moto/networkfirewall/models.py b/moto/networkfirewall/models.py
index 7ae859aa6..9c31e8f73 100644
--- a/moto/networkfirewall/models.py
+++ b/moto/networkfirewall/models.py
@@ -62,7 +62,7 @@ class NetworkFirewallModel(BaseModel):
             "Status": "READY",
             "ConfigurationSyncStateSummary": "IN_SYNC",
         }
-        self.logging_configs: List[Dict[str, str]] = []
+        self.logging_configs: Dict[str, List[Dict[str, Any]]] = {}
 
     def to_dict(self) -> Dict[str, Any]:
         return {
@@ -146,7 +146,7 @@ class NetworkFirewallBackend(BaseBackend):
         self,
         firewall_arn: str,
         firewall_name: str,
-        logging_configuration: List[Dict[str, str]],
+        logging_configuration: Dict[str, List[Dict[str, Any]]],
     ) -> NetworkFirewallModel:
         firewall: NetworkFirewallModel = self._get_firewall(firewall_arn, firewall_name)
         firewall.logging_configs = logging_configuration
diff --git a/moto/ram/models.py b/moto/ram/models.py
index c8c15e642..dbf739ef1 100644
--- a/moto/ram/models.py
+++ b/moto/ram/models.py
@@ -1,12 +1,16 @@
 import re
 import string
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 from moto.core.base_backend import BackendDict, BaseBackend
 from moto.core.common_models import BaseModel
 from moto.core.utils import unix_time, utcnow
 from moto.moto_api._internal import mock_random as random
-from moto.organizations.models import OrganizationsBackend, organizations_backends
+from moto.organizations.models import (
+    OrganizationsBackend,
+    organizations_backends,
+)
 from moto.ram.exceptions import (
     InvalidParameterException,
     MalformedArnException,
@@ -50,7 +54,7 @@ class ResourceShare(BaseModel):
         self.partition = get_partition(region)
 
         self.allow_external_principals = kwargs.get("allowExternalPrincipals", True)
-        self.arn = f"arn:{get_partition(self.region)}:ram:{self.region}:{account_id}:resource-share/{random.uuid4()}"
+        self.arn = f"arn:{self.partition}:ram:{self.region}:{account_id}:resource-share/{random.uuid4()}"
         self.creation_time = utcnow()
         self.feature_set = "STANDARD"
         self.last_updated_time = utcnow()
@@ -154,16 +158,104 @@ class ResourceShare(BaseModel):
         self.name = name
 
 
-class ResourceAccessManagerBackend(BaseBackend):
-    RESOURCE_TYPES = RAM_RESOURCE_TYPES
+class ResourceType(BaseModel):
+    def __init__(
+        self, resource_type: str, service_name: str, resource_region_scope: str
+    ):
+        self.resource_type = resource_type
+        self.service_name = service_name
+        self.resource_region_scope = resource_region_scope
 
-    PERMISSION_TYPES = ["ALL", "AWS", "LOCAL"]
+    def describe(self) -> Dict[str, Any]:
+        return {
+            "resourceType": self.resource_type,
+            "serviceName": self.service_name,
+            "resourceRegionScope": self.resource_region_scope,
+        }
+
+
+class ManagedPermission(BaseModel):
+    def __init__(
+        self,
+        account_id: str,
+        region: str,
+        name: str,
+        resource_type: str,
+        version: str = "1",
+        default_version: bool = True,
+        status: str = "ATTACHABLE",
+        creation_time: Optional[str] = None,
+        last_updated_time: Optional[str] = None,
+        is_resource_type_default: bool = False,
+        permission_type: str = "AWS_MANAGED",  # or "CUSTOMER_MANAGED",
+    ):
+        self.account_id = account_id
+        self.region = region
+        self.partition = get_partition(region)
+
+        now = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
+        arn_prefix = (
+            f"arn:{self.partition}:ram::{self.partition}:permission/"
+            if permission_type == "AWS_MANAGED"
+            else f"arn:{self.partition}:ram:{self.region}:{account_id}:permission/"
+        )
+
+        self.name = name
+        self.arn = f"{arn_prefix}{name}"
+        self.resource_type = resource_type
+        self.version = version
+        self.default_version = default_version
+        self.status = status
+        self.creation_time = creation_time or now
+        self.last_updated_time = last_updated_time or creation_time
+        self.is_resource_type_default = is_resource_type_default
+        self.permission_type = permission_type
 
-    MANAGED_PERMISSIONS = AWS_MANAGED_PERMISSIONS
+    def describe(self) -> Dict[str, Any]:
+        return {
+            "arn": self.arn,
+            "name": self.name,
+            "resourceType": self.resource_type,
+            "version": self.version,
+            "defaultVersion": self.default_version,
+            "status": self.status,
+            "creationTime": self.creation_time,
+            "lastUpdatedTime": self.last_updated_time,
+            "isResourceTypeDefault": self.is_resource_type_default,
+            "permissionType": self.permission_type,
+        }
+
+
+class ResourceAccessManagerBackend(BaseBackend):
+    PERMISSION_TYPES = ["ALL", "AWS", "LOCAL"]
 
     def __init__(self, region_name: str, account_id: str):
         super().__init__(region_name, account_id)
         self.resource_shares: List[ResourceShare] = []
+        self.managed_permissions: List[ManagedPermission] = [
+            ManagedPermission(
+                account_id=account_id,
+                region=region_name,
+                name=permission["name"],
+                resource_type=permission["resourceType"],
+                version=permission["version"],
+                default_version=permission["defaultVersion"],
+                status=permission["status"],
+                creation_time=permission["creationTime"],
+                last_updated_time=permission["lastUpdatedTime"],
+                is_resource_type_default=permission["isResourceTypeDefault"],
+                permission_type=permission["permissionType"],
+            )
+            for permission in AWS_MANAGED_PERMISSIONS
+        ]
+        self.resource_types: List[ResourceType] = [
+            ResourceType(
+                resource_type=resource_type["resourceType"],
+                service_name=resource_type["serviceName"],
+                resource_region_scope=resource_type["resourceRegionScope"],
+            )
+            for resource_type in RAM_RESOURCE_TYPES
+        ]
 
     @property
     def organizations_backend(self) -> OrganizationsBackend:
@@ -193,9 +285,9 @@ class ResourceAccessManagerBackend(BaseBackend):
                 "Value 'OTHER-ACCOUNTS' for parameter 'resourceOwner' not implemented."
             )
 
-        resouces = [resource.describe() for resource in self.resource_shares]
+        resources = [resource.describe() for resource in self.resource_shares]
 
-        return dict(resourceShares=resouces)
+        return dict(resourceShares=resources)
 
     def update_resource_share(
         self,
@@ -336,12 +428,15 @@ class ResourceAccessManagerBackend(BaseBackend):
             )
 
         if resource_region_scope == "ALL":
-            resource_types = self.RESOURCE_TYPES
+            resource_types = [
+                resource_type.describe() for resource_type in self.resource_types
+            ]
         else:
             resource_types = [
-                resource_type
-                for resource_type in self.RESOURCE_TYPES
-                if resource_type["resourceRegionScope"] == resource_region_scope
+                resource_type_dict
+                for resource_type in self.resource_types
+                if (resource_type_dict := resource_type.describe())
+                and resource_type_dict["resourceRegionScope"] == resource_region_scope
             ]
 
         return dict(resourceTypes=resource_types)
@@ -357,20 +452,25 @@ class ResourceAccessManagerBackend(BaseBackend):
         # Here, resourceType first partition (service) is case sensitive and
         # last partition (type) is case insensitive
         if resource_type and not any(
-            str(permission["resourceType"]).split(":")[0] == resource_type.split(":")[0]
-            and str(permission["resourceType"]).lower() == resource_type.lower()
-            for permission in self.MANAGED_PERMISSIONS
+            (permission_dict := permission.describe())
+            and permission_dict["resourceType"].split(":")[0]
+            == resource_type.split(":")[0]
+            and permission_dict["resourceType"].lower() == resource_type.lower()
+            for permission in self.managed_permissions
         ):
             raise InvalidParameterException(f"Invalid resource type: {resource_type}")
 
         if resource_type:
             permissions = [
-                permission
-                for permission in self.MANAGED_PERMISSIONS
-                if str(permission["resourceType"]).lower() == resource_type.lower()
+                permission_dict
+                for permission in self.managed_permissions
+                if (permission_dict := permission.describe())
+                and permission_dict["resourceType"].lower() == resource_type.lower()
             ]
         else:
-            permissions = self.MANAGED_PERMISSIONS
+            permissions = [
+                permission.describe() for permission in self.managed_permissions
+            ]
 
         if permission_type not in self.PERMISSION_TYPES:
             raise InvalidParameterException(
diff --git a/moto/ram/utils.py b/moto/ram/utils.py
index 1de1e0c05..5e78d4685 100644
--- a/moto/ram/utils.py
+++ b/moto/ram/utils.py
@@ -1,5 +1,18 @@
 from datetime import datetime, timezone
-from typing import Dict, Optional, Union
+from typing import Optional, TypedDict
+
+
+class ManagedPermissionDict(TypedDict):
+    arn: str
+    version: str
+    defaultVersion: bool
+    name: str
+    resourceType: str
+    status: str
+    creationTime: str
+    lastUpdatedTime: str
+    isResourceTypeDefault: bool
+    permissionType: str
 
 
 def format_ram_permission(
@@ -13,7 +26,7 @@ def format_ram_permission(
     is_resource_type_default: bool = True,
     permission_type: str = "AWS_MANAGED",
     default_version: bool = True,
-) -> Dict[str, Union[str, bool]]:
+) -> ManagedPermissionDict:
     """
     Format a RAM (Resource Access Manager) permission dictionary with the
     specified attributes.
@@ -38,7 +51,7 @@ def format_ram_permission(
             Defaults to True.
 
     Returns:
-        dict: A dictionary representing the formatted RAM permission.
+        ManagedPermissionDict: A dictionary representing the formatted RAM permission.
     """
     now = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
     creation_time = creation_time or now
diff --git a/moto/s3/models.py b/moto/s3/models.py
index 3ea17db67..ecfdd27d0 100644
--- a/moto/s3/models.py
+++ b/moto/s3/models.py
@@ -229,6 +229,14 @@ class FakeKey(BaseModel, ManagedState):
     def set_metadata(self, metadata: Any, replace: bool = False) -> None:
         if replace:
             self._metadata = {}  # type: ignore
+        # Remove AWS-specific Content-Encoding
+        if encoding := metadata.pop("Content-Encoding", None):
+            # Remove 'aws-chunked', but keep any other (user-provided) content encoding
+            encoding = ",".join(
+                [enc for enc in encoding.split(",") if enc != "aws-chunked"]
+            )
+            if encoding:
+                metadata["Content-Encoding"] = encoding
         self._metadata.update(metadata)
 
     def set_storage_class(self, storage: Optional[str]) -> None:
diff --git a/moto/ssm/resources/regions.json b/moto/ssm/resources/regions.json
index bc0a69765..a77263d13 100644
--- a/moto/ssm/resources/regions.json
+++ b/moto/ssm/resources/regions.json
@@ -3663,6 +3663,15 @@
               "artifact": {
                 "Value": "artifact"
               },
+              "athena": {
+                "Value": "athena",
+                "endpoint": {
+                  "Value": "athena.ap-east-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "aurora": {
                 "Value": "aurora",
                 "endpoint": {
@@ -3798,6 +3807,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ds": {
+                "Value": "ds",
+                "endpoint": {
+                  "Value": "ds.ap-east-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "dynamodb": {
                 "Value": "dynamodb",
                 "endpoint": {
@@ -4977,6 +4995,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "connectcampaigns": {
+                "Value": "connectcampaigns",
+                "endpoint": {
+                  "Value": "connect-campaigns.ap-northeast-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "connectcases": {
                 "Value": "connectcases",
                 "endpoint": {
@@ -7752,6 +7779,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "connectcampaigns": {
+                "Value": "connectcampaigns",
+                "endpoint": {
+                  "Value": "connect-campaigns.ap-northeast-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "connectcases": {
                 "Value": "connectcases",
                 "endpoint": {
@@ -7905,6 +7941,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "dsql": {
+                "Value": "dsql",
+                "endpoint": {
+                  "Value": "dsql.ap-northeast-2.api.aws"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "dynamodb": {
                 "Value": "dynamodb",
                 "endpoint": {
@@ -9657,14 +9702,6 @@
                   "Value": "HTTPS"
                 }
               }
-            },
-            "wavelength-zones": {
-              "apne2-wl1-cjj-wlz1": {
-                "Value": "apne2-wl1-cjj-wlz1"
-              },
-              "apne2-wl1-sel-wlz1": {
-                "Value": "apne2-wl1-sel-wlz1"
-              }
             }
           },
           "ap-northeast-3": {
@@ -15073,6 +15110,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ses": {
+                "Value": "ses",
+                "endpoint": {
+                  "Value": "email.ap-south-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "shield": {
                 "Value": "shield",
                 "endpoint": {
@@ -15937,6 +15983,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "connectcampaigns": {
+                "Value": "connectcampaigns",
+                "endpoint": {
+                  "Value": "connect-campaigns.ap-southeast-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "connectcases": {
                 "Value": "connectcases",
                 "endpoint": {
@@ -24274,6 +24329,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "gamelift": {
+                "Value": "gamelift"
+              },
               "glue": {
                 "Value": "glue",
                 "endpoint": {
@@ -25373,6 +25431,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "gamelift": {
+                "Value": "gamelift"
+              },
               "glue": {
                 "Value": "glue",
                 "endpoint": {
@@ -31250,6 +31311,12 @@
                   "Value": "HTTPS"
                 }
               },
+              "bcm-data-exports": {
+                "Value": "bcm-data-exports",
+                "endpoint": {
+                  "Value": "bcm-data-exports.cn-northwest-1.api.amazonwebservices.com.cn"
+                }
+              },
               "budgets": {
                 "Value": "budgets",
                 "endpoint": {
@@ -35378,17 +35445,6 @@
                   "Value": "HTTPS"
                 }
               }
-            },
-            "wavelength-zones": {
-              "euc1-wl1-ber-wlz1": {
-                "Value": "euc1-wl1-ber-wlz1"
-              },
-              "euc1-wl1-dtm-wlz1": {
-                "Value": "euc1-wl1-dtm-wlz1"
-              },
-              "euc1-wl1-muc-wlz1": {
-                "Value": "euc1-wl1-muc-wlz1"
-              }
             }
           },
           "eu-central-2": {
@@ -36608,6 +36664,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ses": {
+                "Value": "ses",
+                "endpoint": {
+                  "Value": "email.eu-central-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "shield": {
                 "Value": "shield",
                 "endpoint": {
@@ -47780,12 +47845,6 @@
               }
             },
             "wavelength-zones": {
-              "euw2-wl1-lon-wlz1": {
-                "Value": "euw2-wl1-lon-wlz1"
-              },
-              "euw2-wl1-man-wlz1": {
-                "Value": "euw2-wl1-man-wlz1"
-              },
               "euw2-wl2-man-wlz1": {
                 "Value": "euw2-wl2-man-wlz1"
               }
@@ -52693,6 +52752,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ses": {
+                "Value": "ses",
+                "endpoint": {
+                  "Value": "email.me-central-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "shield": {
                 "Value": "shield",
                 "endpoint": {
@@ -65083,6 +65151,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "scheduler": {
+                "Value": "scheduler",
+                "endpoint": {
+                  "Value": "scheduler.us-gov-east-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "schemas": {
                 "Value": "schemas",
                 "endpoint": {
@@ -66866,6 +66943,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "scheduler": {
+                "Value": "scheduler",
+                "endpoint": {
+                  "Value": "scheduler.us-gov-west-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "schemas": {
                 "Value": "schemas",
                 "endpoint": {
diff --git a/moto/ssm/resources/services.json b/moto/ssm/resources/services.json
index 71a2e0e3c..05b0992e5 100644
--- a/moto/ssm/resources/services.json
+++ b/moto/ssm/resources/services.json
@@ -5908,6 +5908,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ap-east-2": {
+                "Value": "ap-east-2",
+                "endpoint": {
+                  "Value": "athena.ap-east-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ap-northeast-1": {
                 "Value": "ap-northeast-1",
                 "endpoint": {
@@ -8484,6 +8493,12 @@
           },
           "bcm-data-exports": {
             "regions": {
+              "cn-northwest-1": {
+                "Value": "cn-northwest-1",
+                "endpoint": {
+                  "Value": "bcm-data-exports.cn-northwest-1.api.amazonwebservices.com.cn"
+                }
+              },
               "us-east-1": {
                 "Value": "us-east-1",
                 "endpoint": {
@@ -16898,6 +16913,33 @@
                   "Value": "HTTPS"
                 }
               },
+              "ap-northeast-1": {
+                "Value": "ap-northeast-1",
+                "endpoint": {
+                  "Value": "connect-campaigns.ap-northeast-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
+              "ap-northeast-2": {
+                "Value": "ap-northeast-2",
+                "endpoint": {
+                  "Value": "connect-campaigns.ap-northeast-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
+              "ap-southeast-1": {
+                "Value": "ap-southeast-1",
+                "endpoint": {
+                  "Value": "connect-campaigns.ap-southeast-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ap-southeast-2": {
                 "Value": "ap-southeast-2",
                 "endpoint": {
@@ -21137,6 +21179,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ap-east-2": {
+                "Value": "ap-east-2",
+                "endpoint": {
+                  "Value": "ds.ap-east-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ap-northeast-1": {
                 "Value": "ap-northeast-1",
                 "endpoint": {
@@ -21463,6 +21514,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ap-northeast-2": {
+                "Value": "ap-northeast-2",
+                "endpoint": {
+                  "Value": "dsql.ap-northeast-2.api.aws"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ap-northeast-3": {
                 "Value": "ap-northeast-3",
                 "endpoint": {
@@ -31246,6 +31306,12 @@
                   "Value": "HTTPS"
                 }
               },
+              "ap-southeast-5": {
+                "Value": "ap-southeast-5"
+              },
+              "ap-southeast-7": {
+                "Value": "ap-southeast-7"
+              },
               "ca-central-1": {
                 "Value": "ca-central-1",
                 "endpoint": {
@@ -61348,6 +61414,24 @@
                   "Value": "HTTPS"
                 }
               },
+              "us-gov-east-1": {
+                "Value": "us-gov-east-1",
+                "endpoint": {
+                  "Value": "scheduler.us-gov-east-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
+              "us-gov-west-1": {
+                "Value": "us-gov-west-1",
+                "endpoint": {
+                  "Value": "scheduler.us-gov-west-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "us-west-1": {
                 "Value": "us-west-1",
                 "endpoint": {
@@ -64261,6 +64345,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "ap-south-2": {
+                "Value": "ap-south-2",
+                "endpoint": {
+                  "Value": "email.ap-south-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ap-southeast-1": {
                 "Value": "ap-southeast-1",
                 "endpoint": {
@@ -64306,6 +64399,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "eu-central-2": {
+                "Value": "eu-central-2",
+                "endpoint": {
+                  "Value": "email.eu-central-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "eu-north-1": {
                 "Value": "eu-north-1",
                 "endpoint": {
@@ -64360,6 +64462,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "me-central-1": {
+                "Value": "me-central-1",
+                "endpoint": {
+                  "Value": "email.me-central-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "me-south-1": {
                 "Value": "me-south-1",
                 "endpoint": {


Test patch:
diff --git a/tests/test_networkfirewall/test_networkfirewall.py b/tests/test_networkfirewall/test_networkfirewall.py
index 5b6789131..b651d2dc0 100644
--- a/tests/test_networkfirewall/test_networkfirewall.py
+++ b/tests/test_networkfirewall/test_networkfirewall.py
@@ -64,6 +64,19 @@ def test_describe_logging_configuration():
     assert log_dest_configs[1]["LogType"] == "ALERT"
 
 
+@mock_aws
+def test_describe_logging_configuration_no_config_set():
+    client = boto3.client("network-firewall", region_name="eu-west-1")
+    firewall = client.create_firewall(
+        FirewallName="test-firewall",
+        FirewallPolicyArn="arn:aws:network-firewall:ap-southeast-1:123456789012:firewall-policy/test-policy",
+    )["Firewall"]
+
+    resp = client.describe_logging_configuration(FirewallArn=firewall["FirewallArn"])
+    assert resp["FirewallArn"] == firewall["FirewallArn"]
+    assert resp["LoggingConfiguration"] == {}
+
+
 @mock_aws
 def test_update_logging_configuration():
     client = boto3.client("network-firewall", region_name="ap-southeast-1")
diff --git a/tests/test_ram/test_ram.py b/tests/test_ram/test_ram.py
index d3637c644..d161b4a97 100644
--- a/tests/test_ram/test_ram.py
+++ b/tests/test_ram/test_ram.py
@@ -9,7 +9,7 @@ from botocore.exceptions import ClientError
 
 from moto import mock_aws
 from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID
-from moto.ram.models import ResourceAccessManagerBackend
+from moto.ram.utils import AWS_MANAGED_PERMISSIONS, RAM_RESOURCE_TYPES
 
 
 @mock_aws
@@ -569,7 +569,7 @@ def test_list_resource_types(resource_region_scope, expect_error, error_message)
         assert ex.response["Error"]["Message"] == error_message
     else:
         response = client.list_resource_types(**resource_region_scope)
-        expected_types = ResourceAccessManagerBackend.RESOURCE_TYPES
+        expected_types = RAM_RESOURCE_TYPES
         if region_scope == "GLOBAL":
             expected_types = [
                 rt for rt in expected_types if rt["resourceRegionScope"] == "GLOBAL"
@@ -632,7 +632,7 @@ def test_list_permissions(parameters, expect_error, error_message):
         response = client.list_permissions(**parameters)
 
         # then
-        expected_permissions = ResourceAccessManagerBackend.MANAGED_PERMISSIONS
+        expected_permissions = AWS_MANAGED_PERMISSIONS
         if resource_type:
             expected_permissions = [
                 permission
diff --git a/tests/test_s3/test_s3_content_encoding.py b/tests/test_s3/test_s3_content_encoding.py
new file mode 100644
index 000000000..7ebe6decf
--- /dev/null
+++ b/tests/test_s3/test_s3_content_encoding.py
@@ -0,0 +1,30 @@
+import os
+from tempfile import TemporaryFile
+
+import boto3
+import pytest
+
+from . import s3_aws_verified
+
+
+@pytest.mark.aws_verified
+@s3_aws_verified
+@pytest.mark.parametrize("encoding", [None, "gzip", "unknown"])
+def test_content_encoding_is_returned(encoding, bucket_name=None):
+    client = boto3.client("s3", region_name="us-east-1")
+    s3_file = "some.file"
+
+    attrs = {
+        "ContentType": "application/octet-stream",
+        "ACL": "bucket-owner-full-control",
+    }
+    if encoding:
+        attrs["ContentEncoding"] = encoding
+
+    with TemporaryFile() as f:
+        f.write(os.urandom(1024))
+        f.flush()
+        client.upload_fileobj(f, bucket_name, s3_file, ExtraArgs=attrs)
+
+    res = client.get_object(Bucket=bucket_name, Key=s3_file)
+    assert res.get("ContentEncoding") == encoding