From ec9d9abdcb6127c9697bdc3db3e15fb471887ae4 Mon Sep 17 00:00:00 2001 From: viren-nadkarni <5170829+viren-nadkarni@users.noreply.github.com> Date: Sun, 5 Apr 2026 05:06:29 +0000 Subject: [PATCH] chore: update EMR Instance Types --- .../resources/instance-types-emr-5.19.1.json | 84 +- .../resources/instance-types-emr-5.21.1.json | 84 +- .../resources/instance-types-emr-5.22.0.json | 84 +- .../resources/instance-types-emr-5.23.0.json | 84 +- .../resources/instance-types-emr-5.29.0.json | 84 +- .../resources/instance-types-emr-5.30.2.json | 84 +- .../resources/instance-types-emr-5.33.1.json | 90 +-- .../resources/instance-types-emr-5.36.1.json | 93 +-- .../resources/instance-types-emr-5.9.1.json | 84 +- .../resources/instance-types-emr-6.10.1.json | 93 +-- .../resources/instance-types-emr-6.12.0.json | 93 +-- .../resources/instance-types-emr-6.13.0.json | 93 ++- .../resources/instance-types-emr-6.2.0.json | 84 +- .../resources/instance-types-emr-6.6.0.json | 90 ++- .../resources/instance-types-emr-6.7.0.json | 90 +-- .../resources/instance-types-emr-6.9.0.json | 90 +-- .../resources/instance-types-emr-7.0.0.json | 93 +-- .../resources/instance-types-emr-7.10.0.json | 39 + .../resources/instance-types-emr-7.11.0.json | 39 + .../resources/instance-types-emr-7.12.0.json | 39 + .../resources/instance-types-emr-7.13.0.json | 733 ++++++++++++++++++ .../resources/instance-types-emr-7.3.0.json | 93 +-- .../resources/instance-types-emr-7.7.0.json | 93 ++- .../resources/release-labels-eu-west-3.json | 1 + .../resources/release-labels-us-west-1.json | 1 + 25 files changed, 1581 insertions(+), 954 deletions(-) create mode 100644 moto/emr/resources/instance-types-emr-7.13.0.json diff --git a/moto/emr/resources/instance-types-emr-5.19.1.json b/moto/emr/resources/instance-types-emr-5.19.1.json index 21e54720daaa..f11392a1ee31 100644 --- a/moto/emr/resources/instance-types-emr-5.19.1.json +++ b/moto/emr/resources/instance-types-emr-5.19.1.json @@ -36,30 +36,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -97,30 +81,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -169,24 +139,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -202,6 +161,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -217,17 +184,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.21.1.json b/moto/emr/resources/instance-types-emr-5.21.1.json index 123bc1aa92e8..d34ef9388455 100644 --- a/moto/emr/resources/instance-types-emr-5.21.1.json +++ b/moto/emr/resources/instance-types-emr-5.21.1.json @@ -48,30 +48,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -114,30 +98,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -198,24 +168,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -231,6 +190,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -246,17 +213,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.22.0.json b/moto/emr/resources/instance-types-emr-5.22.0.json index 123bc1aa92e8..d34ef9388455 100644 --- a/moto/emr/resources/instance-types-emr-5.22.0.json +++ b/moto/emr/resources/instance-types-emr-5.22.0.json @@ -48,30 +48,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -114,30 +98,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -198,24 +168,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -231,6 +190,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -246,17 +213,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.23.0.json b/moto/emr/resources/instance-types-emr-5.23.0.json index 123bc1aa92e8..d34ef9388455 100644 --- a/moto/emr/resources/instance-types-emr-5.23.0.json +++ b/moto/emr/resources/instance-types-emr-5.23.0.json @@ -48,30 +48,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -114,30 +98,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -198,24 +168,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -231,6 +190,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -246,17 +213,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.29.0.json b/moto/emr/resources/instance-types-emr-5.29.0.json index c6682b218775..637a50091bba 100644 --- a/moto/emr/resources/instance-types-emr-5.29.0.json +++ b/moto/emr/resources/instance-types-emr-5.29.0.json @@ -48,30 +48,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -114,30 +98,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -198,24 +168,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -231,6 +190,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -252,17 +219,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.30.2.json b/moto/emr/resources/instance-types-emr-5.30.2.json index d06d98887efa..b842ca72a7b1 100644 --- a/moto/emr/resources/instance-types-emr-5.30.2.json +++ b/moto/emr/resources/instance-types-emr-5.30.2.json @@ -54,30 +54,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -120,30 +104,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -210,24 +180,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -243,6 +202,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -264,17 +231,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.33.1.json b/moto/emr/resources/instance-types-emr-5.33.1.json index c2b4b9c3b3dd..755eb1ecf217 100644 --- a/moto/emr/resources/instance-types-emr-5.33.1.json +++ b/moto/emr/resources/instance-types-emr-5.33.1.json @@ -81,30 +81,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -179,30 +163,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -290,24 +260,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -337,6 +296,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -362,17 +329,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.36.1.json b/moto/emr/resources/instance-types-emr-5.36.1.json index 257c85549d0a..4d1b3522f0fa 100644 --- a/moto/emr/resources/instance-types-emr-5.36.1.json +++ b/moto/emr/resources/instance-types-emr-5.36.1.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -150,22 +142,14 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -299,30 +283,19 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -472,14 +445,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -488,16 +453,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -559,6 +521,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -620,17 +590,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.9.1.json b/moto/emr/resources/instance-types-emr-5.9.1.json index 935ae3236ad2..92bdf13fedb3 100644 --- a/moto/emr/resources/instance-types-emr-5.9.1.json +++ b/moto/emr/resources/instance-types-emr-5.9.1.json @@ -22,30 +22,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -69,30 +53,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "r7a.xlarge", "r7a.2xlarge", "r7a.4xlarge", @@ -117,24 +87,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -145,6 +104,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -156,17 +123,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.10.1.json b/moto/emr/resources/instance-types-emr-6.10.1.json index 257c85549d0a..4d1b3522f0fa 100644 --- a/moto/emr/resources/instance-types-emr-6.10.1.json +++ b/moto/emr/resources/instance-types-emr-6.10.1.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -150,22 +142,14 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -299,30 +283,19 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -472,14 +445,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -488,16 +453,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -559,6 +521,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -620,17 +590,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.12.0.json b/moto/emr/resources/instance-types-emr-6.12.0.json index 257c85549d0a..4d1b3522f0fa 100644 --- a/moto/emr/resources/instance-types-emr-6.12.0.json +++ b/moto/emr/resources/instance-types-emr-6.12.0.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -150,22 +142,14 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -299,30 +283,19 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -472,14 +445,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -488,16 +453,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -559,6 +521,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -620,17 +590,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.13.0.json b/moto/emr/resources/instance-types-emr-6.13.0.json index 4d1b3522f0fa..257c85549d0a 100644 --- a/moto/emr/resources/instance-types-emr-6.13.0.json +++ b/moto/emr/resources/instance-types-emr-6.13.0.json @@ -134,6 +134,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", + "m8a.xlarge", + "m8a.2xlarge", + "m8a.4xlarge", + "m8a.8xlarge", + "m8a.12xlarge", + "m8a.16xlarge", + "m8a.24xlarge", + "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -142,14 +150,22 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", + "m8i.xlarge", + "m8i.2xlarge", + "m8i.4xlarge", + "m8i.8xlarge", + "m8i.12xlarge", + "m8i.16xlarge", + "m8i.24xlarge", + "m8i.32xlarge", + "m8i.48xlarge", + "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -283,19 +299,30 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", + "c8gn.xlarge", + "c8gn.2xlarge", + "c8gn.4xlarge", + "c8gn.8xlarge", + "c8gn.12xlarge", + "c8gn.16xlarge", + "c8gn.24xlarge", + "c8gn.48xlarge", + "c8i.xlarge", + "c8i.2xlarge", + "c8i.4xlarge", + "c8i.8xlarge", + "c8i.12xlarge", + "c8i.16xlarge", + "c8i.24xlarge", + "c8i.32xlarge", + "c8i.48xlarge", + "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", - "f2.6xlarge", - "f2.12xlarge", - "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -445,6 +472,14 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", + "r8a.xlarge", + "r8a.2xlarge", + "r8a.4xlarge", + "r8a.8xlarge", + "r8a.12xlarge", + "r8a.16xlarge", + "r8a.24xlarge", + "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -453,13 +488,16 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", + "r8i.xlarge", + "r8i.2xlarge", + "r8i.4xlarge", + "r8i.8xlarge", + "r8i.12xlarge", + "r8i.16xlarge", + "r8i.24xlarge", + "r8i.32xlarge", + "r8i.48xlarge", + "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -521,14 +559,6 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -590,32 +620,17 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", - "d3en.xlarge", - "d3en.2xlarge", - "d3en.4xlarge", - "d3en.6xlarge", - "d3en.8xlarge", - "d3en.12xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", - "c1.medium", - "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.2.0.json b/moto/emr/resources/instance-types-emr-6.2.0.json index 5c4928e0527e..8572ee7bd83e 100644 --- a/moto/emr/resources/instance-types-emr-6.2.0.json +++ b/moto/emr/resources/instance-types-emr-6.2.0.json @@ -68,14 +68,30 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", + "m8a.xlarge", + "m8a.2xlarge", + "m8a.4xlarge", + "m8a.8xlarge", + "m8a.12xlarge", + "m8a.16xlarge", + "m8a.24xlarge", + "m8a.48xlarge", + "m8i.xlarge", + "m8i.2xlarge", + "m8i.4xlarge", + "m8i.8xlarge", + "m8i.12xlarge", + "m8i.16xlarge", + "m8i.24xlarge", + "m8i.32xlarge", + "m8i.48xlarge", + "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -131,16 +147,30 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", + "c8gn.xlarge", + "c8gn.2xlarge", + "c8gn.4xlarge", + "c8gn.8xlarge", + "c8gn.12xlarge", + "c8gn.16xlarge", + "c8gn.24xlarge", + "c8gn.48xlarge", + "c8i.xlarge", + "c8i.2xlarge", + "c8i.4xlarge", + "c8i.8xlarge", + "c8i.12xlarge", + "c8i.16xlarge", + "c8i.24xlarge", + "c8i.32xlarge", + "c8i.48xlarge", + "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -213,13 +243,24 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", + "r8a.xlarge", + "r8a.2xlarge", + "r8a.4xlarge", + "r8a.8xlarge", + "r8a.12xlarge", + "r8a.16xlarge", + "r8a.24xlarge", + "r8a.48xlarge", + "r8i.xlarge", + "r8i.2xlarge", + "r8i.4xlarge", + "r8i.8xlarge", + "r8i.12xlarge", + "r8i.16xlarge", + "r8i.24xlarge", + "r8i.32xlarge", + "r8i.48xlarge", + "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -249,14 +290,6 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -278,26 +311,17 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", - "c1.medium", - "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.6.0.json b/moto/emr/resources/instance-types-emr-6.6.0.json index 38320dfed7da..e7399ac479dd 100644 --- a/moto/emr/resources/instance-types-emr-6.6.0.json +++ b/moto/emr/resources/instance-types-emr-6.6.0.json @@ -89,14 +89,30 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", + "m8a.xlarge", + "m8a.2xlarge", + "m8a.4xlarge", + "m8a.8xlarge", + "m8a.12xlarge", + "m8a.16xlarge", + "m8a.24xlarge", + "m8a.48xlarge", + "m8i.xlarge", + "m8i.2xlarge", + "m8i.4xlarge", + "m8i.8xlarge", + "m8i.12xlarge", + "m8i.16xlarge", + "m8i.24xlarge", + "m8i.32xlarge", + "m8i.48xlarge", + "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -179,16 +195,30 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", + "c8gn.xlarge", + "c8gn.2xlarge", + "c8gn.4xlarge", + "c8gn.8xlarge", + "c8gn.12xlarge", + "c8gn.16xlarge", + "c8gn.24xlarge", + "c8gn.48xlarge", + "c8i.xlarge", + "c8i.2xlarge", + "c8i.4xlarge", + "c8i.8xlarge", + "c8i.12xlarge", + "c8i.16xlarge", + "c8i.24xlarge", + "c8i.32xlarge", + "c8i.48xlarge", + "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -284,13 +314,24 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", + "r8a.xlarge", + "r8a.2xlarge", + "r8a.4xlarge", + "r8a.8xlarge", + "r8a.12xlarge", + "r8a.16xlarge", + "r8a.24xlarge", + "r8a.48xlarge", + "r8i.xlarge", + "r8i.2xlarge", + "r8i.4xlarge", + "r8i.8xlarge", + "r8i.12xlarge", + "r8i.16xlarge", + "r8i.24xlarge", + "r8i.32xlarge", + "r8i.48xlarge", + "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -320,14 +361,6 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -362,32 +395,17 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", - "d3en.xlarge", - "d3en.2xlarge", - "d3en.4xlarge", - "d3en.6xlarge", - "d3en.8xlarge", - "d3en.12xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", - "c1.medium", - "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.7.0.json b/moto/emr/resources/instance-types-emr-6.7.0.json index bb9a54551e0d..763d304337be 100644 --- a/moto/emr/resources/instance-types-emr-6.7.0.json +++ b/moto/emr/resources/instance-types-emr-6.7.0.json @@ -89,30 +89,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -201,30 +185,16 @@ "c7g.8xlarge", "c7g.12xlarge", "c7g.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -320,24 +290,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -367,6 +326,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -401,17 +368,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.9.0.json b/moto/emr/resources/instance-types-emr-6.9.0.json index 9ac6a74070a6..e0b7c0d82e51 100644 --- a/moto/emr/resources/instance-types-emr-6.9.0.json +++ b/moto/emr/resources/instance-types-emr-6.9.0.json @@ -106,30 +106,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -235,30 +219,16 @@ "c7g.8xlarge", "c7g.12xlarge", "c7g.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -380,24 +350,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -439,6 +398,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -479,17 +446,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.0.0.json b/moto/emr/resources/instance-types-emr-7.0.0.json index 09ef25afbffb..852f25659e87 100644 --- a/moto/emr/resources/instance-types-emr-7.0.0.json +++ b/moto/emr/resources/instance-types-emr-7.0.0.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -150,22 +142,14 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -299,30 +283,19 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -473,14 +446,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -489,16 +454,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -560,6 +522,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -621,17 +591,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.10.0.json b/moto/emr/resources/instance-types-emr-7.10.0.json index 063ee320360e..1337c9593959 100644 --- a/moto/emr/resources/instance-types-emr-7.10.0.json +++ b/moto/emr/resources/instance-types-emr-7.10.0.json @@ -174,6 +174,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -339,6 +341,13 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -523,6 +532,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8gd.xlarge", "r8gd.2xlarge", "r8gd.4xlarge", @@ -602,6 +618,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -671,17 +695,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.11.0.json b/moto/emr/resources/instance-types-emr-7.11.0.json index 063ee320360e..1337c9593959 100644 --- a/moto/emr/resources/instance-types-emr-7.11.0.json +++ b/moto/emr/resources/instance-types-emr-7.11.0.json @@ -174,6 +174,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -339,6 +341,13 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -523,6 +532,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8gd.xlarge", "r8gd.2xlarge", "r8gd.4xlarge", @@ -602,6 +618,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -671,17 +695,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.12.0.json b/moto/emr/resources/instance-types-emr-7.12.0.json index 063ee320360e..1337c9593959 100644 --- a/moto/emr/resources/instance-types-emr-7.12.0.json +++ b/moto/emr/resources/instance-types-emr-7.12.0.json @@ -174,6 +174,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -339,6 +341,13 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -523,6 +532,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8gd.xlarge", "r8gd.2xlarge", "r8gd.4xlarge", @@ -602,6 +618,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -671,17 +695,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.13.0.json b/moto/emr/resources/instance-types-emr-7.13.0.json new file mode 100644 index 000000000000..1337c9593959 --- /dev/null +++ b/moto/emr/resources/instance-types-emr-7.13.0.json @@ -0,0 +1,733 @@ +[ + "m5.xlarge", + "m5.2xlarge", + "m5.4xlarge", + "m5.8xlarge", + "m5.12xlarge", + "m5.16xlarge", + "m5.24xlarge", + "m5d.xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.8xlarge", + "m5d.12xlarge", + "m5d.16xlarge", + "m5d.24xlarge", + "m5dn.xlarge", + "m5dn.2xlarge", + "m5dn.4xlarge", + "m5dn.8xlarge", + "m5dn.12xlarge", + "m5dn.16xlarge", + "m5dn.24xlarge", + "m5a.xlarge", + "m5a.2xlarge", + "m5a.4xlarge", + "m5a.8xlarge", + "m5a.12xlarge", + "m5a.16xlarge", + "m5a.24xlarge", + "m5ad.xlarge", + "m5ad.2xlarge", + "m5ad.4xlarge", + "m5ad.8xlarge", + "m5ad.12xlarge", + "m5ad.16xlarge", + "m5ad.24xlarge", + "m5n.xlarge", + "m5n.2xlarge", + "m5n.4xlarge", + "m5n.8xlarge", + "m5n.12xlarge", + "m5n.16xlarge", + "m5n.24xlarge", + "m5zn.xlarge", + "m5zn.2xlarge", + "m5zn.3xlarge", + "m5zn.6xlarge", + "m5zn.12xlarge", + "m6a.xlarge", + "m6a.2xlarge", + "m6a.4xlarge", + "m6a.8xlarge", + "m6a.12xlarge", + "m6a.16xlarge", + "m6a.24xlarge", + "m6a.32xlarge", + "m6a.48xlarge", + "m6g.xlarge", + "m6g.2xlarge", + "m6g.4xlarge", + "m6g.8xlarge", + "m6g.12xlarge", + "m6g.16xlarge", + "m6gd.xlarge", + "m6gd.2xlarge", + "m6gd.4xlarge", + "m6gd.8xlarge", + "m6gd.12xlarge", + "m6gd.16xlarge", + "m6i.xlarge", + "m6i.2xlarge", + "m6i.4xlarge", + "m6i.8xlarge", + "m6i.12xlarge", + "m6i.16xlarge", + "m6i.24xlarge", + "m6i.32xlarge", + "m6id.xlarge", + "m6id.2xlarge", + "m6id.4xlarge", + "m6id.8xlarge", + "m6id.12xlarge", + "m6id.16xlarge", + "m6id.24xlarge", + "m6id.32xlarge", + "m6in.xlarge", + "m6in.2xlarge", + "m6in.4xlarge", + "m6in.8xlarge", + "m6in.12xlarge", + "m6in.16xlarge", + "m6in.24xlarge", + "m6in.32xlarge", + "m6idn.xlarge", + "m6idn.2xlarge", + "m6idn.4xlarge", + "m6idn.8xlarge", + "m6idn.12xlarge", + "m6idn.16xlarge", + "m6idn.24xlarge", + "m6idn.32xlarge", + "m7a.xlarge", + "m7a.2xlarge", + "m7a.4xlarge", + "m7a.8xlarge", + "m7a.12xlarge", + "m7a.16xlarge", + "m7a.24xlarge", + "m7a.32xlarge", + "m7a.48xlarge", + "m7g.xlarge", + "m7g.2xlarge", + "m7g.4xlarge", + "m7g.8xlarge", + "m7g.12xlarge", + "m7g.16xlarge", + "m7gd.xlarge", + "m7gd.2xlarge", + "m7gd.4xlarge", + "m7gd.8xlarge", + "m7gd.12xlarge", + "m7gd.16xlarge", + "m7i.xlarge", + "m7i.2xlarge", + "m7i.4xlarge", + "m7i.8xlarge", + "m7i.12xlarge", + "m7i.16xlarge", + "m7i.24xlarge", + "m7i.48xlarge", + "m7i-flex.xlarge", + "m7i-flex.2xlarge", + "m7i-flex.4xlarge", + "m7i-flex.8xlarge", + "m7i-flex.12xlarge", + "m7i-flex.16xlarge", + "m8a.xlarge", + "m8a.2xlarge", + "m8a.4xlarge", + "m8a.8xlarge", + "m8a.12xlarge", + "m8a.16xlarge", + "m8a.24xlarge", + "m8a.48xlarge", + "m8g.xlarge", + "m8g.2xlarge", + "m8g.4xlarge", + "m8g.8xlarge", + "m8g.12xlarge", + "m8g.16xlarge", + "m8g.24xlarge", + "m8g.48xlarge", + "m8gd.xlarge", + "m8gd.2xlarge", + "m8gd.4xlarge", + "m8gd.8xlarge", + "m8gd.12xlarge", + "m8gd.16xlarge", + "m8gd.24xlarge", + "m8gd.48xlarge", + "m8i.xlarge", + "m8i.2xlarge", + "m8i.4xlarge", + "m8i.8xlarge", + "m8i.12xlarge", + "m8i.16xlarge", + "m8i.24xlarge", + "m8i.32xlarge", + "m8i.48xlarge", + "m8i.96xlarge", + "m8i-flex.xlarge", + "m8i-flex.2xlarge", + "m8i-flex.4xlarge", + "m8i-flex.8xlarge", + "m8i-flex.12xlarge", + "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", + "c5.xlarge", + "c5.2xlarge", + "c5.4xlarge", + "c5.9xlarge", + "c5.12xlarge", + "c5.18xlarge", + "c5.24xlarge", + "c5a.xlarge", + "c5a.2xlarge", + "c5a.4xlarge", + "c5a.8xlarge", + "c5a.12xlarge", + "c5a.16xlarge", + "c5a.24xlarge", + "c5ad.xlarge", + "c5ad.2xlarge", + "c5ad.4xlarge", + "c5ad.8xlarge", + "c5ad.12xlarge", + "c5ad.16xlarge", + "c5ad.24xlarge", + "c5d.xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.12xlarge", + "c5d.18xlarge", + "c5d.24xlarge", + "c5n.xlarge", + "c5n.2xlarge", + "c5n.4xlarge", + "c5n.9xlarge", + "c5n.18xlarge", + "c6a.xlarge", + "c6a.2xlarge", + "c6a.4xlarge", + "c6a.8xlarge", + "c6a.12xlarge", + "c6a.16xlarge", + "c6a.24xlarge", + "c6a.32xlarge", + "c6a.48xlarge", + "c6g.xlarge", + "c6g.2xlarge", + "c6g.4xlarge", + "c6g.8xlarge", + "c6g.12xlarge", + "c6g.16xlarge", + "c6gd.xlarge", + "c6gd.2xlarge", + "c6gd.4xlarge", + "c6gd.8xlarge", + "c6gd.12xlarge", + "c6gd.16xlarge", + "c6gn.xlarge", + "c6gn.2xlarge", + "c6gn.4xlarge", + "c6gn.8xlarge", + "c6gn.12xlarge", + "c6gn.16xlarge", + "c6i.xlarge", + "c6i.2xlarge", + "c6i.4xlarge", + "c6i.8xlarge", + "c6i.12xlarge", + "c6i.16xlarge", + "c6i.24xlarge", + "c6i.32xlarge", + "c6id.xlarge", + "c6id.2xlarge", + "c6id.4xlarge", + "c6id.8xlarge", + "c6id.12xlarge", + "c6id.16xlarge", + "c6id.24xlarge", + "c6id.32xlarge", + "c6in.xlarge", + "c6in.2xlarge", + "c6in.4xlarge", + "c6in.8xlarge", + "c6in.12xlarge", + "c6in.16xlarge", + "c6in.24xlarge", + "c6in.32xlarge", + "c7a.xlarge", + "c7a.2xlarge", + "c7a.4xlarge", + "c7a.8xlarge", + "c7a.12xlarge", + "c7a.16xlarge", + "c7a.24xlarge", + "c7a.32xlarge", + "c7a.48xlarge", + "c7i.xlarge", + "c7i.2xlarge", + "c7i.4xlarge", + "c7i.8xlarge", + "c7i.12xlarge", + "c7i.16xlarge", + "c7i.24xlarge", + "c7i.48xlarge", + "c7i-flex.xlarge", + "c7i-flex.2xlarge", + "c7i-flex.4xlarge", + "c7i-flex.8xlarge", + "c7i-flex.12xlarge", + "c7i-flex.16xlarge", + "c7g.xlarge", + "c7g.2xlarge", + "c7g.4xlarge", + "c7g.8xlarge", + "c7g.12xlarge", + "c7g.16xlarge", + "c7gd.xlarge", + "c7gd.2xlarge", + "c7gd.4xlarge", + "c7gd.8xlarge", + "c7gd.12xlarge", + "c7gd.16xlarge", + "c7gn.xlarge", + "c7gn.2xlarge", + "c7gn.4xlarge", + "c7gn.8xlarge", + "c7gn.12xlarge", + "c7gn.16xlarge", + "c8g.xlarge", + "c8g.2xlarge", + "c8g.4xlarge", + "c8g.8xlarge", + "c8g.12xlarge", + "c8g.16xlarge", + "c8g.24xlarge", + "c8g.48xlarge", + "c8gd.xlarge", + "c8gd.2xlarge", + "c8gd.4xlarge", + "c8gd.8xlarge", + "c8gd.12xlarge", + "c8gd.16xlarge", + "c8gd.24xlarge", + "c8gd.48xlarge", + "c8gn.xlarge", + "c8gn.2xlarge", + "c8gn.4xlarge", + "c8gn.8xlarge", + "c8gn.12xlarge", + "c8gn.16xlarge", + "c8gn.24xlarge", + "c8gn.48xlarge", + "c8i.xlarge", + "c8i.2xlarge", + "c8i.4xlarge", + "c8i.8xlarge", + "c8i.12xlarge", + "c8i.16xlarge", + "c8i.24xlarge", + "c8i.32xlarge", + "c8i.48xlarge", + "c8i.96xlarge", + "c8i-flex.xlarge", + "c8i-flex.2xlarge", + "c8i-flex.4xlarge", + "c8i-flex.8xlarge", + "c8i-flex.12xlarge", + "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", + "p2.xlarge", + "p2.8xlarge", + "p2.16xlarge", + "p3.2xlarge", + "p3.8xlarge", + "p3.16xlarge", + "p4d.24xlarge", + "p5.48xlarge", + "g3.4xlarge", + "g3.8xlarge", + "g3.16xlarge", + "g3s.xlarge", + "g4dn.xlarge", + "g4dn.2xlarge", + "g4dn.4xlarge", + "g4dn.8xlarge", + "g4dn.12xlarge", + "g4dn.16xlarge", + "g5.xlarge", + "g5.2xlarge", + "g5.4xlarge", + "g5.8xlarge", + "g5.12xlarge", + "g5.16xlarge", + "g5.24xlarge", + "g5.48xlarge", + "g6.xlarge", + "g6.2xlarge", + "g6.4xlarge", + "g6.8xlarge", + "g6.12xlarge", + "g6.16xlarge", + "g6.24xlarge", + "g6.48xlarge", + "g6e.xlarge", + "g6e.2xlarge", + "g6e.4xlarge", + "g6e.8xlarge", + "g6e.12xlarge", + "g6e.16xlarge", + "g6e.24xlarge", + "g6e.48xlarge", + "gr6.4xlarge", + "gr6.8xlarge", + "r5.xlarge", + "r5.2xlarge", + "r5.4xlarge", + "r5.8xlarge", + "r5.12xlarge", + "r5.16xlarge", + "r5.24xlarge", + "r5d.xlarge", + "r5d.2xlarge", + "r5d.4xlarge", + "r5d.8xlarge", + "r5d.12xlarge", + "r5d.16xlarge", + "r5d.24xlarge", + "r5a.xlarge", + "r5a.2xlarge", + "r5a.4xlarge", + "r5a.8xlarge", + "r5a.12xlarge", + "r5a.16xlarge", + "r5a.24xlarge", + "r5b.xlarge", + "r5b.2xlarge", + "r5b.4xlarge", + "r5b.8xlarge", + "r5b.12xlarge", + "r5b.16xlarge", + "r5b.24xlarge", + "r5ad.xlarge", + "r5ad.2xlarge", + "r5ad.4xlarge", + "r5ad.8xlarge", + "r5ad.12xlarge", + "r5ad.16xlarge", + "r5ad.24xlarge", + "r6a.xlarge", + "r6a.2xlarge", + "r6a.4xlarge", + "r6a.8xlarge", + "r6a.12xlarge", + "r6a.16xlarge", + "r6a.24xlarge", + "r6a.32xlarge", + "r6a.48xlarge", + "r6g.xlarge", + "r6g.2xlarge", + "r6g.4xlarge", + "r6g.8xlarge", + "r6g.12xlarge", + "r6g.16xlarge", + "r6gd.xlarge", + "r6gd.2xlarge", + "r6gd.4xlarge", + "r6gd.8xlarge", + "r6gd.12xlarge", + "r6gd.16xlarge", + "r6i.xlarge", + "r6i.2xlarge", + "r6i.4xlarge", + "r6i.8xlarge", + "r6i.12xlarge", + "r6i.16xlarge", + "r6i.24xlarge", + "r6i.32xlarge", + "r6id.xlarge", + "r6id.2xlarge", + "r6id.4xlarge", + "r6id.8xlarge", + "r6id.12xlarge", + "r6id.16xlarge", + "r6id.24xlarge", + "r6id.32xlarge", + "r6in.xlarge", + "r6in.2xlarge", + "r6in.4xlarge", + "r6in.8xlarge", + "r6in.12xlarge", + "r6in.16xlarge", + "r6in.24xlarge", + "r6in.32xlarge", + "r6idn.xlarge", + "r6idn.2xlarge", + "r6idn.4xlarge", + "r6idn.8xlarge", + "r6idn.12xlarge", + "r6idn.16xlarge", + "r6idn.24xlarge", + "r6idn.32xlarge", + "r7a.xlarge", + "r7a.2xlarge", + "r7a.4xlarge", + "r7a.8xlarge", + "r7a.12xlarge", + "r7a.16xlarge", + "r7a.24xlarge", + "r7a.32xlarge", + "r7a.48xlarge", + "r7g.xlarge", + "r7g.2xlarge", + "r7g.4xlarge", + "r7g.8xlarge", + "r7g.12xlarge", + "r7g.16xlarge", + "r7gd.xlarge", + "r7gd.2xlarge", + "r7gd.4xlarge", + "r7gd.8xlarge", + "r7gd.12xlarge", + "r7gd.16xlarge", + "r7i.xlarge", + "r7i.2xlarge", + "r7i.4xlarge", + "r7i.8xlarge", + "r7i.12xlarge", + "r7i.16xlarge", + "r7i.24xlarge", + "r7i.48xlarge", + "r7iz.xlarge", + "r7iz.2xlarge", + "r7iz.4xlarge", + "r7iz.8xlarge", + "r7iz.12xlarge", + "r7iz.16xlarge", + "r7iz.32xlarge", + "r8a.xlarge", + "r8a.2xlarge", + "r8a.4xlarge", + "r8a.8xlarge", + "r8a.12xlarge", + "r8a.16xlarge", + "r8a.24xlarge", + "r8a.48xlarge", + "r8g.xlarge", + "r8g.2xlarge", + "r8g.4xlarge", + "r8g.8xlarge", + "r8g.12xlarge", + "r8g.16xlarge", + "r8g.24xlarge", + "r8g.48xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", + "r8gd.xlarge", + "r8gd.2xlarge", + "r8gd.4xlarge", + "r8gd.8xlarge", + "r8gd.12xlarge", + "r8gd.16xlarge", + "r8gd.24xlarge", + "r8gd.48xlarge", + "r8i.xlarge", + "r8i.2xlarge", + "r8i.4xlarge", + "r8i.8xlarge", + "r8i.12xlarge", + "r8i.16xlarge", + "r8i.24xlarge", + "r8i.32xlarge", + "r8i.48xlarge", + "r8i.96xlarge", + "r8i-flex.xlarge", + "r8i-flex.2xlarge", + "r8i-flex.4xlarge", + "r8i-flex.8xlarge", + "r8i-flex.12xlarge", + "r8i-flex.16xlarge", + "z1d.xlarge", + "z1d.2xlarge", + "z1d.3xlarge", + "z1d.6xlarge", + "z1d.12xlarge", + "x1.16xlarge", + "x1.32xlarge", + "x1e.xlarge", + "x1e.2xlarge", + "x1e.4xlarge", + "x1e.8xlarge", + "x1e.16xlarge", + "x1e.32xlarge", + "x2gd.xlarge", + "x2gd.2xlarge", + "x2gd.4xlarge", + "x2gd.8xlarge", + "x2gd.12xlarge", + "x2gd.16xlarge", + "x2idn.16xlarge", + "x2idn.24xlarge", + "x2idn.32xlarge", + "x2iedn.xlarge", + "x2iedn.2xlarge", + "x2iedn.4xlarge", + "x2iedn.8xlarge", + "x2iedn.16xlarge", + "x2iedn.24xlarge", + "x2iedn.32xlarge", + "x8g.xlarge", + "x8g.2xlarge", + "x8g.4xlarge", + "x8g.8xlarge", + "x8g.12xlarge", + "x8g.16xlarge", + "x8g.24xlarge", + "x8g.48xlarge", + "r3.2xlarge", + "r3.4xlarge", + "r3.8xlarge", + "r3.xlarge", + "r5dn.12xlarge", + "r5dn.16xlarge", + "r5dn.24xlarge", + "r5dn.2xlarge", + "r5dn.4xlarge", + "r5dn.8xlarge", + "r5dn.xlarge", + "r5n.12xlarge", + "r5n.16xlarge", + "r5n.24xlarge", + "r5n.2xlarge", + "r5n.4xlarge", + "r5n.8xlarge", + "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", + "i3.xlarge", + "i3.2xlarge", + "i3.4xlarge", + "i3.8xlarge", + "i3.16xlarge", + "i3en.xlarge", + "i3en.2xlarge", + "i3en.3xlarge", + "i3en.6xlarge", + "i3en.12xlarge", + "i3en.24xlarge", + "i4g.xlarge", + "i4g.2xlarge", + "i4g.4xlarge", + "i4g.8xlarge", + "i4g.16xlarge", + "i4i.xlarge", + "i4i.2xlarge", + "i4i.4xlarge", + "i4i.8xlarge", + "i4i.12xlarge", + "i4i.16xlarge", + "i4i.24xlarge", + "i4i.32xlarge", + "i7i.xlarge", + "i7i.2xlarge", + "i7i.4xlarge", + "i7i.8xlarge", + "i7i.12xlarge", + "i7i.16xlarge", + "i7i.24xlarge", + "i7i.48xlarge", + "i7ie.xlarge", + "i7ie.2xlarge", + "i7ie.3xlarge", + "i7ie.6xlarge", + "i7ie.12xlarge", + "i7ie.18xlarge", + "i7ie.24xlarge", + "i7ie.48xlarge", + "i8g.xlarge", + "i8g.2xlarge", + "i8g.4xlarge", + "i8g.8xlarge", + "i8g.12xlarge", + "i8g.16xlarge", + "i8g.24xlarge", + "i8g.48xlarge", + "im4gn.xlarge", + "im4gn.2xlarge", + "im4gn.4xlarge", + "im4gn.8xlarge", + "im4gn.16xlarge", + "is4gen.xlarge", + "is4gen.2xlarge", + "is4gen.4xlarge", + "is4gen.8xlarge", + "h1.2xlarge", + "h1.4xlarge", + "h1.8xlarge", + "h1.16xlarge", + "d2.xlarge", + "d2.2xlarge", + "d2.4xlarge", + "d2.8xlarge", + "d3.xlarge", + "d3.2xlarge", + "d3.4xlarge", + "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", + "m4.large", + "m4.xlarge", + "m4.2xlarge", + "m4.4xlarge", + "m4.10xlarge", + "m4.16xlarge", + "c1.medium", + "c1.xlarge", + "c4.large", + "c4.xlarge", + "c4.2xlarge", + "c4.4xlarge", + "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", + "r4.xlarge", + "r4.2xlarge", + "r4.4xlarge", + "r4.8xlarge", + "r4.16xlarge", + "i2.xlarge", + "i2.2xlarge", + "i2.4xlarge", + "i2.8xlarge" +] \ No newline at end of file diff --git a/moto/emr/resources/instance-types-emr-7.3.0.json b/moto/emr/resources/instance-types-emr-7.3.0.json index 321bfde052bc..6afdf4dadcce 100644 --- a/moto/emr/resources/instance-types-emr-7.3.0.json +++ b/moto/emr/resources/instance-types-emr-7.3.0.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -158,22 +150,14 @@ "m8gd.16xlarge", "m8gd.24xlarge", "m8gd.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -315,30 +299,19 @@ "c8gd.16xlarge", "c8gd.24xlarge", "c8gd.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -499,14 +472,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -515,6 +480,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8gd.xlarge", "r8gd.2xlarge", "r8gd.4xlarge", @@ -523,16 +495,6 @@ "r8gd.16xlarge", "r8gd.24xlarge", "r8gd.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -594,6 +556,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -663,17 +633,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.7.0.json b/moto/emr/resources/instance-types-emr-7.7.0.json index 5aa7bb7770c2..063ee320360e 100644 --- a/moto/emr/resources/instance-types-emr-7.7.0.json +++ b/moto/emr/resources/instance-types-emr-7.7.0.json @@ -134,6 +134,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", + "m8a.xlarge", + "m8a.2xlarge", + "m8a.4xlarge", + "m8a.8xlarge", + "m8a.12xlarge", + "m8a.16xlarge", + "m8a.24xlarge", + "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -150,14 +158,22 @@ "m8gd.16xlarge", "m8gd.24xlarge", "m8gd.48xlarge", + "m8i.xlarge", + "m8i.2xlarge", + "m8i.4xlarge", + "m8i.8xlarge", + "m8i.12xlarge", + "m8i.16xlarge", + "m8i.24xlarge", + "m8i.32xlarge", + "m8i.48xlarge", + "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -299,19 +315,30 @@ "c8gd.16xlarge", "c8gd.24xlarge", "c8gd.48xlarge", + "c8gn.xlarge", + "c8gn.2xlarge", + "c8gn.4xlarge", + "c8gn.8xlarge", + "c8gn.12xlarge", + "c8gn.16xlarge", + "c8gn.24xlarge", + "c8gn.48xlarge", + "c8i.xlarge", + "c8i.2xlarge", + "c8i.4xlarge", + "c8i.8xlarge", + "c8i.12xlarge", + "c8i.16xlarge", + "c8i.24xlarge", + "c8i.32xlarge", + "c8i.48xlarge", + "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", - "f2.6xlarge", - "f2.12xlarge", - "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -480,6 +507,14 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", + "r8a.xlarge", + "r8a.2xlarge", + "r8a.4xlarge", + "r8a.8xlarge", + "r8a.12xlarge", + "r8a.16xlarge", + "r8a.24xlarge", + "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -488,13 +523,6 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", "r8gd.xlarge", "r8gd.2xlarge", "r8gd.4xlarge", @@ -503,6 +531,16 @@ "r8gd.16xlarge", "r8gd.24xlarge", "r8gd.48xlarge", + "r8i.xlarge", + "r8i.2xlarge", + "r8i.4xlarge", + "r8i.8xlarge", + "r8i.12xlarge", + "r8i.16xlarge", + "r8i.24xlarge", + "r8i.32xlarge", + "r8i.48xlarge", + "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -564,14 +602,6 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -641,32 +671,17 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", - "d3en.xlarge", - "d3en.2xlarge", - "d3en.4xlarge", - "d3en.6xlarge", - "d3en.8xlarge", - "d3en.12xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", - "c1.medium", - "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/release-labels-eu-west-3.json b/moto/emr/resources/release-labels-eu-west-3.json index 3dddc7995533..9cbe1ef89996 100644 --- a/moto/emr/resources/release-labels-eu-west-3.json +++ b/moto/emr/resources/release-labels-eu-west-3.json @@ -1,4 +1,5 @@ [ + "emr-7.13.0", "emr-7.12.0", "emr-7.11.0", "emr-7.10.0", diff --git a/moto/emr/resources/release-labels-us-west-1.json b/moto/emr/resources/release-labels-us-west-1.json index 040413ec0248..99de44c5767f 100644 --- a/moto/emr/resources/release-labels-us-west-1.json +++ b/moto/emr/resources/release-labels-us-west-1.json @@ -1,4 +1,5 @@ [ + "emr-7.13.0", "emr-7.12.0", "emr-7.11.0", "emr-7.10.0",