From 58ee2cd61cc625d558b13c37c2f49b67816ff13d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 13:05:45 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings (#6731) --- .../availability-zone-id/eu-central-1.json | 192 ++++++++++++++++++ .../availability-zone-id/eu-north-1.json | 168 +++++++++++++++ .../availability-zone-id/eu-south-2.json | 168 +++++++++++++++ .../availability-zone-id/us-east-2.json | 8 + .../availability-zone/eu-central-1.json | 192 ++++++++++++++++++ .../availability-zone/eu-north-1.json | 168 +++++++++++++++ .../availability-zone/eu-south-2.json | 168 +++++++++++++++ .../availability-zone/us-east-2.json | 8 + .../region/eu-central-1.json | 96 +++++++++ .../region/eu-north-1.json | 56 +++++ .../region/eu-south-2.json | 56 +++++ .../region/us-east-2.json | 8 + 12 files changed, 1288 insertions(+) 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 2c62c6a3b..57af429dc 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 @@ -487,6 +487,38 @@ "InstanceType": "c7g.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7gd.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az1" @@ -1299,6 +1331,38 @@ "InstanceType": "m7g.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7gd.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euc1-az1" @@ -1883,6 +1947,38 @@ "InstanceType": "r7g.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -4719,6 +4815,38 @@ "InstanceType": "c7g.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7gd.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7gd.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az3" @@ -5671,6 +5799,38 @@ "InstanceType": "m7g.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7gd.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7gd.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euc1-az3" @@ -6299,6 +6459,38 @@ "InstanceType": "r7g.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "t2.2xlarge", "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 3a5b8c495..b22b84980 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 @@ -651,6 +651,62 @@ "InstanceType": "m6i.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "mac1.metal", "Location": "eun1-az1" @@ -1663,6 +1719,62 @@ "InstanceType": "m6i.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "mac1.metal", "Location": "eun1-az2" @@ -2755,6 +2867,62 @@ "InstanceType": "m6i.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "eun1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json index b182d12fb..06071c97e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-2.json @@ -331,6 +331,62 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.large", + "Location": "eus2-az1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eus2-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "eus2-az1" @@ -819,6 +875,62 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.large", + "Location": "eus2-az2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eus2-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "eus2-az2" @@ -1307,6 +1419,62 @@ "InstanceType": "m6gd.xlarge", "Location": "eus2-az3" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.large", + "Location": "eus2-az3" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eus2-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "eus2-az3" 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 8a325a96c..ac009b2cc 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 @@ -7523,6 +7523,14 @@ "InstanceType": "t4g.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "trn1.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "trn1.32xlarge", + "Location": "use2-az3" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "use2-az3" 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 0eb926426..5a6919448 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 @@ -2595,6 +2595,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1b" @@ -3547,6 +3579,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-central-1b" @@ -4175,6 +4239,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -4903,6 +4999,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1c" @@ -5715,6 +5843,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1c" @@ -6299,6 +6459,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "t2.2xlarge", "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 5a734eb3a..1d95aee63 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 @@ -651,6 +651,62 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1a" @@ -1663,6 +1719,62 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1b" @@ -2755,6 +2867,62 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-north-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json index 27519b1f2..e845b59b1 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-2.json @@ -331,6 +331,62 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2a" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-south-2a" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-south-2a" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-2a" @@ -819,6 +875,62 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2b" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-south-2b" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-south-2b" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-2b" @@ -1307,6 +1419,62 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2c" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-south-2c" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-south-2c" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-2c" 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 79702896c..f9d425116 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 @@ -7523,6 +7523,14 @@ "InstanceType": "t4g.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "trn1.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "trn1.32xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "us-east-2c" 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 69d5d6f58..50dcb81a1 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 @@ -531,6 +531,38 @@ "InstanceType": "c7g.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "c7gd.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7gd.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7gd.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7gd.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7gd.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7gd.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7gd.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "c7gd.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1" @@ -1483,6 +1515,38 @@ "InstanceType": "m7g.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "m7gd.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7gd.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7gd.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7gd.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7gd.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7gd.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7gd.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "m7gd.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-central-1" @@ -2115,6 +2179,38 @@ "InstanceType": "r7g.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.2xlarge", "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 a895c6ff7..5baf3da51 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 @@ -691,6 +691,62 @@ "InstanceType": "m6i.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json index 6200d428b..26f4406af 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-2.json @@ -331,6 +331,62 @@ "InstanceType": "m6gd.xlarge", "Location": "eu-south-2" }, + { + "InstanceType": "m7i-flex.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i-flex.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i-flex.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i-flex.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i-flex.xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.12xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.16xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.24xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.2xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.48xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.4xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.8xlarge", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.large", + "Location": "eu-south-2" + }, + { + "InstanceType": "m7i.xlarge", + "Location": "eu-south-2" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-2" 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 54c50d412..8e7377d70 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 @@ -2443,6 +2443,14 @@ "InstanceType": "t4g.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "trn1.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "trn1.32xlarge", + "Location": "us-east-2" + }, { "InstanceType": "u-12tb1.112xlarge", "Location": "us-east-2"