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 cdf4f0f39230..3ccab9ea2852 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 @@ -771,6 +771,46 @@ "InstanceType": "c8gd.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.medium", + "Location": "apne1-az1" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "apne1-az1" @@ -4483,6 +4523,54 @@ "InstanceType": "c7i.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "c8g.12xlarge", "Location": "apne1-az2" @@ -4579,6 +4667,46 @@ "InstanceType": "c8gd.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.medium", + "Location": "apne1-az2" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "apne1-az2" @@ -8083,6 +8211,54 @@ "InstanceType": "c7i.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "c8g.12xlarge", "Location": "apne1-az4" @@ -8179,6 +8355,46 @@ "InstanceType": "c8gd.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "apne1-az4" 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 9dbe9e51ede2..1ee91ae5a305 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 @@ -2427,6 +2427,10 @@ "InstanceType": "m8i.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "mac-m4.metal", + "Location": "euw1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw1-az1" @@ -9563,6 +9567,10 @@ "InstanceType": "m8i.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "mac-m4.metal", + "Location": "euw1-az3" + }, { "InstanceType": "p3.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 eae857ee9e98..4c0a9d016ae3 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 @@ -1487,6 +1487,86 @@ "InstanceType": "m6i.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "m7a.12xlarge", "Location": "euw2-az1" @@ -7055,6 +7135,86 @@ "InstanceType": "m6id.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "m7a.12xlarge", "Location": "euw2-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 8d48bdb56a59..ec2555b0fff4 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 @@ -719,6 +719,46 @@ "InstanceType": "c8gd.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.medium", + "Location": "sae1-az1" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sae1-az1" @@ -3447,6 +3487,46 @@ "InstanceType": "c8gd.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.medium", + "Location": "sae1-az2" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sae1-az2" @@ -5871,6 +5951,46 @@ "InstanceType": "c8gd.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.medium", + "Location": "sae1-az3" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "c8i.12xlarge", "Location": "sae1-az3" 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 a66d84133766..053ff3b927e3 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 @@ -699,6 +699,54 @@ "InstanceType": "c7i.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "c8g.12xlarge", "Location": "ap-northeast-1a" @@ -795,6 +843,46 @@ "InstanceType": "c8gd.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "ap-northeast-1a" @@ -4683,6 +4771,46 @@ "InstanceType": "c8gd.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.medium", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "ap-northeast-1c" @@ -8395,6 +8523,54 @@ "InstanceType": "c7i.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "c8g.12xlarge", "Location": "ap-northeast-1d" @@ -8491,6 +8667,46 @@ "InstanceType": "c8gd.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.medium", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "ap-northeast-1d" 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 49145fe805bd..f5b95f09254b 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 @@ -5807,6 +5807,10 @@ "InstanceType": "m8i.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "mac-m4.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "p3.16xlarge", "Location": "eu-west-1b" @@ -9471,6 +9475,10 @@ "InstanceType": "m8i.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "mac-m4.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "mac1.metal", "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 35929db7e916..9c19eff0ffcf 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 @@ -4335,6 +4335,86 @@ "InstanceType": "m6id.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "m7a.12xlarge", "Location": "eu-west-2b" @@ -6975,6 +7055,86 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "m7a.12xlarge", "Location": "eu-west-2c" 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 4f2080b3bbc7..736e110b3240 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 @@ -719,6 +719,46 @@ "InstanceType": "c8gd.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.medium", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sa-east-1a" @@ -3447,6 +3487,46 @@ "InstanceType": "c8gd.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.medium", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sa-east-1b" @@ -5871,6 +5951,46 @@ "InstanceType": "c8gd.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.medium", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "c8i.12xlarge", "Location": "sa-east-1c" 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 379de20924a9..ac0b1d5fd277 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 @@ -699,6 +699,54 @@ "InstanceType": "c7i.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "c8g.12xlarge", "Location": "ap-northeast-1" @@ -795,6 +843,46 @@ "InstanceType": "c8gd.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.medium", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "ap-northeast-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 42a29482946a..ed5667687c0c 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 @@ -2443,6 +2443,10 @@ "InstanceType": "m8i.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "mac-m4.metal", + "Location": "eu-west-1" + }, { "InstanceType": "mac1.metal", "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 71e29ea5306b..f9628d8ab9c8 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 @@ -1651,6 +1651,86 @@ "InstanceType": "m6id.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "m6idn.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6idn.xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "m6in.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "m7a.12xlarge", "Location": "eu-west-2" 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 f6dad0b97ec3..1600a0739ed8 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 @@ -719,6 +719,46 @@ "InstanceType": "c8gd.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.medium", + "Location": "sa-east-1" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "c8i-flex.12xlarge", "Location": "sa-east-1"