From a864f5ceb2986c9717b53deb2d64ef55a8883217 Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Thu, 29 Jan 2026 18:46:18 +0530 Subject: [PATCH 1/4] Unskip all data update actions by updating conditions --- .github/workflows/data-update_config-managed-rules.yml | 2 +- .github/workflows/data-update_ec2-instance-offerings.yml | 2 +- .github/workflows/data-update_ec2-instance-types.yml | 2 +- .github/workflows/data-update_emr_instance_types.yml | 2 +- .github/workflows/data-update_iam-managed-policies.yml | 2 +- .github/workflows/data-update_ssm-default-amis.yml | 2 +- .github/workflows/data-update_ssm-default-parameters.yml | 2 +- .github/workflows/data-update_ssm-optimized-amis.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/data-update_config-managed-rules.yml b/.github/workflows/data-update_config-managed-rules.yml index 9d6d115d56fe..55338d18d507 100644 --- a/.github/workflows/data-update_config-managed-rules.yml +++ b/.github/workflows/data-update_config-managed-rules.yml @@ -16,7 +16,7 @@ jobs: update: name: Update Config Managed Rules runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write diff --git a/.github/workflows/data-update_ec2-instance-offerings.yml b/.github/workflows/data-update_ec2-instance-offerings.yml index c3922c3ff00f..223a68a8f89a 100644 --- a/.github/workflows/data-update_ec2-instance-offerings.yml +++ b/.github/workflows/data-update_ec2-instance-offerings.yml @@ -16,7 +16,7 @@ jobs: update: name: Update EC2 Instance Offerings runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write diff --git a/.github/workflows/data-update_ec2-instance-types.yml b/.github/workflows/data-update_ec2-instance-types.yml index 27a47f7f179f..260e0ae02199 100644 --- a/.github/workflows/data-update_ec2-instance-types.yml +++ b/.github/workflows/data-update_ec2-instance-types.yml @@ -16,7 +16,7 @@ jobs: update: name: Update EC2 Instance Types runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write diff --git a/.github/workflows/data-update_emr_instance_types.yml b/.github/workflows/data-update_emr_instance_types.yml index 099f39cf727b..6bb84b2798f5 100644 --- a/.github/workflows/data-update_emr_instance_types.yml +++ b/.github/workflows/data-update_emr_instance_types.yml @@ -16,7 +16,7 @@ jobs: update: name: Update EMR Instance Types runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write diff --git a/.github/workflows/data-update_iam-managed-policies.yml b/.github/workflows/data-update_iam-managed-policies.yml index 10d2dab62850..9a0104e50396 100644 --- a/.github/workflows/data-update_iam-managed-policies.yml +++ b/.github/workflows/data-update_iam-managed-policies.yml @@ -16,7 +16,7 @@ jobs: update: name: Update IAM Managed Policies runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write diff --git a/.github/workflows/data-update_ssm-default-amis.yml b/.github/workflows/data-update_ssm-default-amis.yml index 5e10c4f99f20..86ec9dbbc8f9 100644 --- a/.github/workflows/data-update_ssm-default-amis.yml +++ b/.github/workflows/data-update_ssm-default-amis.yml @@ -16,7 +16,7 @@ jobs: update: name: Update SSM default AMIs runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write diff --git a/.github/workflows/data-update_ssm-default-parameters.yml b/.github/workflows/data-update_ssm-default-parameters.yml index ca8a375662e2..6cd781ffe678 100644 --- a/.github/workflows/data-update_ssm-default-parameters.yml +++ b/.github/workflows/data-update_ssm-default-parameters.yml @@ -16,7 +16,7 @@ jobs: update: name: Update SSM default parameters runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write diff --git a/.github/workflows/data-update_ssm-optimized-amis.yml b/.github/workflows/data-update_ssm-optimized-amis.yml index e04fc12412ee..f4bde8ecc364 100644 --- a/.github/workflows/data-update_ssm-optimized-amis.yml +++ b/.github/workflows/data-update_ssm-optimized-amis.yml @@ -16,7 +16,7 @@ jobs: update: name: Update SSM Optimized AMIs runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'getmoto/moto' }} + if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write From 7c14cabfc1862f0d98bc52f17c687a7a6942f309 Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Thu, 29 Jan 2026 19:48:23 +0530 Subject: [PATCH 2/4] Change the OIDC role --- .github/workflows/data-update_ec2-instance-offerings.yml | 2 +- .github/workflows/data-update_ec2-instance-types.yml | 2 +- .github/workflows/data-update_emr_instance_types.yml | 2 +- .github/workflows/data-update_iam-managed-policies.yml | 2 +- .github/workflows/data-update_ssm-default-amis.yml | 2 +- .github/workflows/data-update_ssm-default-parameters.yml | 2 +- .github/workflows/data-update_ssm-optimized-amis.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/data-update_ec2-instance-offerings.yml b/.github/workflows/data-update_ec2-instance-offerings.yml index 223a68a8f89a..b5bb54d39e37 100644 --- a/.github/workflows/data-update_ec2-instance-offerings.yml +++ b/.github/workflows/data-update_ec2-instance-offerings.yml @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::682283128318:role/GithubActionsRole + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Role - name: Pull EC2 instance types from AWS run: | diff --git a/.github/workflows/data-update_ec2-instance-types.yml b/.github/workflows/data-update_ec2-instance-types.yml index 260e0ae02199..d8e882f76117 100644 --- a/.github/workflows/data-update_ec2-instance-types.yml +++ b/.github/workflows/data-update_ec2-instance-types.yml @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::682283128318:role/GithubActionsRole + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Role - name: Pull EC2 instance types from AWS run: | diff --git a/.github/workflows/data-update_emr_instance_types.yml b/.github/workflows/data-update_emr_instance_types.yml index 6bb84b2798f5..4dc3f89ef225 100644 --- a/.github/workflows/data-update_emr_instance_types.yml +++ b/.github/workflows/data-update_emr_instance_types.yml @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::682283128318:role/GithubActionsRole + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Role - name: Pull EMR instance types from AWS run: | diff --git a/.github/workflows/data-update_iam-managed-policies.yml b/.github/workflows/data-update_iam-managed-policies.yml index 9a0104e50396..68925ebf1af6 100644 --- a/.github/workflows/data-update_iam-managed-policies.yml +++ b/.github/workflows/data-update_iam-managed-policies.yml @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::682283128318:role/GithubActionsRole + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Role - name: Pull IAM managed policies from AWS run: | diff --git a/.github/workflows/data-update_ssm-default-amis.yml b/.github/workflows/data-update_ssm-default-amis.yml index 86ec9dbbc8f9..7836bcdbb877 100644 --- a/.github/workflows/data-update_ssm-default-amis.yml +++ b/.github/workflows/data-update_ssm-default-amis.yml @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::682283128318:role/GithubActionsRole + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Role - name: Pull SSM default AMIs from AWS run: | diff --git a/.github/workflows/data-update_ssm-default-parameters.yml b/.github/workflows/data-update_ssm-default-parameters.yml index 6cd781ffe678..93149226412a 100644 --- a/.github/workflows/data-update_ssm-default-parameters.yml +++ b/.github/workflows/data-update_ssm-default-parameters.yml @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::682283128318:role/GithubActionsRole + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Rol - name: Pull SSM default Parameters from AWS run: | diff --git a/.github/workflows/data-update_ssm-optimized-amis.yml b/.github/workflows/data-update_ssm-optimized-amis.yml index f4bde8ecc364..87b460bb456b 100644 --- a/.github/workflows/data-update_ssm-optimized-amis.yml +++ b/.github/workflows/data-update_ssm-optimized-amis.yml @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::682283128318:role/GithubActionsRole + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Role - name: Pull SSM Optimized AMIs from AWS run: | From 9b6fa04391a87ff1b11c46ae5a6ab50e682bc2ea Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Thu, 29 Jan 2026 19:51:22 +0530 Subject: [PATCH 3/4] DEBUG: Use devel branch --- .github/workflows/data-update_ec2-instance-offerings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/data-update_ec2-instance-offerings.yml b/.github/workflows/data-update_ec2-instance-offerings.yml index b5bb54d39e37..7b0b5c7e4a20 100644 --- a/.github/workflows/data-update_ec2-instance-offerings.yml +++ b/.github/workflows/data-update_ec2-instance-offerings.yml @@ -16,7 +16,7 @@ jobs: update: name: Update EC2 Instance Offerings runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/localstack' && github.repository == 'localstack/moto' }} + if: ${{ github.ref == 'refs/heads/enable-data-update-ci' && github.repository == 'localstack/moto' }} permissions: id-token: write contents: write @@ -35,7 +35,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v5 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::623948600419:role/MotoExt-CI-Role + role-to-assume: arn:aws:iam::623948600419:role/MotoExt-OIDC-Role - name: Pull EC2 instance types from AWS run: | From bb1a494803f33a7ca23989514fee2a3668585019 Mon Sep 17 00:00:00 2001 From: viren-nadkarni <5170829+viren-nadkarni@users.noreply.github.com> Date: Thu, 29 Jan 2026 14:46:08 +0000 Subject: [PATCH 4/4] chore: update EC2 Instance Offerings --- .../availability-zone-id/ap-southeast-1.json | 4 + .../availability-zone-id/ap-southeast-2.json | 80 ++++ .../availability-zone-id/eu-central-1.json | 160 ++++++++ .../availability-zone-id/eu-west-3.json | 108 +++++ .../availability-zone-id/sa-east-1.json | 80 ++++ .../availability-zone-id/us-east-1.json | 80 ++++ .../availability-zone/ap-southeast-1.json | 4 + .../availability-zone/ap-southeast-2.json | 80 ++++ .../availability-zone/eu-central-1.json | 160 ++++++++ .../availability-zone/eu-west-1.json | 384 +++++++++--------- .../availability-zone/eu-west-3.json | 108 +++++ .../availability-zone/sa-east-1.json | 80 ++++ .../availability-zone/us-east-1.json | 80 ++++ .../region/eu-central-1.json | 40 ++ .../region/eu-west-3.json | 36 ++ 15 files changed, 1292 insertions(+), 192 deletions(-) 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 f01a6c9a88c6..f03fc1877efd 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 @@ -3003,6 +3003,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "apse1-az1" 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 0210c8789db4..7b1464d3e9d2 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 @@ -9575,6 +9575,86 @@ "InstanceType": "r8gd.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.48xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.96xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.metal-48xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.metal-96xl", + "Location": "apse2-az3" + }, + { + "InstanceType": "r8i.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "t1.micro", "Location": "apse2-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 8175fd97e4fc..8f93bfaad5de 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 @@ -6559,6 +6559,46 @@ "InstanceType": "r7i.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "r8g.12xlarge", "Location": "euc1-az2" @@ -6655,6 +6695,86 @@ "InstanceType": "r8gd.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.48xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.96xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.metal-48xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.metal-96xl", + "Location": "euc1-az2" + }, + { + "InstanceType": "r8i.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az2" @@ -10143,6 +10263,46 @@ "InstanceType": "r7iz.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "r8g.12xlarge", "Location": "euc1-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 0a8da87d163a..aa05be949def 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 @@ -1559,6 +1559,42 @@ "InstanceType": "r7g.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.metal", + "Location": "euw3-az1" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "r7i.12xlarge", "Location": "euw3-az1" @@ -3495,6 +3531,42 @@ "InstanceType": "r7g.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.metal", + "Location": "euw3-az2" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "r7i.12xlarge", "Location": "euw3-az2" @@ -5363,6 +5435,42 @@ "InstanceType": "r7g.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.metal", + "Location": "euw3-az3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "r7i.12xlarge", "Location": "euw3-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 e9d8ab084179..5d9ba34143d6 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 @@ -6723,6 +6723,86 @@ "InstanceType": "r8gd.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.32xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.48xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.96xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.metal-48xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.metal-96xl", + "Location": "sae1-az3" + }, + { + "InstanceType": "r8i.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "t2.2xlarge", "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 03aab2d1ff8f..6f45fca75690 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 @@ -2283,6 +2283,58 @@ "InstanceType": "m8gd.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m8i.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "use1-az1" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "mac2.metal", "Location": "use1-az1" @@ -15539,6 +15591,34 @@ "InstanceType": "r8gd.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "use1-az5" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "t1.micro", "Location": "use1-az5" 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 d41053fbf97b..3000ef4782d1 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 @@ -3003,6 +3003,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "u7i-6tb.112xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "u7in-16tb.224xlarge", "Location": "ap-southeast-1a" 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 78466e4ebea9..b907b41d5db3 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 @@ -2919,6 +2919,86 @@ "InstanceType": "r8gd.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.48xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.96xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.metal-48xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.metal-96xl", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r8i.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "t1.micro", "Location": "ap-southeast-2a" 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 ad80b489f1db..fc40a82e7d3a 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 @@ -3063,6 +3063,46 @@ "InstanceType": "r7i.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "r8g.12xlarge", "Location": "eu-central-1a" @@ -3159,6 +3199,86 @@ "InstanceType": "r8gd.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.48xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.96xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.metal-48xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.metal-96xl", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r8i.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1a" @@ -6647,6 +6767,46 @@ "InstanceType": "r7iz.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "r8g.12xlarge", "Location": "eu-central-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 a530751cff38..0a07ceceecee 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 @@ -1,4 +1,28 @@ [ + { + "InstanceType": "a1.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "a1.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "a1.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "a1.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "a1.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "a1.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "c1.medium", "Location": "eu-west-1a" @@ -803,46 +827,6 @@ "InstanceType": "c8gd.xlarge", "Location": "eu-west-1a" }, - { - "InstanceType": "c8gn.12xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.16xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.24xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.2xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.48xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.4xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.8xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.large", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.medium", - "Location": "eu-west-1a" - }, - { - "InstanceType": "c8gn.xlarge", - "Location": "eu-west-1a" - }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-1a" @@ -2167,6 +2151,14 @@ "InstanceType": "m8g.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "mac1.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "mac2.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "p3.16xlarge", "Location": "eu-west-1a" @@ -2179,6 +2171,14 @@ "InstanceType": "p3.8xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "p3dn.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "p4d.24xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "eu-west-1a" @@ -2995,54 +2995,6 @@ "InstanceType": "r8g.xlarge", "Location": "eu-west-1a" }, - { - "InstanceType": "r8gd.12xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.16xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.24xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.2xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.48xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.4xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.8xlarge", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.large", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.medium", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.metal-24xl", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.metal-48xl", - "Location": "eu-west-1a" - }, - { - "InstanceType": "r8gd.xlarge", - "Location": "eu-west-1a" - }, { "InstanceType": "t1.micro", "Location": "eu-west-1a" @@ -3172,7 +3124,23 @@ "Location": "eu-west-1a" }, { - "InstanceType": "u7i-8tb.112xlarge", + "InstanceType": "u7i-12tb.224xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "u7in-16tb.224xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "vt1.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "vt1.3xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "vt1.6xlarge", "Location": "eu-west-1a" }, { @@ -3292,56 +3260,56 @@ "Location": "eu-west-1a" }, { - "InstanceType": "z1d.12xlarge", + "InstanceType": "x2iezn.12xlarge", "Location": "eu-west-1a" }, { - "InstanceType": "z1d.2xlarge", + "InstanceType": "x2iezn.2xlarge", "Location": "eu-west-1a" }, { - "InstanceType": "z1d.3xlarge", + "InstanceType": "x2iezn.4xlarge", "Location": "eu-west-1a" }, { - "InstanceType": "z1d.6xlarge", + "InstanceType": "x2iezn.6xlarge", "Location": "eu-west-1a" }, { - "InstanceType": "z1d.large", + "InstanceType": "x2iezn.8xlarge", "Location": "eu-west-1a" }, { - "InstanceType": "z1d.metal", + "InstanceType": "x2iezn.metal", "Location": "eu-west-1a" }, { - "InstanceType": "z1d.xlarge", + "InstanceType": "z1d.12xlarge", "Location": "eu-west-1a" }, { - "InstanceType": "a1.2xlarge", - "Location": "eu-west-1b" + "InstanceType": "z1d.2xlarge", + "Location": "eu-west-1a" }, { - "InstanceType": "a1.4xlarge", - "Location": "eu-west-1b" + "InstanceType": "z1d.3xlarge", + "Location": "eu-west-1a" }, { - "InstanceType": "a1.large", - "Location": "eu-west-1b" + "InstanceType": "z1d.6xlarge", + "Location": "eu-west-1a" }, { - "InstanceType": "a1.medium", - "Location": "eu-west-1b" + "InstanceType": "z1d.large", + "Location": "eu-west-1a" }, { - "InstanceType": "a1.metal", - "Location": "eu-west-1b" + "InstanceType": "z1d.metal", + "Location": "eu-west-1a" }, { - "InstanceType": "a1.xlarge", - "Location": "eu-west-1b" + "InstanceType": "z1d.xlarge", + "Location": "eu-west-1a" }, { "InstanceType": "c1.medium", @@ -4336,31 +4304,19 @@ "Location": "eu-west-1b" }, { - "InstanceType": "hpc7a.12xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "hpc7a.24xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "hpc7a.48xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "hpc7a.96xlarge", + "InstanceType": "h1.16xlarge", "Location": "eu-west-1b" }, { - "InstanceType": "hpc7g.16xlarge", + "InstanceType": "h1.2xlarge", "Location": "eu-west-1b" }, { - "InstanceType": "hpc7g.4xlarge", + "InstanceType": "h1.4xlarge", "Location": "eu-west-1b" }, { - "InstanceType": "hpc7g.8xlarge", + "InstanceType": "h1.8xlarge", "Location": "eu-west-1b" }, { @@ -5524,15 +5480,15 @@ "Location": "eu-west-1b" }, { - "InstanceType": "mac1.metal", + "InstanceType": "p3.16xlarge", "Location": "eu-west-1b" }, { - "InstanceType": "mac2.metal", + "InstanceType": "p3.2xlarge", "Location": "eu-west-1b" }, { - "InstanceType": "p3dn.24xlarge", + "InstanceType": "p3.8xlarge", "Location": "eu-west-1b" }, { @@ -6527,30 +6483,10 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-west-1b" }, - { - "InstanceType": "u7i-12tb.224xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "u7i-6tb.112xlarge", - "Location": "eu-west-1b" - }, { "InstanceType": "u7i-8tb.112xlarge", "Location": "eu-west-1b" }, - { - "InstanceType": "vt1.24xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "vt1.3xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "vt1.6xlarge", - "Location": "eu-west-1b" - }, { "InstanceType": "x1.16xlarge", "Location": "eu-west-1b" @@ -6667,30 +6603,6 @@ "InstanceType": "x2iedn.xlarge", "Location": "eu-west-1b" }, - { - "InstanceType": "x2iezn.12xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "x2iezn.2xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "x2iezn.4xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "x2iezn.6xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "x2iezn.8xlarge", - "Location": "eu-west-1b" - }, - { - "InstanceType": "x2iezn.metal", - "Location": "eu-west-1b" - }, { "InstanceType": "z1d.12xlarge", "Location": "eu-west-1b" @@ -7547,6 +7459,46 @@ "InstanceType": "c8gd.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "c8gn.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c8gn.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-west-1c" @@ -7696,19 +7648,31 @@ "Location": "eu-west-1c" }, { - "InstanceType": "h1.16xlarge", + "InstanceType": "hpc7a.12xlarge", "Location": "eu-west-1c" }, { - "InstanceType": "h1.2xlarge", + "InstanceType": "hpc7a.24xlarge", "Location": "eu-west-1c" }, { - "InstanceType": "h1.4xlarge", + "InstanceType": "hpc7a.48xlarge", "Location": "eu-west-1c" }, { - "InstanceType": "h1.8xlarge", + "InstanceType": "hpc7a.96xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "hpc7g.8xlarge", "Location": "eu-west-1c" }, { @@ -8879,26 +8843,10 @@ "InstanceType": "mac2.metal", "Location": "eu-west-1c" }, - { - "InstanceType": "p3.16xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "p3.2xlarge", - "Location": "eu-west-1c" - }, - { - "InstanceType": "p3.8xlarge", - "Location": "eu-west-1c" - }, { "InstanceType": "p3dn.24xlarge", "Location": "eu-west-1c" }, - { - "InstanceType": "p4d.24xlarge", - "Location": "eu-west-1c" - }, { "InstanceType": "r3.2xlarge", "Location": "eu-west-1c" @@ -9715,6 +9663,54 @@ "InstanceType": "r8g.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "r8gd.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.metal-24xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.metal-48xl", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r8gd.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1c" @@ -9848,7 +9844,11 @@ "Location": "eu-west-1c" }, { - "InstanceType": "u7in-16tb.224xlarge", + "InstanceType": "u7i-6tb.112xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "u7i-8tb.112xlarge", "Location": "eu-west-1c" }, { 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 794e29a1b909..e2b24270af35 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 @@ -1559,6 +1559,42 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-west-3a" @@ -3495,6 +3531,42 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-west-3b" @@ -5363,6 +5435,42 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-3c" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-west-3c" 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 888dd1390973..8fd18052283f 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 @@ -6723,6 +6723,86 @@ "InstanceType": "r8gd.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.32xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.48xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.96xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.metal-48xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.metal-96xl", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r8i.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "t2.2xlarge", "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 e9e093dad5a9..34e08d535d72 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 @@ -15467,6 +15467,58 @@ "InstanceType": "m8gd.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m8i.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.96xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.metal-96xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1d" @@ -19963,6 +20015,34 @@ "InstanceType": "r8gd.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "r8i-flex.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r8i-flex.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r8i-flex.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r8i-flex.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r8i-flex.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r8i-flex.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "r8i-flex.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "t1.micro", "Location": "us-east-1f" 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 2145498453be..a58863cd733b 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 @@ -3231,6 +3231,46 @@ "InstanceType": "r7iz.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "r8g.12xlarge", "Location": "eu-central-1" 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 eac409930b33..eb6c26566888 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 @@ -1691,6 +1691,42 @@ "InstanceType": "r7g.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "r7gd.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.metal", + "Location": "eu-west-3" + }, + { + "InstanceType": "r7gd.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "r7i.12xlarge", "Location": "eu-west-3"