From 947d6331375ffc1e2d7d1452e46babcfad60ed97 Mon Sep 17 00:00:00 2001 From: viren-nadkarni <5170829+viren-nadkarni@users.noreply.github.com> Date: Sun, 16 Aug 2026 04:27:28 +0000 Subject: [PATCH] chore: update EMR Instance Types --- .../resources/instance-types-emr-4.5.0.json | 90 +----- .../resources/instance-types-emr-4.9.2.json | 84 ++++-- .../resources/instance-types-emr-5.13.1.json | 84 ++++-- .../resources/instance-types-emr-5.2.3.json | 84 ++++-- .../resources/instance-types-emr-5.3.2.json | 84 ++++-- .../resources/instance-types-emr-5.30.0.json | 84 ++---- .../resources/instance-types-emr-5.31.1.json | 84 ++++-- .../resources/instance-types-emr-5.32.0.json | 84 ++++-- .../resources/instance-types-emr-5.32.1.json | 84 ++---- .../resources/instance-types-emr-5.33.0.json | 90 +++--- .../resources/instance-types-emr-5.33.1.json | 90 +++--- .../resources/instance-types-emr-5.34.0.json | 90 +++--- .../resources/instance-types-emr-5.36.1.json | 93 ++++--- .../resources/instance-types-emr-5.36.2.json | 39 --- .../resources/instance-types-emr-5.4.1.json | 84 ++---- .../resources/instance-types-emr-5.8.1.json | 84 ++++-- .../instance-types-emr-6.0.0-beta.json | 258 +----------------- .../resources/instance-types-emr-6.0.0.json | 84 ++++-- .../resources/instance-types-emr-6.1.1.json | 84 ++++-- .../resources/instance-types-emr-6.12.0.json | 93 ++++--- .../resources/instance-types-emr-6.14.0.json | 93 ++++--- .../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.6.0.json | 93 +++---- .../resources/instance-types-emr-7.7.0.json | 93 ++++--- 26 files changed, 1139 insertions(+), 1261 deletions(-) diff --git a/moto/emr/resources/instance-types-emr-4.5.0.json b/moto/emr/resources/instance-types-emr-4.5.0.json index fd512be485e7..0637a088a01e 100644 --- a/moto/emr/resources/instance-types-emr-4.5.0.json +++ b/moto/emr/resources/instance-types-emr-4.5.0.json @@ -1,89 +1 @@ -[ - "m7i-flex.xlarge", - "m7i-flex.2xlarge", - "m7i-flex.4xlarge", - "m7i-flex.8xlarge", - "m7i-flex.12xlarge", - "m7i-flex.16xlarge", - "m8i-flex.xlarge", - "m8i-flex.2xlarge", - "m8i-flex.4xlarge", - "m8i-flex.8xlarge", - "m8i-flex.12xlarge", - "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", - "c7i-flex.xlarge", - "c7i-flex.2xlarge", - "c7i-flex.4xlarge", - "c7i-flex.8xlarge", - "c7i-flex.12xlarge", - "c7i-flex.16xlarge", - "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", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", - "r8i-flex.xlarge", - "r8i-flex.2xlarge", - "r8i-flex.4xlarge", - "r8i-flex.8xlarge", - "r8i-flex.12xlarge", - "r8i-flex.16xlarge", - "r3.2xlarge", - "r3.4xlarge", - "r3.8xlarge", - "r3.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", - "d2.xlarge", - "d2.2xlarge", - "d2.4xlarge", - "d2.8xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", - "m4.large", - "m4.xlarge", - "m4.2xlarge", - "m4.4xlarge", - "m4.10xlarge", - "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 +[] \ No newline at end of file diff --git a/moto/emr/resources/instance-types-emr-4.9.2.json b/moto/emr/resources/instance-types-emr-4.9.2.json index 0d2e37e36e71..910d8fd01829 100644 --- a/moto/emr/resources/instance-types-emr-4.9.2.json +++ b/moto/emr/resources/instance-types-emr-4.9.2.json @@ -5,37 +5,78 @@ "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", "c7i-flex.xlarge", "c7i-flex.2xlarge", "c7i-flex.4xlarge", "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", - "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", @@ -46,38 +87,21 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "d2.xlarge", "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.13.1.json b/moto/emr/resources/instance-types-emr-5.13.1.json index 3deace1b4d4f..e436c56d3658 100644 --- a/moto/emr/resources/instance-types-emr-5.13.1.json +++ b/moto/emr/resources/instance-types-emr-5.13.1.json @@ -36,14 +36,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", @@ -81,16 +97,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", @@ -135,13 +165,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", @@ -152,14 +193,6 @@ "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", @@ -171,26 +204,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-5.2.3.json b/moto/emr/resources/instance-types-emr-5.2.3.json index b2c1e0e8df93..d7c349509bd6 100644 --- a/moto/emr/resources/instance-types-emr-5.2.3.json +++ b/moto/emr/resources/instance-types-emr-5.2.3.json @@ -22,14 +22,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", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -53,16 +69,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", "r7a.xlarge", "r7a.2xlarge", "r7a.4xlarge", @@ -87,13 +117,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", @@ -104,40 +145,23 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i4i.12xlarge", "i4i.24xlarge", "d2.xlarge", "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.3.2.json b/moto/emr/resources/instance-types-emr-5.3.2.json index b2c1e0e8df93..d7c349509bd6 100644 --- a/moto/emr/resources/instance-types-emr-5.3.2.json +++ b/moto/emr/resources/instance-types-emr-5.3.2.json @@ -22,14 +22,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", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -53,16 +69,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", "r7a.xlarge", "r7a.2xlarge", "r7a.4xlarge", @@ -87,13 +117,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", @@ -104,40 +145,23 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i4i.12xlarge", "i4i.24xlarge", "d2.xlarge", "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.0.json b/moto/emr/resources/instance-types-emr-5.30.0.json index d06d98887efa..b842ca72a7b1 100644 --- a/moto/emr/resources/instance-types-emr-5.30.0.json +++ b/moto/emr/resources/instance-types-emr-5.30.0.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.31.1.json b/moto/emr/resources/instance-types-emr-5.31.1.json index 5c4928e0527e..8572ee7bd83e 100644 --- a/moto/emr/resources/instance-types-emr-5.31.1.json +++ b/moto/emr/resources/instance-types-emr-5.31.1.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-5.32.0.json b/moto/emr/resources/instance-types-emr-5.32.0.json index 5c4928e0527e..8572ee7bd83e 100644 --- a/moto/emr/resources/instance-types-emr-5.32.0.json +++ b/moto/emr/resources/instance-types-emr-5.32.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-5.32.1.json b/moto/emr/resources/instance-types-emr-5.32.1.json index 8572ee7bd83e..5c4928e0527e 100644 --- a/moto/emr/resources/instance-types-emr-5.32.1.json +++ b/moto/emr/resources/instance-types-emr-5.32.1.json @@ -68,30 +68,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", @@ -147,30 +131,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", @@ -243,24 +213,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", @@ -290,6 +249,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", @@ -311,17 +278,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.0.json b/moto/emr/resources/instance-types-emr-5.33.0.json index 755eb1ecf217..c2b4b9c3b3dd 100644 --- a/moto/emr/resources/instance-types-emr-5.33.0.json +++ b/moto/emr/resources/instance-types-emr-5.33.0.json @@ -81,14 +81,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", @@ -163,16 +179,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", @@ -260,13 +290,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", @@ -296,14 +337,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", @@ -329,32 +362,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-5.33.1.json b/moto/emr/resources/instance-types-emr-5.33.1.json index 755eb1ecf217..c2b4b9c3b3dd 100644 --- a/moto/emr/resources/instance-types-emr-5.33.1.json +++ b/moto/emr/resources/instance-types-emr-5.33.1.json @@ -81,14 +81,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", @@ -163,16 +179,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", @@ -260,13 +290,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", @@ -296,14 +337,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", @@ -329,32 +362,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-5.34.0.json b/moto/emr/resources/instance-types-emr-5.34.0.json index 755eb1ecf217..c2b4b9c3b3dd 100644 --- a/moto/emr/resources/instance-types-emr-5.34.0.json +++ b/moto/emr/resources/instance-types-emr-5.34.0.json @@ -81,14 +81,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", @@ -163,16 +179,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", @@ -260,13 +290,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", @@ -296,14 +337,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", @@ -329,32 +362,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-5.36.1.json b/moto/emr/resources/instance-types-emr-5.36.1.json index 4d1b3522f0fa..257c85549d0a 100644 --- a/moto/emr/resources/instance-types-emr-5.36.1.json +++ b/moto/emr/resources/instance-types-emr-5.36.1.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-5.36.2.json b/moto/emr/resources/instance-types-emr-5.36.2.json index 08799614710b..a5353b545fe9 100644 --- a/moto/emr/resources/instance-types-emr-5.36.2.json +++ b/moto/emr/resources/instance-types-emr-5.36.2.json @@ -174,8 +174,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -341,13 +339,6 @@ "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", @@ -513,13 +504,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", @@ -599,14 +583,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", @@ -676,32 +652,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-5.4.1.json b/moto/emr/resources/instance-types-emr-5.4.1.json index d7c349509bd6..b2c1e0e8df93 100644 --- a/moto/emr/resources/instance-types-emr-5.4.1.json +++ b/moto/emr/resources/instance-types-emr-5.4.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,23 +104,40 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i4i.12xlarge", "i4i.24xlarge", "d2.xlarge", "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.8.1.json b/moto/emr/resources/instance-types-emr-5.8.1.json index b2c1e0e8df93..d7c349509bd6 100644 --- a/moto/emr/resources/instance-types-emr-5.8.1.json +++ b/moto/emr/resources/instance-types-emr-5.8.1.json @@ -22,14 +22,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", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -53,16 +69,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", "r7a.xlarge", "r7a.2xlarge", "r7a.4xlarge", @@ -87,13 +117,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", @@ -104,40 +145,23 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i4i.12xlarge", "i4i.24xlarge", "d2.xlarge", "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.0.0-beta.json b/moto/emr/resources/instance-types-emr-6.0.0-beta.json index 216f55a474a5..0637a088a01e 100644 --- a/moto/emr/resources/instance-types-emr-6.0.0-beta.json +++ b/moto/emr/resources/instance-types-emr-6.0.0-beta.json @@ -1,257 +1 @@ -[ - "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", - "m5a.xlarge", - "m5a.2xlarge", - "m5a.4xlarge", - "m5a.8xlarge", - "m5a.12xlarge", - "m5a.16xlarge", - "m5a.24xlarge", - "m5ad.xlarge", - "m5ad.2xlarge", - "m5ad.4xlarge", - "m5ad.12xlarge", - "m5ad.24xlarge", - "m7a.xlarge", - "m7a.2xlarge", - "m7a.4xlarge", - "m7a.8xlarge", - "m7a.12xlarge", - "m7a.16xlarge", - "m7a.24xlarge", - "m7a.32xlarge", - "m7a.48xlarge", - "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", - "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", - "c5d.xlarge", - "c5d.2xlarge", - "c5d.4xlarge", - "c5d.9xlarge", - "c5d.12xlarge", - "c5d.18xlarge", - "c5d.24xlarge", - "c5n.xlarge", - "c5n.2xlarge", - "c5n.4xlarge", - "c5n.9xlarge", - "c5n.18xlarge", - "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", - "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", - "p3.2xlarge", - "p3.8xlarge", - "p3.16xlarge", - "g3.4xlarge", - "g3.8xlarge", - "g3.16xlarge", - "g3s.xlarge", - "g4dn.xlarge", - "g4dn.2xlarge", - "g4dn.4xlarge", - "g4dn.8xlarge", - "g4dn.12xlarge", - "g4dn.16xlarge", - "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", - "r5ad.xlarge", - "r5ad.2xlarge", - "r5ad.4xlarge", - "r5ad.12xlarge", - "r5ad.24xlarge", - "r7a.xlarge", - "r7a.2xlarge", - "r7a.4xlarge", - "r7a.8xlarge", - "r7a.12xlarge", - "r7a.16xlarge", - "r7a.24xlarge", - "r7a.32xlarge", - "r7a.48xlarge", - "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", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", - "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", - "r3.2xlarge", - "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", - "i3.8xlarge", - "i3.16xlarge", - "i3en.xlarge", - "i3en.2xlarge", - "i3en.3xlarge", - "i3en.6xlarge", - "i3en.12xlarge", - "i3en.24xlarge", - "i4i.12xlarge", - "i4i.24xlarge", - "h1.2xlarge", - "h1.4xlarge", - "h1.8xlarge", - "h1.16xlarge", - "d2.xlarge", - "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", - "r4.8xlarge", - "r4.16xlarge", - "i2.xlarge", - "i2.2xlarge", - "i2.4xlarge", - "i2.8xlarge" -] \ No newline at end of file +[] \ No newline at end of file diff --git a/moto/emr/resources/instance-types-emr-6.0.0.json b/moto/emr/resources/instance-types-emr-6.0.0.json index 216f55a474a5..cb1ac4a50484 100644 --- a/moto/emr/resources/instance-types-emr-6.0.0.json +++ b/moto/emr/resources/instance-types-emr-6.0.0.json @@ -48,14 +48,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", @@ -98,16 +114,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", @@ -174,13 +204,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", @@ -196,14 +237,6 @@ "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", @@ -225,26 +258,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.1.1.json b/moto/emr/resources/instance-types-emr-6.1.1.json index 5c4928e0527e..8572ee7bd83e 100644 --- a/moto/emr/resources/instance-types-emr-6.1.1.json +++ b/moto/emr/resources/instance-types-emr-6.1.1.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.12.0.json b/moto/emr/resources/instance-types-emr-6.12.0.json index 4d1b3522f0fa..257c85549d0a 100644 --- a/moto/emr/resources/instance-types-emr-6.12.0.json +++ b/moto/emr/resources/instance-types-emr-6.12.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.14.0.json b/moto/emr/resources/instance-types-emr-6.14.0.json index 852f25659e87..09ef25afbffb 100644 --- a/moto/emr/resources/instance-types-emr-6.14.0.json +++ b/moto/emr/resources/instance-types-emr-6.14.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", @@ -446,6 +473,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", @@ -454,13 +489,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", @@ -522,14 +560,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", @@ -591,32 +621,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.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 e0b7c0d82e51..9ac6a74070a6 100644 --- a/moto/emr/resources/instance-types-emr-6.9.0.json +++ b/moto/emr/resources/instance-types-emr-6.9.0.json @@ -106,14 +106,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", @@ -219,16 +235,30 @@ "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", @@ -350,13 +380,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", @@ -398,14 +439,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", @@ -446,32 +479,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-7.6.0.json b/moto/emr/resources/instance-types-emr-7.6.0.json index 063ee320360e..5aa7bb7770c2 100644 --- a/moto/emr/resources/instance-types-emr-7.6.0.json +++ b/moto/emr/resources/instance-types-emr-7.6.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", @@ -507,14 +480,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", @@ -523,6 +488,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", @@ -531,16 +503,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", @@ -602,6 +564,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 +641,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",