From cf7be8d02e90d5f6e750f93945ce2eae1ce2952c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 24 Sep 2023 11:38:21 +0000 Subject: [PATCH] chore: update EC2 Instance Offerings (#6844) --- .../availability-zone-id/eu-central-2.json | 72 +++++++++++++++++++ .../availability-zone-id/us-east-2.json | 8 +++ .../availability-zone-id/us-west-2.json | 8 +++ .../availability-zone/eu-central-2.json | 72 +++++++++++++++++++ .../availability-zone/us-east-2.json | 8 +++ .../availability-zone/us-west-2.json | 8 +++ .../region/eu-central-2.json | 36 ++++++++++ .../region/us-east-2.json | 4 ++ .../region/us-west-2.json | 4 ++ 9 files changed, 220 insertions(+) diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json index e48cd8dab..524cb8930 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-2.json @@ -107,6 +107,42 @@ "InstanceType": "c6g.xlarge", "Location": "euc2-az1" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.large", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.medium", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.metal", + "Location": "euc2-az1" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "euc2-az1" + }, { "InstanceType": "c6in.12xlarge", "Location": "euc2-az1" @@ -755,6 +791,42 @@ "InstanceType": "c6g.xlarge", "Location": "euc2-az2" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.large", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.medium", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.metal", + "Location": "euc2-az2" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "euc2-az2" + }, { "InstanceType": "c6in.12xlarge", "Location": "euc2-az2" 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 f20052db1..24affad68 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 @@ -4355,6 +4355,10 @@ "InstanceType": "mac1.metal", "Location": "use2-az2" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "use2-az2" + }, { "InstanceType": "mac2.metal", "Location": "use2-az2" @@ -6959,6 +6963,10 @@ "InstanceType": "mac1.metal", "Location": "use2-az3" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "use2-az3" + }, { "InstanceType": "mac2.metal", "Location": "use2-az3" 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 5784935b6..ff4573e82 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 @@ -1799,6 +1799,10 @@ "InstanceType": "mac1.metal", "Location": "usw2-az1" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "usw2-az1" + }, { "InstanceType": "mac2.metal", "Location": "usw2-az1" @@ -7479,6 +7483,10 @@ "InstanceType": "mac1.metal", "Location": "usw2-az3" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "usw2-az3" + }, { "InstanceType": "mac2.metal", "Location": "usw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json index 1cb43643b..7c3852ddb 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-2.json @@ -107,6 +107,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-central-2a" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.large", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.medium", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.metal", + "Location": "eu-central-2a" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "eu-central-2a" + }, { "InstanceType": "c6in.12xlarge", "Location": "eu-central-2a" @@ -755,6 +791,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-central-2b" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.large", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.medium", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.metal", + "Location": "eu-central-2b" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "eu-central-2b" + }, { "InstanceType": "c6in.12xlarge", "Location": "eu-central-2b" 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 bd2c74c3f..ce2c0023b 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 @@ -4355,6 +4355,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-2b" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-east-2b" + }, { "InstanceType": "mac2.metal", "Location": "us-east-2b" @@ -6959,6 +6963,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-2c" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-east-2c" + }, { "InstanceType": "mac2.metal", "Location": "us-east-2c" 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 cadc11819..12744d43c 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 @@ -1799,6 +1799,10 @@ "InstanceType": "mac1.metal", "Location": "us-west-2a" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-west-2a" + }, { "InstanceType": "mac2.metal", "Location": "us-west-2a" @@ -7479,6 +7483,10 @@ "InstanceType": "mac1.metal", "Location": "us-west-2c" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-west-2c" + }, { "InstanceType": "mac2.metal", "Location": "us-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json index a0a7ee040..6ec4cc00e 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-2.json @@ -107,6 +107,42 @@ "InstanceType": "c6g.xlarge", "Location": "eu-central-2" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.large", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.medium", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.metal", + "Location": "eu-central-2" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "eu-central-2" + }, { "InstanceType": "c6in.12xlarge", "Location": "eu-central-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 8bbf0f373..1829b16d2 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 @@ -1703,6 +1703,10 @@ "InstanceType": "mac1.metal", "Location": "us-east-2" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-east-2" + }, { "InstanceType": "mac2.metal", "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 9e204098a..7e9f62423 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 @@ -1823,6 +1823,10 @@ "InstanceType": "mac1.metal", "Location": "us-west-2" }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-west-2" + }, { "InstanceType": "mac2.metal", "Location": "us-west-2"