From 4c7757f553767fece0aa4c53d6036f374a75d53d Mon Sep 17 00:00:00 2001 From: Waldemar Hummer Date: Tue, 9 Nov 2021 21:12:36 +0100 Subject: [PATCH 01/12] Add build targets for moto-ext --- Makefile | 10 +++++++ README.md | 87 ++----------------------------------------------------- setup.cfg | 4 +-- 3 files changed, 14 insertions(+), 87 deletions(-) diff --git a/Makefile b/Makefile index 299fac705636..41868ba87850 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,16 @@ test-only: test: lint test-only +terraformtests: + @echo "Make sure that the MotoServer is already running on port 4566 (moto_server -p 4566)" + @echo "USAGE: make terraformtests SERVICE_NAME=acm TEST_NAMES=TestAccACMCertificate" + @echo "" + cd tests/terraformtests && bin/run_go_test $(SERVICE_NAME) "$(TEST_NAMES)" + +publish: + python -m build + twine upload dist/* + test_server: @TEST_SERVER_MODE=true pytest -sv --cov=moto --cov-report xml ./tests/ diff --git a/README.md b/README.md index d28e681600a3..13db57a7863a 100644 --- a/README.md +++ b/README.md @@ -1,86 +1,3 @@ -# Moto - Mock AWS Services +# moto-ext -[![Join the chat at https://gitter.im/awsmoto/Lobby](https://badges.gitter.im/awsmoto/Lobby.svg)](https://gitter.im/awsmoto/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -[![Build Status](https://github.com/getmoto/moto/workflows/TestNDeploy/badge.svg)](https://github.com/getmoto/moto/actions) -[![Coverage Status](https://codecov.io/gh/getmoto/moto/branch/master/graph/badge.svg)](https://codecov.io/gh/getmoto/moto) -[![Docs](https://readthedocs.org/projects/pip/badge/?version=stable)](http://docs.getmoto.org) -[![PyPI](https://img.shields.io/pypi/v/moto.svg)](https://pypi.org/project/moto/) -[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/moto.svg)](#) -[![PyPI - Downloads](https://img.shields.io/pypi/dw/moto.svg)](https://pypistats.org/packages/moto) -[![Code style: Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) -[![Financial Contributors](https://opencollective.com/moto/tiers/badge.svg)](https://opencollective.com/moto) - - -## Install - -```console -$ pip install 'moto[ec2,s3,all]' -``` - -## In a nutshell - - -Moto is a library that allows your tests to easily mock out AWS Services. - -Imagine you have the following python code that you want to test: - -```python -import boto3 - - -class MyModel: - def __init__(self, name, value): - self.name = name - self.value = value - - def save(self): - s3 = boto3.client("s3", region_name="us-east-1") - s3.put_object(Bucket="mybucket", Key=self.name, Body=self.value) -``` - -Take a minute to think how you would have tested that in the past. - -Now see how you could test it with Moto: - -```python -import boto3 -from moto import mock_aws -from mymodule import MyModel - - -@mock_aws -def test_my_model_save(): - conn = boto3.resource("s3", region_name="us-east-1") - # We need to create the bucket since this is all in Moto's 'virtual' AWS account - conn.create_bucket(Bucket="mybucket") - model_instance = MyModel("steve", "is awesome") - model_instance.save() - body = conn.Object("mybucket", "steve").get()["Body"].read().decode("utf-8") - assert body == "is awesome" -``` - -With the decorator wrapping the test, all the calls to s3 are automatically mocked out. The mock keeps track of the state of the buckets and keys. - -For a full list of which services and features are covered, please see our [implementation coverage](https://github.com/getmoto/moto/blob/master/IMPLEMENTATION_COVERAGE.md). - - -### Documentation -The full documentation can be found here: - -[http://docs.getmoto.org/en/latest/](http://docs.getmoto.org/en/latest/) - - -### Financial Contributions -Support this project and its continued development, by sponsoring us! - -Click the `Sponsor`-button at the top of the page for more information. - -Our finances are managed by OpenCollective, which means you have full visibility into all our contributions and expenses: -https://opencollective.com/moto - -### Security contact information - -To report a security vulnerability, please use the -[Tidelift security contact](https://tidelift.com/security). -Tidelift will coordinate the fix and disclosure. +Fork of [Moto](https://github.com/getmoto/moto) with patches and fixes for [LocalStack](https://github.com/localstack/localstack). diff --git a/setup.cfg b/setup.cfg index c64bf51805f9..130068c2fdd2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] -name = moto +name = moto-ext version = 5.1.21.dev description = A library that allows you to easily mock out tests based on AWS infrastructure long_description = file:README.md long_description_content_type = text/markdown author = Steve Pulec author_email = spulec@gmail.com -url = https://github.com/getmoto/moto +url = https://github.com/localstack/moto license = Apache-2.0 test_suite = tests classifiers = From 0b35f6a6fc86f17f1f0eb4094b413c5fabd543aa Mon Sep 17 00:00:00 2001 From: Ben Simon Hartung <42031100+bentsku@users.noreply.github.com> Date: Mon, 9 Jan 2023 18:07:49 +0100 Subject: [PATCH 02/12] remove double CI runs for every pull request (#66) --- .github/workflows/build.yml | 8 +++++++- .github/workflows/dockertests.yml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27e4de56157a..b7721b70dc6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,12 @@ name: TestNDeploy -on: [push, pull_request] +on: + push: + paths-ignore: + - 'README.md' + branches: + - localstack + pull_request: jobs: cache: diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml index 94ffb9ea0982..af70bcdc9613 100644 --- a/.github/workflows/dockertests.yml +++ b/.github/workflows/dockertests.yml @@ -1,6 +1,12 @@ name: DockerTests -on: [push, pull_request] +on: + push: + paths-ignore: + - 'README.md' + branches: + - localstack + pull_request: jobs: cache: From c3da126bba56e588c1da6b0f5cc6dca073192d3a Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 27 Aug 2024 12:36:48 +0200 Subject: [PATCH 03/12] SSM: add gov cloud (#74) --- .../us-gov-east-1.json | 191 +++++++++++++++ .../us-gov-west-1.json | 227 ++++++++++++++++++ tests/test_ssm/test_ssm_default_amis.py | 15 +- tests/test_ssm/test_ssm_parameterstore.py | 16 ++ 4 files changed, 446 insertions(+), 3 deletions(-) create mode 100644 moto/ssm/resources/ami-amazon-linux-latest/us-gov-east-1.json create mode 100644 moto/ssm/resources/ami-amazon-linux-latest/us-gov-west-1.json diff --git a/moto/ssm/resources/ami-amazon-linux-latest/us-gov-east-1.json b/moto/ssm/resources/ami-amazon-linux-latest/us-gov-east-1.json new file mode 100644 index 000000000000..abf14dfcb2a8 --- /dev/null +++ b/moto/ssm/resources/ami-amazon-linux-latest/us-gov-east-1.json @@ -0,0 +1,191 @@ +[ + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-arm64", + "DataType": "text", + "LastModifiedDate": 1721692759.417, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-arm64", + "Type": "String", + "Value": "ami-0388cfad0bfbabb99", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-arm64", + "DataType": "text", + "LastModifiedDate": 1721692760.492, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-arm64", + "Type": "String", + "Value": "ami-045a9bf9ced62bc2f", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692760.222, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-x86_64", + "Type": "String", + "Value": "ami-0dbef5e1adb6e1abf", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-arm64", + "DataType": "text", + "LastModifiedDate": 1721692760.983, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-arm64", + "Type": "String", + "Value": "ami-06cfed33cc8526f2d", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-s3", + "DataType": "text", + "LastModifiedDate": 1703012167.998, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-s3", + "Type": "String", + "Value": "ami-0a4c808d4c1a4bd8b", + "Version": 67 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-arm64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697389.518, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-arm64-gp2", + "Type": "String", + "Value": "ami-0ad9a80ec3dceacee", + "Version": 85 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697389.822, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-0aeefe7aca43006af", + "Version": 114 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697390.713, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-0dbbc1ffd92e9dc3a", + "Version": 73 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-arm64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697391.321, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-arm64-ebs", + "Type": "String", + "Value": "ami-0f679fed2d6731f5e", + "Version": 85 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697391.614, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-00cedd6af9996d4d7", + "Version": 114 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692759.694, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-x86_64", + "Type": "String", + "Value": "ami-0a5db8fbece0eb74b", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692760.743, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64", + "Type": "String", + "Value": "ami-0de91fdcfc8d9f74e", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-arm64", + "DataType": "text", + "LastModifiedDate": 1721692759.96, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-arm64", + "Type": "String", + "Value": "ami-0cbbefdbb400bc3fa", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692761.237, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-x86_64", + "Type": "String", + "Value": "ami-02225bbcc9e4f69ec", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1703012167.223, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-0eabcdae6cabf6e70", + "Version": 67 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-s3", + "DataType": "text", + "LastModifiedDate": 1703012167.616, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-s3", + "Type": "String", + "Value": "ami-0654bf9da906daf8b", + "Version": 67 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1703012167.808, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-0aea210be1a75b94e", + "Version": 67 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697390.123, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2", + "Type": "String", + "Value": "ami-01abf14eabdf9aade", + "Version": 114 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-arm64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697390.421, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-arm64-gp2", + "Type": "String", + "Value": "ami-0cf49cd7abf721d78", + "Version": 73 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697391.015, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-gp2", + "Type": "String", + "Value": "ami-0db1e2b6da3a4ef84", + "Version": 73 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-east-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2", + "DataType": "text", + "LastModifiedDate": 1703012167.428, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2", + "Type": "String", + "Value": "ami-0a80c906edacd0e8b", + "Version": 67 + } +] \ No newline at end of file diff --git a/moto/ssm/resources/ami-amazon-linux-latest/us-gov-west-1.json b/moto/ssm/resources/ami-amazon-linux-latest/us-gov-west-1.json new file mode 100644 index 000000000000..9508646e0ba7 --- /dev/null +++ b/moto/ssm/resources/ami-amazon-linux-latest/us-gov-west-1.json @@ -0,0 +1,227 @@ +[ + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-arm64", + "DataType": "text", + "LastModifiedDate": 1721692762.09, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-arm64", + "Type": "String", + "Value": "ami-011efb3cb2db23315", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-arm64", + "DataType": "text", + "LastModifiedDate": 1721692762.569, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-arm64", + "Type": "String", + "Value": "ami-019ee724f2be51720", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692762.461, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-x86_64", + "Type": "String", + "Value": "ami-0c74a4baed89bc2c8", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-arm64", + "DataType": "text", + "LastModifiedDate": 1721692762.795, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-arm64", + "Type": "String", + "Value": "ami-01bdd33fcf8c3faaf", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-s3", + "DataType": "text", + "LastModifiedDate": 1703012169.012, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-s3", + "Type": "String", + "Value": "ami-0bb609de40cb15fb0", + "Version": 69 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-pv-x86_64-s3", + "DataType": "text", + "LastModifiedDate": 1703012169.337, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-pv-x86_64-s3", + "Type": "String", + "Value": "ami-0cdbe7f8dcc75fb7c", + "Version": 68 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-arm64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697392.494, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-arm64-gp2", + "Type": "String", + "Value": "ami-0fccef3543f16dd9b", + "Version": 85 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697392.632, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-0eea2ae1689e53bef", + "Version": 119 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697392.995, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-06ba9aacc2eed0ff5", + "Version": 74 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-arm64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697393.216, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-arm64-ebs", + "Type": "String", + "Value": "ami-0549b0e03a35cad47", + "Version": 85 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692762.894, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-default-x86_64", + "Type": "String", + "Value": "ami-03e7ac6ecae00de4c", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1703012168.667, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-034c73ffbb74bb99c", + "Version": 69 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-s3", + "DataType": "text", + "LastModifiedDate": 1703012168.841, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-s3", + "Type": "String", + "Value": "ami-08cdd8d24cc1709c7", + "Version": 69 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1703012168.934, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-00eea1719b6aae09e", + "Version": 69 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-pv-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1703012169.106, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-pv-x86_64-ebs", + "Type": "String", + "Value": "ami-0e3c8ed0bf77adcff", + "Version": 68 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-pv-x86_64-s3", + "DataType": "text", + "LastModifiedDate": 1703012169.187, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-minimal-pv-x86_64-s3", + "Type": "String", + "Value": "ami-07aeb19a8d919da02", + "Version": 68 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-pv-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1703012169.262, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-pv-x86_64-ebs", + "Type": "String", + "Value": "ami-0eb0af607aabfafff", + "Version": 68 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-arm64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697392.88, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-arm64-gp2", + "Type": "String", + "Value": "ami-0c2ed33fcbcc83ebe", + "Version": 74 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697393.114, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-kernel-5.10-hvm-x86_64-gp2", + "Type": "String", + "Value": "ami-0e7f6bd7808f3f95f", + "Version": 74 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-x86_64-ebs", + "DataType": "text", + "LastModifiedDate": 1721697393.321, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-minimal-hvm-x86_64-ebs", + "Type": "String", + "Value": "ami-05eb4d4349faed35c", + "Version": 119 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692762.216, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-x86_64", + "Type": "String", + "Value": "ami-0813aacedccabaaad", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64", + "DataType": "text", + "LastModifiedDate": 1721692762.685, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64", + "Type": "String", + "Value": "ami-0f8c631fccd898fcc", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-arm64", + "DataType": "text", + "LastModifiedDate": 1721692762.348, + "Name": "/aws/service/ami-amazon-linux-latest/al2023-ami-minimal-kernel-6.1-arm64", + "Type": "String", + "Value": "ami-0b2a6da8cb6b500ff", + "Version": 50 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2", + "DataType": "text", + "LastModifiedDate": 1703012168.758, + "Name": "/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2", + "Type": "String", + "Value": "ami-0cfb8ee4baf66e51e", + "Version": 69 + }, + { + "ARN": "arn:aws-us-gov:ssm:us-gov-west-1::parameter/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2", + "DataType": "text", + "LastModifiedDate": 1721697392.767, + "Name": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2", + "Type": "String", + "Value": "ami-03ebdb8bd059274a1", + "Version": 119 + } +] \ No newline at end of file diff --git a/tests/test_ssm/test_ssm_default_amis.py b/tests/test_ssm/test_ssm_default_amis.py index a3c286590dcc..419a49c42c6a 100644 --- a/tests/test_ssm/test_ssm_default_amis.py +++ b/tests/test_ssm/test_ssm_default_amis.py @@ -1,4 +1,5 @@ import boto3 +import pytest from moto import mock_aws @@ -6,8 +7,16 @@ @mock_aws -def test_ssm_get_latest_ami_by_path(): - client = boto3.client("ssm", region_name="us-west-1") +@pytest.mark.parametrize( + "partition,region", + [ + ("aws", "us-west-1"), + ("aws-us-gov", "us-gov-east-1"), + ("aws-us-gov", "us-gov-west-1"), + ], +) +def test_ssm_get_latest_ami_by_path(partition, region): + client = boto3.client("ssm", region_name=region) path = "/aws/service/ami-amazon-linux-latest" params = client.get_parameters_by_path(Path=path)["Parameters"] assert len(params) == 10 @@ -17,7 +26,7 @@ def test_ssm_get_latest_ami_by_path(): ) assert all(p["Type"] == "String" for p in params) assert all(p["DataType"] == "text" for p in params) - assert all(p["ARN"].startswith("arn:aws:ssm:us-west-1") for p in params) + assert all(p["ARN"].startswith(f"arn:{partition}:ssm:{region}") for p in params) @mock_aws diff --git a/tests/test_ssm/test_ssm_parameterstore.py b/tests/test_ssm/test_ssm_parameterstore.py index 1d0ebf01cd3f..77ff65a4e905 100644 --- a/tests/test_ssm/test_ssm_parameterstore.py +++ b/tests/test_ssm/test_ssm_parameterstore.py @@ -1,3 +1,5 @@ +import pytest + from moto.ssm.models import ParameterDict @@ -83,3 +85,17 @@ def test_ssm_parameter_from_unknown_region(): "/aws/service/ami-amazon-linux-latest", recursive=False ) ) + + +@pytest.mark.parametrize("region", ["us-gov-east-1", "us-gov-west-1"]) +def test_ssm_parameter_from_gov_cloud_east_region(region): + store = ParameterDict("000000000000", region) + keys = list( + store.get_keys_beginning_with( + "/aws/service/ami-amazon-linux-latest", recursive=False + ) + ) + for key in keys: + ssm_parameter = store.get(key)[0] + ami = ssm_parameter.value + assert ami.startswith("ami-") From d1ef2fa8b3beaedc9260a8d475a1ee94b1298f7a Mon Sep 17 00:00:00 2001 From: Alex Rashed <2796604+alexrashed@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:15:16 +0200 Subject: [PATCH 04/12] add CI workflow to sync, build, publish, release moto-ext (#78,#79) --- .github/workflows/ci.yml | 195 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000000..6771dad334dd --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,195 @@ +# LocalStack specific workflow to implement a fully-integrated continuous integration pipeline for our fork +# - Rebase this fork based on the latest commit on `main` of upstream +# - Build a Python source and wheel distribution of moto-ext with deterministic versioning +# - Publish the distributions to PyPi +# - Tag the commit in this fork with the new version +# - Create a GitHub release for the new version + +name: Sync / Release moto-ext + +on: + schedule: + - cron: 0 5 * * MON + workflow_dispatch: + inputs: + dry_run: + description: 'Dry Run?' + default: true + required: true + type: boolean + +# limit concurrency to 1 +concurrency: + group: ${{ github.workflow }} + +jobs: + sync-build-release-moto-ext: + runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/project/moto-ext/ + permissions: + contents: write + id-token: write + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: localstack + persist-credentials: false + + - name: Setup Python + uses: actions/setup-python@v6 + with: + python-version: '3.13' + + - name: Configure Git + run: | + # Configure git + git config --global user.name 'LocalStack Bot' + git config --global user.email 'localstack-bot@users.noreply.github.com' + git remote set-url origin https://git:${{ secrets.PRO_ACCESS_TOKEN }}@github.com/${{ github.repository }} + + # make sure to switch to the `localstack` branch (default / main branch of this fork) + git switch localstack + # add moto upstream as remote + git remote add upstream https://github.com/getmoto/moto.git + # rebase with latest changes + git pull + + # Create a custom merge driver which prefers everything from upstream _BUT_ the name and the URL + mkdir -p $HOME/.local/bin + cat > $HOME/.local/bin/git-prefer-theirs-name-url << EOF + #!/bin/bash + set -e + + base="\$1" + local="\$2" + remote="\$3" + + echo "Executing custom merge driver for base \$base, local \$local, remote \$remote." + + # Define keys to keep + KEYS=("name" "url") + + # Read files into arrays + mapfile -t REMOTE_LINES < "\$remote" + mapfile -t LOCAL_LINES < "\$local" + + echo "merging \$local + \$local + \$remote ..." + + # Function to check if a line should be kept (matches any key) + keep_line() { + local line="\$1" + for key in "\${KEYS[@]}"; do + [[ "\$line" == *"\$key"* ]] && return 0 + done + return 1 + } + + # keep key-matched lines from local, others from remote + for i in "\${!LOCAL_LINES[@]}"; do + if keep_line "\${REMOTE_LINES[i]}"; then + echo "\${REMOTE_LINES[i]}" + else + echo "\${LOCAL_LINES[i]}" + fi + done > "\$local" + + exit 0 + EOF + + # make the script executable and add it to the PATH + chmod +x $HOME/.local/bin/git-prefer-theirs-name-url + echo "$HOME/.local/bin" >> "$GITHUB_PATH" + + # add the merge driver to the git config + cat >> .git/config << EOF + + [merge "git-prefer-theirs-name-url"] + name = A driver which resolves merge conflicts on a setup.cfg such that it always takes the local name and url, and everything else from upstream + driver = git-prefer-theirs-name-url %O %A %B + EOF + + # define to use the custom merge driver for the setup.cfg + cat > .gitattributes << EOF + setup.cfg merge=git-prefer-theirs-name-url + EOF + + - name: Rebase localstack branch with latest master from upstream + run: | + git fetch upstream + git rebase upstream/master + + - name: Determine new version + run: | + echo "Determining new version..." + cat > setuptools.cfg << EOF + [tool.setuptools_scm] + local_scheme = "no-local-version" + version_scheme = "post-release" + EOF + python3 -m venv .venv + source .venv/bin/activate + python3 -m pip install setuptools_scm + NEW_VERSION=$(python3 -m setuptools_scm -c setuptools.cfg) + NEW_VERSION="${NEW_VERSION//dev/post}" + echo "New version is: $NEW_VERSION" + echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV + + - name: Build Python distributions + # FYI: Checks in this script only work because the -e flag is enabled by default in GitHub actions + run: | + python3 -m pip install build + + echo "Setting new version in setup.cfg": + # make sure setup.cfg is not dirty yet + git diff --exit-code setup.cfg + sed -i -E 's/^(version\s*=\s*)("?)[^"]+("?)/\1\2'"$NEW_VERSION"'\3/' setup.cfg + # make sure setup.cfg is dirty now + ! git diff --exit-code setup.cfg + + echo "Building new version and tagging commit..." + python3 -m build + + - name: Tag successful build + run: | + git tag -a $NEW_VERSION -m $NEW_VERSION + + - name: Clean up + run: | + git reset --hard + git clean -df + + - name: Store built distributions + uses: actions/upload-artifact@v4 + with: + name: moto-ext-dists + path: dist/*.* + + # publish the package before pushing the tag (this might fail if the version already exists on PyPI) + - name: Publish package distributions to PyPI + if: ${{ github.event.inputs.dry_run != 'true' }} + uses: pypa/gh-action-pypi-publish@release/v1 + + - name: Push + if: ${{ github.event.inputs.dry_run != 'true' }} + run: | + git push --force-with-lease + git push --atomic origin localstack $NEW_VERSION + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # Add a retry to avoid issues where the GH CLI fails + # because it does not yet detect the pushed tag. + - name: Create Release + uses: nick-fields/retry@v3 + if: ${{ github.event.inputs.dry_run != 'true' }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + max_attempts: 5 + retry_wait_seconds: 120 + timeout_minutes: 5 + command: gh release create $NEW_VERSION --repo localstack/moto --notes "automatic rebase sync and release" \ No newline at end of file From d8943fd63975447ea43a30767dc8e487fd955b2e Mon Sep 17 00:00:00 2001 From: Silvio Vasiljevic Date: Tue, 16 Dec 2025 10:31:32 +0100 Subject: [PATCH 05/12] Force rebase on sync (#81) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6771dad334dd..730491a89fd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: python-version: '3.13' - name: Configure Git - run: | + run: | # Configure git git config --global user.name 'LocalStack Bot' git config --global user.email 'localstack-bot@users.noreply.github.com' @@ -120,7 +120,7 @@ jobs: - name: Rebase localstack branch with latest master from upstream run: | git fetch upstream - git rebase upstream/master + git rebase -f upstream/master - name: Determine new version run: | From dfd2db0a7fa89e9de02e4d53e0a92e74a5f8077a Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Tue, 27 Jan 2026 14:49:47 +0530 Subject: [PATCH 06/12] Remove aws-sam-translator pin for Python<3.14 (#80) --- setup.cfg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 130068c2fdd2..53a2259982da 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,7 +46,8 @@ moto = py.typed [options.extras_require] all = antlr4-python3-runtime - aws-sam-translator<=1.103.0 + aws-sam-translator<=1.103.0; python_version >= "3.14" + aws-sam-translator>=1.105.0; python_version < "3.14" joserfc>=0.9.0 jsonpath_ng docker>=3.0.0 @@ -63,7 +64,8 @@ all = multipart proxy = antlr4-python3-runtime - aws-sam-translator<=1.103.0 + aws-sam-translator<=1.103.0; python_version >= "3.14" + aws-sam-translator>=1.105.0; python_version < "3.14" joserfc>=0.9.0 jsonpath_ng docker>=2.5.1 @@ -79,7 +81,8 @@ proxy = multipart server = antlr4-python3-runtime - aws-sam-translator<=1.103.0 + aws-sam-translator<=1.103.0; python_version >= "3.14" + aws-sam-translator>=1.105.0; python_version < "3.14" joserfc>=0.9.0 jsonpath_ng docker>=3.0.0 From 4d130b03c4bdc6a861e573e17b7e1439927565f4 Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Thu, 29 Jan 2026 16:36:44 +0530 Subject: [PATCH 07/12] Update project URLs --- setup.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 53a2259982da..9cb919c6fce6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,10 +19,6 @@ classifiers = Programming Language :: Python :: 3.14 Topic :: Software Development :: Testing keywords = aws ec2 s3 boto3 mock -project_urls = - Documentation = http://docs.getmoto.org/en/latest/ - Issue tracker = https://github.com/getmoto/moto/issues - Changelog = https://github.com/getmoto/moto/blob/master/CHANGELOG.md [options] python_requires = >=3.9 From a864f5ceb2986c9717b53deb2d64ef55a8883217 Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Thu, 29 Jan 2026 18:46:18 +0530 Subject: [PATCH 08/12] 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 09/12] 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 10/12] 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 8c014fd34014ab65e9d717393248986eb8555d34 Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Fri, 30 Jan 2026 13:00:28 +0530 Subject: [PATCH 11/12] Use prod role --- .github/workflows/data-update_ec2-instance-offerings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/data-update_ec2-instance-offerings.yml b/.github/workflows/data-update_ec2-instance-offerings.yml index 7b0b5c7e4a20..7ae3d05d42b2 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::623948600419:role/MotoExt-OIDC-Role + role-to-assume: arn:aws:iam::385386232812:role/MotoExt-OIDC-Role - name: Pull EC2 instance types from AWS run: | From 4623d27993fec472d5977a00fa402a3812c0208e Mon Sep 17 00:00:00 2001 From: viren-nadkarni <5170829+viren-nadkarni@users.noreply.github.com> Date: Fri, 30 Jan 2026 07:36:43 +0000 Subject: [PATCH 12/12] 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 | 116 +- .../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 | 1852 +++++++++-------- .../region/eu-central-1.json | 40 + .../region/eu-west-3.json | 36 + 15 files changed, 2234 insertions(+), 1134 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..12e893c4d062 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 @@ -139,6 +139,38 @@ "InstanceType": "c5a.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c5ad.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c5ad.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c5ad.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c5ad.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c5ad.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c5ad.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c5ad.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c5ad.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "c5d.12xlarge", "Location": "ap-southeast-1a" @@ -891,10 +923,6 @@ "InstanceType": "g5g.xlarge", "Location": "ap-southeast-1a" }, - { - "InstanceType": "hpc6a.48xlarge", - "Location": "ap-southeast-1a" - }, { "InstanceType": "i2.2xlarge", "Location": "ap-southeast-1a" @@ -1199,6 +1227,22 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "inf2.24xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "inf2.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-southeast-1a" @@ -2067,6 +2111,10 @@ "InstanceType": "p3.8xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "p4de.24xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "ap-southeast-1a" @@ -3003,6 +3051,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" @@ -3255,38 +3307,6 @@ "InstanceType": "c5a.xlarge", "Location": "ap-southeast-1b" }, - { - "InstanceType": "c5ad.12xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "c5ad.16xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "c5ad.24xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "c5ad.2xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "c5ad.4xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "c5ad.8xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "c5ad.large", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "c5ad.xlarge", - "Location": "ap-southeast-1b" - }, { "InstanceType": "c5d.12xlarge", "Location": "ap-southeast-1b" @@ -4039,6 +4059,10 @@ "InstanceType": "g5g.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "hpc6a.48xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-southeast-1b" @@ -4343,22 +4367,6 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-1b" }, - { - "InstanceType": "inf2.24xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "inf2.48xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "inf2.8xlarge", - "Location": "ap-southeast-1b" - }, - { - "InstanceType": "inf2.xlarge", - "Location": "ap-southeast-1b" - }, { "InstanceType": "is4gen.2xlarge", "Location": "ap-southeast-1b" @@ -5227,10 +5235,6 @@ "InstanceType": "p3.8xlarge", "Location": "ap-southeast-1b" }, - { - "InstanceType": "p4de.24xlarge", - "Location": "ap-southeast-1b" - }, { "InstanceType": "r3.2xlarge", "Location": "ap-southeast-1b" 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..0eb4be491b36 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 @@ -1107,10 +1107,6 @@ "InstanceType": "d3en.xlarge", "Location": "us-east-1a" }, - { - "InstanceType": "dl1.24xlarge", - "Location": "us-east-1a" - }, { "InstanceType": "f1.16xlarge", "Location": "us-east-1a" @@ -1371,6 +1367,18 @@ "InstanceType": "h1.8xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "hpc7g.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "hpc7g.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "hpc7g.8xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "i2.2xlarge", "Location": "us-east-1a" @@ -2843,6 +2851,22 @@ "InstanceType": "mac-m4pro.metal", "Location": "us-east-1a" }, + { + "InstanceType": "mac1.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac2-m1ultra.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac2-m2.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac2-m2pro.metal", + "Location": "us-east-1a" + }, { "InstanceType": "mac2.metal", "Location": "us-east-1a" @@ -2859,10 +2883,18 @@ "InstanceType": "p3.8xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "p3dn.24xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "p4d.24xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "p4de.24xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "p5.48xlarge", "Location": "us-east-1a" @@ -2875,6 +2907,10 @@ "InstanceType": "p5en.48xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "p6-b200.48xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "r3.2xlarge", "Location": "us-east-1a" @@ -4080,47 +4116,39 @@ "Location": "us-east-1a" }, { - "InstanceType": "u-3tb1.56xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "u-6tb1.112xlarge", - "Location": "us-east-1a" - }, - { - "InstanceType": "u-6tb1.56xlarge", + "InstanceType": "trn1.2xlarge", "Location": "us-east-1a" }, { - "InstanceType": "u7i-12tb.224xlarge", + "InstanceType": "trn1.32xlarge", "Location": "us-east-1a" }, { - "InstanceType": "u7i-6tb.112xlarge", + "InstanceType": "trn1n.32xlarge", "Location": "us-east-1a" }, { - "InstanceType": "u7i-8tb.112xlarge", + "InstanceType": "u-3tb1.56xlarge", "Location": "us-east-1a" }, { - "InstanceType": "u7in-16tb.224xlarge", + "InstanceType": "u-6tb1.112xlarge", "Location": "us-east-1a" }, { - "InstanceType": "u7in-24tb.224xlarge", + "InstanceType": "u-6tb1.56xlarge", "Location": "us-east-1a" }, { - "InstanceType": "vt1.24xlarge", + "InstanceType": "u7i-12tb.224xlarge", "Location": "us-east-1a" }, { - "InstanceType": "vt1.3xlarge", + "InstanceType": "u7i-6tb.112xlarge", "Location": "us-east-1a" }, { - "InstanceType": "vt1.6xlarge", + "InstanceType": "u7i-8tb.112xlarge", "Location": "us-east-1a" }, { @@ -4395,30 +4423,6 @@ "InstanceType": "z1d.xlarge", "Location": "us-east-1a" }, - { - "InstanceType": "a1.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "a1.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "a1.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "a1.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "a1.metal", - "Location": "us-east-1b" - }, - { - "InstanceType": "a1.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "c1.medium", "Location": "us-east-1b" @@ -4427,26 +4431,6 @@ "InstanceType": "c1.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "c3.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c3.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c3.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c3.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "c3.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "c4.2xlarge", "Location": "us-east-1b" @@ -4567,18 +4551,10 @@ "InstanceType": "c5ad.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "c5d.12xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "c5d.18xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "c5d.24xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "c5d.2xlarge", "Location": "us-east-1b" @@ -5127,54 +5103,6 @@ "InstanceType": "c7i.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "c8a.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.metal-24xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.metal-48xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8a.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "c8g.12xlarge", "Location": "us-east-1b" @@ -5223,54 +5151,14 @@ "InstanceType": "c8g.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "c8gb.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8gb.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8gb.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8gb.2xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "c8gb.48xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "c8gb.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8gb.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8gb.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8gb.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "c8gb.metal-24xl", - "Location": "us-east-1b" - }, { "InstanceType": "c8gb.metal-48xl", "Location": "us-east-1b" }, - { - "InstanceType": "c8gb.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "c8gd.12xlarge", "Location": "us-east-1b" @@ -5368,175 +5256,95 @@ "Location": "us-east-1b" }, { - "InstanceType": "c8i-flex.12xlarge", + "InstanceType": "d2.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i-flex.16xlarge", + "InstanceType": "d2.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i-flex.2xlarge", + "InstanceType": "d2.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i-flex.4xlarge", + "InstanceType": "d2.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i-flex.8xlarge", + "InstanceType": "d3.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i-flex.large", + "InstanceType": "d3.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i-flex.xlarge", + "InstanceType": "d3.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.12xlarge", + "InstanceType": "d3.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.16xlarge", + "InstanceType": "d3en.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.24xlarge", + "InstanceType": "d3en.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.2xlarge", + "InstanceType": "d3en.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.32xlarge", + "InstanceType": "d3en.6xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.48xlarge", + "InstanceType": "d3en.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.4xlarge", + "InstanceType": "d3en.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.8xlarge", + "InstanceType": "f1.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.96xlarge", + "InstanceType": "f1.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.large", + "InstanceType": "f1.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.metal-48xl", + "InstanceType": "f2.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.metal-96xl", + "InstanceType": "f2.48xlarge", "Location": "us-east-1b" }, { - "InstanceType": "c8i.xlarge", + "InstanceType": "f2.6xlarge", "Location": "us-east-1b" }, { - "InstanceType": "d2.2xlarge", + "InstanceType": "g4ad.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "d2.4xlarge", + "InstanceType": "g4ad.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "d2.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d2.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3en.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3en.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3en.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3en.6xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3en.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "d3en.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f1.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f1.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f1.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f2.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f2.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "f2.6xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g4ad.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g4ad.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "g4ad.4xlarge", + "InstanceType": "g4ad.4xlarge", "Location": "us-east-1b" }, { @@ -5723,22 +5531,6 @@ "InstanceType": "gr6f.4xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "h1.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "h1.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "h1.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "h1.8xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "i2.2xlarge", "Location": "us-east-1b" @@ -6003,50 +5795,6 @@ "InstanceType": "i8g.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "i8ge.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.18xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.3xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.6xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.metal-24xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.metal-48xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "i8ge.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-1b" @@ -6087,22 +5835,6 @@ "InstanceType": "inf1.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "inf2.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "inf2.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "inf2.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "inf2.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "is4gen.2xlarge", "Location": "us-east-1b" @@ -6155,22 +5887,6 @@ "InstanceType": "m2.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "m3.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m3.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "m3.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "m3.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "m4.10xlarge", "Location": "us-east-1b" @@ -6395,10 +6111,6 @@ "InstanceType": "m5n.large", "Location": "us-east-1b" }, - { - "InstanceType": "m5n.metal", - "Location": "us-east-1b" - }, { "InstanceType": "m5n.xlarge", "Location": "us-east-1b" @@ -6900,341 +6612,177 @@ "Location": "us-east-1b" }, { - "InstanceType": "m8a.12xlarge", + "InstanceType": "m8g.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8a.16xlarge", + "InstanceType": "m8g.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8a.24xlarge", + "InstanceType": "m8g.24xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8a.2xlarge", + "InstanceType": "m8g.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8a.48xlarge", + "InstanceType": "m8g.48xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8a.4xlarge", + "InstanceType": "m8g.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8a.8xlarge", + "InstanceType": "m8g.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8a.large", + "InstanceType": "m8g.large", "Location": "us-east-1b" }, { - "InstanceType": "m8a.medium", + "InstanceType": "m8g.medium", "Location": "us-east-1b" }, { - "InstanceType": "m8a.metal-24xl", + "InstanceType": "m8g.metal-24xl", "Location": "us-east-1b" }, { - "InstanceType": "m8a.metal-48xl", + "InstanceType": "m8g.metal-48xl", "Location": "us-east-1b" }, { - "InstanceType": "m8a.xlarge", + "InstanceType": "m8g.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.12xlarge", + "InstanceType": "m8gd.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.16xlarge", + "InstanceType": "m8gd.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.24xlarge", + "InstanceType": "m8gd.24xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.2xlarge", + "InstanceType": "m8gd.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.48xlarge", + "InstanceType": "m8gd.48xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.4xlarge", + "InstanceType": "m8gd.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.8xlarge", + "InstanceType": "m8gd.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8g.large", + "InstanceType": "m8gd.large", "Location": "us-east-1b" }, { - "InstanceType": "m8g.medium", + "InstanceType": "m8gd.medium", "Location": "us-east-1b" }, { - "InstanceType": "m8g.metal-24xl", + "InstanceType": "m8gd.metal-24xl", "Location": "us-east-1b" }, { - "InstanceType": "m8g.metal-48xl", + "InstanceType": "m8gd.metal-48xl", "Location": "us-east-1b" }, { - "InstanceType": "m8g.xlarge", + "InstanceType": "m8gd.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.12xlarge", + "InstanceType": "m8i.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.16xlarge", + "InstanceType": "m8i.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.24xlarge", + "InstanceType": "m8i.24xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.2xlarge", + "InstanceType": "m8i.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.48xlarge", + "InstanceType": "m8i.32xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.4xlarge", + "InstanceType": "m8i.48xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.8xlarge", + "InstanceType": "m8i.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.large", + "InstanceType": "m8i.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.medium", + "InstanceType": "m8i.96xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gb.xlarge", + "InstanceType": "m8i.large", "Location": "us-east-1b" }, { - "InstanceType": "m8gd.12xlarge", + "InstanceType": "m8i.metal-48xl", "Location": "us-east-1b" }, { - "InstanceType": "m8gd.16xlarge", + "InstanceType": "m8i.metal-96xl", "Location": "us-east-1b" }, { - "InstanceType": "m8gd.24xlarge", + "InstanceType": "m8i.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gd.2xlarge", + "InstanceType": "mac2.metal", "Location": "us-east-1b" }, { - "InstanceType": "m8gd.48xlarge", + "InstanceType": "p3.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gd.4xlarge", + "InstanceType": "p3.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "m8gd.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gd.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gd.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gd.metal-24xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gd.metal-48xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gd.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8gn.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i-flex.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i-flex.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i-flex.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i-flex.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i-flex.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i-flex.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i-flex.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.32xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.96xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.metal-48xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.metal-96xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "m8i.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "mac-m4max.metal", - "Location": "us-east-1b" - }, - { - "InstanceType": "mac1.metal", - "Location": "us-east-1b" - }, - { - "InstanceType": "mac2-m1ultra.metal", - "Location": "us-east-1b" - }, - { - "InstanceType": "mac2-m2.metal", - "Location": "us-east-1b" - }, - { - "InstanceType": "mac2-m2pro.metal", + "InstanceType": "p3.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "mac2.metal", + "InstanceType": "p3dn.24xlarge", "Location": "us-east-1b" }, { "InstanceType": "p4d.24xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "p4de.24xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "p5.48xlarge", "Location": "us-east-1b" @@ -7243,26 +6791,6 @@ "InstanceType": "p5.4xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "r3.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r3.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r3.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r3.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "r3.xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "r4.16xlarge", "Location": "us-east-1b" @@ -8012,283 +7540,139 @@ "Location": "us-east-1b" }, { - "InstanceType": "r8a.12xlarge", + "InstanceType": "r8g.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8a.16xlarge", + "InstanceType": "r8g.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8a.24xlarge", + "InstanceType": "r8g.24xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8a.2xlarge", + "InstanceType": "r8g.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8a.48xlarge", + "InstanceType": "r8g.48xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8a.4xlarge", + "InstanceType": "r8g.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8a.8xlarge", + "InstanceType": "r8g.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8a.large", + "InstanceType": "r8g.large", "Location": "us-east-1b" }, { - "InstanceType": "r8a.medium", + "InstanceType": "r8g.medium", "Location": "us-east-1b" }, { - "InstanceType": "r8a.metal-24xl", + "InstanceType": "r8g.metal-24xl", "Location": "us-east-1b" }, { - "InstanceType": "r8a.metal-48xl", + "InstanceType": "r8g.metal-48xl", "Location": "us-east-1b" }, { - "InstanceType": "r8a.xlarge", + "InstanceType": "r8g.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.12xlarge", + "InstanceType": "r8gd.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.16xlarge", + "InstanceType": "r8gd.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.24xlarge", + "InstanceType": "r8gd.24xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.2xlarge", + "InstanceType": "r8gd.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.48xlarge", + "InstanceType": "r8gd.48xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.4xlarge", + "InstanceType": "r8gd.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.8xlarge", + "InstanceType": "r8gd.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8g.large", + "InstanceType": "r8gd.large", "Location": "us-east-1b" }, { - "InstanceType": "r8g.medium", + "InstanceType": "r8gd.medium", "Location": "us-east-1b" }, { - "InstanceType": "r8g.metal-24xl", + "InstanceType": "r8gd.metal-24xl", "Location": "us-east-1b" }, { - "InstanceType": "r8g.metal-48xl", + "InstanceType": "r8gd.metal-48xl", "Location": "us-east-1b" }, { - "InstanceType": "r8g.xlarge", + "InstanceType": "r8gd.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.12xlarge", + "InstanceType": "r8i-flex.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.16xlarge", + "InstanceType": "r8i-flex.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.24xlarge", + "InstanceType": "r8i-flex.2xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.2xlarge", + "InstanceType": "r8i-flex.4xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.48xlarge", + "InstanceType": "r8i-flex.8xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.4xlarge", + "InstanceType": "r8i-flex.large", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.8xlarge", + "InstanceType": "r8i-flex.xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.large", + "InstanceType": "r8i.12xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.medium", + "InstanceType": "r8i.16xlarge", "Location": "us-east-1b" }, { - "InstanceType": "r8gb.metal-24xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gb.metal-48xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gb.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.metal-24xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.metal-48xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gd.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.24xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.48xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.medium", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.metal-24xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.metal-48xl", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8gn.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i-flex.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i-flex.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i-flex.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i-flex.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i-flex.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i-flex.large", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i-flex.xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i.16xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "r8i.24xlarge", + "InstanceType": "r8i.24xlarge", "Location": "us-east-1b" }, { @@ -8447,10 +7831,6 @@ "InstanceType": "t4g.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "trn1.32xlarge", - "Location": "us-east-1b" - }, { "InstanceType": "u-3tb1.56xlarge", "Location": "us-east-1b" @@ -8487,6 +7867,18 @@ "InstanceType": "u7in-32tb.224xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "vt1.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "vt1.3xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "vt1.6xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "x1.16xlarge", "Location": "us-east-1b" @@ -8603,30 +7995,6 @@ "InstanceType": "x2iedn.xlarge", "Location": "us-east-1b" }, - { - "InstanceType": "x2iezn.12xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "x2iezn.2xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "x2iezn.4xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "x2iezn.6xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "x2iezn.8xlarge", - "Location": "us-east-1b" - }, - { - "InstanceType": "x2iezn.metal", - "Location": "us-east-1b" - }, { "InstanceType": "x8g.12xlarge", "Location": "us-east-1b" @@ -9867,6 +9235,10 @@ "InstanceType": "d3en.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "dl1.24xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "f1.16xlarge", "Location": "us-east-1c" @@ -10127,18 +9499,6 @@ "InstanceType": "h1.8xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "hpc7g.16xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "hpc7g.4xlarge", - "Location": "us-east-1c" - }, - { - "InstanceType": "hpc7g.8xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "i2.2xlarge", "Location": "us-east-1c" @@ -11611,22 +10971,6 @@ "InstanceType": "mac-m4pro.metal", "Location": "us-east-1c" }, - { - "InstanceType": "mac1.metal", - "Location": "us-east-1c" - }, - { - "InstanceType": "mac2-m1ultra.metal", - "Location": "us-east-1c" - }, - { - "InstanceType": "mac2-m2.metal", - "Location": "us-east-1c" - }, - { - "InstanceType": "mac2-m2pro.metal", - "Location": "us-east-1c" - }, { "InstanceType": "mac2.metal", "Location": "us-east-1c" @@ -11643,18 +10987,10 @@ "InstanceType": "p3.8xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "p3dn.24xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "p4d.24xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "p4de.24xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "p5.48xlarge", "Location": "us-east-1c" @@ -11667,10 +11003,6 @@ "InstanceType": "p5en.48xlarge", "Location": "us-east-1c" }, - { - "InstanceType": "p6-b200.48xlarge", - "Location": "us-east-1c" - }, { "InstanceType": "r3.2xlarge", "Location": "us-east-1c" @@ -12876,39 +12208,47 @@ "Location": "us-east-1c" }, { - "InstanceType": "trn1.2xlarge", + "InstanceType": "u-3tb1.56xlarge", "Location": "us-east-1c" }, { - "InstanceType": "trn1.32xlarge", + "InstanceType": "u-6tb1.112xlarge", "Location": "us-east-1c" }, { - "InstanceType": "trn1n.32xlarge", + "InstanceType": "u-6tb1.56xlarge", "Location": "us-east-1c" }, { - "InstanceType": "u-3tb1.56xlarge", + "InstanceType": "u7i-12tb.224xlarge", "Location": "us-east-1c" }, { - "InstanceType": "u-6tb1.112xlarge", + "InstanceType": "u7i-6tb.112xlarge", "Location": "us-east-1c" }, { - "InstanceType": "u-6tb1.56xlarge", + "InstanceType": "u7i-8tb.112xlarge", "Location": "us-east-1c" }, { - "InstanceType": "u7i-12tb.224xlarge", + "InstanceType": "u7in-16tb.224xlarge", "Location": "us-east-1c" }, { - "InstanceType": "u7i-6tb.112xlarge", + "InstanceType": "u7in-24tb.224xlarge", "Location": "us-east-1c" }, { - "InstanceType": "u7i-8tb.112xlarge", + "InstanceType": "vt1.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "vt1.3xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "vt1.6xlarge", "Location": "us-east-1c" }, { @@ -13184,13 +12524,57 @@ "Location": "us-east-1c" }, { - "InstanceType": "c1.medium", + "InstanceType": "a1.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "a1.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "a1.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "a1.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "a1.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "a1.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c1.medium", "Location": "us-east-1d" }, { "InstanceType": "c1.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c3.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c3.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c3.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c3.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c3.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c4.2xlarge", "Location": "us-east-1d" @@ -13311,10 +12695,18 @@ "InstanceType": "c5ad.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c5d.12xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c5d.18xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c5d.24xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c5d.2xlarge", "Location": "us-east-1d" @@ -13863,6 +13255,54 @@ "InstanceType": "c7i.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c8a.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8a.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c8g.12xlarge", "Location": "us-east-1d" @@ -13911,14 +13351,54 @@ "InstanceType": "c8g.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c8gb.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8gb.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8gb.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8gb.2xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c8gb.48xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c8gb.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8gb.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8gb.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8gb.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8gb.metal-24xl", + "Location": "us-east-1d" + }, { "InstanceType": "c8gb.metal-48xl", "Location": "us-east-1d" }, + { + "InstanceType": "c8gb.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "c8gd.12xlarge", "Location": "us-east-1d" @@ -14015,6 +13495,86 @@ "InstanceType": "c8gn.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c8i-flex.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i-flex.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i-flex.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i-flex.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i-flex.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i-flex.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i-flex.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.96xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.metal-96xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "c8i.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1d" @@ -14291,6 +13851,22 @@ "InstanceType": "gr6f.4xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "h1.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "h1.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "h1.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "h1.8xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "i2.2xlarge", "Location": "us-east-1d" @@ -14556,43 +14132,103 @@ "Location": "us-east-1d" }, { - "InstanceType": "im4gn.16xlarge", + "InstanceType": "i8ge.12xlarge", "Location": "us-east-1d" }, { - "InstanceType": "im4gn.2xlarge", + "InstanceType": "i8ge.18xlarge", "Location": "us-east-1d" }, { - "InstanceType": "im4gn.4xlarge", + "InstanceType": "i8ge.24xlarge", "Location": "us-east-1d" }, { - "InstanceType": "im4gn.8xlarge", + "InstanceType": "i8ge.2xlarge", "Location": "us-east-1d" }, { - "InstanceType": "im4gn.large", + "InstanceType": "i8ge.3xlarge", "Location": "us-east-1d" }, { - "InstanceType": "im4gn.xlarge", + "InstanceType": "i8ge.48xlarge", "Location": "us-east-1d" }, { - "InstanceType": "inf1.24xlarge", + "InstanceType": "i8ge.6xlarge", "Location": "us-east-1d" }, { - "InstanceType": "inf1.2xlarge", + "InstanceType": "i8ge.large", "Location": "us-east-1d" }, { - "InstanceType": "inf1.6xlarge", + "InstanceType": "i8ge.metal-24xl", "Location": "us-east-1d" }, { - "InstanceType": "inf1.xlarge", + "InstanceType": "i8ge.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "i8ge.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "im4gn.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf1.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf1.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf1.6xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf1.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf2.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf2.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf2.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "inf2.xlarge", "Location": "us-east-1d" }, { @@ -14647,6 +14283,22 @@ "InstanceType": "m2.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m3.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m3.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m3.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "m3.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "m4.10xlarge", "Location": "us-east-1d" @@ -14871,6 +14523,10 @@ "InstanceType": "m5n.large", "Location": "us-east-1d" }, + { + "InstanceType": "m5n.metal", + "Location": "us-east-1d" + }, { "InstanceType": "m5n.xlarge", "Location": "us-east-1d" @@ -15371,6 +15027,54 @@ "InstanceType": "m7i.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m8a.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8a.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "m8g.12xlarge", "Location": "us-east-1d" @@ -15412,91 +15116,279 @@ "Location": "us-east-1d" }, { - "InstanceType": "m8g.metal-48xl", + "InstanceType": "m8g.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8g.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gb.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gd.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8gn.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i-flex.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i-flex.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i-flex.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i-flex.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i-flex.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i-flex.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m8i-flex.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": "m8g.xlarge", + "InstanceType": "m8i.8xlarge", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.12xlarge", + "InstanceType": "m8i.96xlarge", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.16xlarge", + "InstanceType": "m8i.large", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.24xlarge", + "InstanceType": "m8i.metal-48xl", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.2xlarge", + "InstanceType": "m8i.metal-96xl", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.48xlarge", + "InstanceType": "m8i.xlarge", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.4xlarge", + "InstanceType": "mac-m4max.metal", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.8xlarge", + "InstanceType": "mac1.metal", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.large", + "InstanceType": "mac2-m1ultra.metal", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.medium", + "InstanceType": "mac2-m2.metal", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.metal-24xl", + "InstanceType": "mac2-m2pro.metal", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.metal-48xl", + "InstanceType": "mac2.metal", "Location": "us-east-1d" }, { - "InstanceType": "m8gd.xlarge", + "InstanceType": "p4d.24xlarge", "Location": "us-east-1d" }, { - "InstanceType": "mac2.metal", + "InstanceType": "p4de.24xlarge", "Location": "us-east-1d" }, { - "InstanceType": "p3.16xlarge", + "InstanceType": "p5.48xlarge", "Location": "us-east-1d" }, { - "InstanceType": "p3.2xlarge", + "InstanceType": "p5.4xlarge", "Location": "us-east-1d" }, { - "InstanceType": "p3.8xlarge", + "InstanceType": "r3.2xlarge", "Location": "us-east-1d" }, { - "InstanceType": "p3dn.24xlarge", + "InstanceType": "r3.4xlarge", "Location": "us-east-1d" }, { - "InstanceType": "p4d.24xlarge", + "InstanceType": "r3.8xlarge", "Location": "us-east-1d" }, { - "InstanceType": "p5.48xlarge", + "InstanceType": "r3.large", "Location": "us-east-1d" }, { - "InstanceType": "p5.4xlarge", + "InstanceType": "r3.xlarge", "Location": "us-east-1d" }, { @@ -16247,6 +16139,54 @@ "InstanceType": "r7iz.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r8a.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8a.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "r8g.12xlarge", "Location": "us-east-1d" @@ -16295,6 +16235,54 @@ "InstanceType": "r8g.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r8gb.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gb.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "r8gd.12xlarge", "Location": "us-east-1d" @@ -16343,6 +16331,54 @@ "InstanceType": "r8gd.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r8gn.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.metal-24xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.metal-48xl", + "Location": "us-east-1d" + }, + { + "InstanceType": "r8gn.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "r8i-flex.12xlarge", "Location": "us-east-1d" @@ -16539,6 +16575,10 @@ "InstanceType": "t4g.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "trn1.32xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "u-3tb1.56xlarge", "Location": "us-east-1d" @@ -16575,18 +16615,6 @@ "InstanceType": "u7in-32tb.224xlarge", "Location": "us-east-1d" }, - { - "InstanceType": "vt1.24xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "vt1.3xlarge", - "Location": "us-east-1d" - }, - { - "InstanceType": "vt1.6xlarge", - "Location": "us-east-1d" - }, { "InstanceType": "x1.16xlarge", "Location": "us-east-1d" @@ -16703,6 +16731,30 @@ "InstanceType": "x2iedn.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "x2iezn.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "x2iezn.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "x2iezn.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "x2iezn.6xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "x2iezn.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "x2iezn.metal", + "Location": "us-east-1d" + }, { "InstanceType": "x8g.12xlarge", "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"