From 3ba3a94d5dada27f3119a3c9f07b5cd30c1b7367 Mon Sep 17 00:00:00 2001 From: viren-nadkarni <5170829+viren-nadkarni@users.noreply.github.com> Date: Sun, 8 Nov 2026 04:20:31 +0000 Subject: [PATCH] chore: update EMR Instance Types --- .../resources/instance-types-emr-4.6.0.json | 30 -- .../resources/instance-types-emr-4.9.4.json | 30 ++ .../resources/instance-types-emr-5.11.3.json | 30 -- .../resources/instance-types-emr-5.11.4.json | 30 -- .../resources/instance-types-emr-5.12.0.json | 30 -- .../resources/instance-types-emr-5.14.2.json | 30 ++ .../resources/instance-types-emr-5.18.1.json | 30 ++ .../resources/instance-types-emr-5.28.0.json | 30 ++ .../resources/instance-types-emr-5.30.2.json | 30 ++ .../resources/instance-types-emr-5.31.0.json | 30 -- .../resources/instance-types-emr-5.36.1.json | 39 --- .../resources/instance-types-emr-5.7.0.json | 30 ++ .../resources/instance-types-emr-5.8.0.json | 30 -- .../resources/instance-types-emr-5.9.0.json | 30 -- .../instance-types-emr-6.0.0-beta.json | 258 +----------------- .../resources/instance-types-emr-6.1.0.json | 30 -- .../resources/instance-types-emr-6.10.0.json | 39 --- .../resources/instance-types-emr-6.10.1.json | 39 --- .../resources/instance-types-emr-6.11.0.json | 39 --- .../resources/instance-types-emr-6.12.0.json | 39 --- .../resources/instance-types-emr-6.14.0.json | 39 --- .../resources/instance-types-emr-6.8.0.json | 36 --- .../resources/instance-types-emr-7.11.0.json | 39 +++ .../resources/instance-types-emr-7.13.0.json | 8 + .../resources/instance-types-emr-7.14.0.json | 8 + .../resources/instance-types-emr-7.3.0.json | 39 +++ .../resources/instance-types-emr-7.4.0.json | 39 --- .../resources/instance-types-emr-7.8.0.json | 39 --- .../instance-types-emr-spark-8.0.0.json | 8 + .../instance-types-emr-spark-8.1.0.json | 47 +--- moto/emr/resources/instance_types.json | 104 +++++++ 31 files changed, 395 insertions(+), 884 deletions(-) diff --git a/moto/emr/resources/instance-types-emr-4.6.0.json b/moto/emr/resources/instance-types-emr-4.6.0.json index fd512be485e7..cc74b757d451 100644 --- a/moto/emr/resources/instance-types-emr-4.6.0.json +++ b/moto/emr/resources/instance-types-emr-4.6.0.json @@ -11,8 +11,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c7i-flex.xlarge", "c7i-flex.2xlarge", "c7i-flex.4xlarge", @@ -25,17 +23,6 @@ "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", @@ -46,37 +33,20 @@ "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", diff --git a/moto/emr/resources/instance-types-emr-4.9.4.json b/moto/emr/resources/instance-types-emr-4.9.4.json index 50cdb87883bc..0d2e37e36e71 100644 --- a/moto/emr/resources/instance-types-emr-4.9.4.json +++ b/moto/emr/resources/instance-types-emr-4.9.4.json @@ -11,6 +11,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c7i-flex.xlarge", "c7i-flex.2xlarge", "c7i-flex.4xlarge", @@ -23,6 +25,17 @@ "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", @@ -33,21 +46,38 @@ "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.11.3.json b/moto/emr/resources/instance-types-emr-5.11.3.json index e9fe4b1fb434..00ad07951fd8 100644 --- a/moto/emr/resources/instance-types-emr-5.11.3.json +++ b/moto/emr/resources/instance-types-emr-5.11.3.json @@ -28,8 +28,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -59,10 +57,6 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -93,13 +87,6 @@ "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", @@ -110,14 +97,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", @@ -129,26 +108,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.11.4.json b/moto/emr/resources/instance-types-emr-5.11.4.json index e9fe4b1fb434..00ad07951fd8 100644 --- a/moto/emr/resources/instance-types-emr-5.11.4.json +++ b/moto/emr/resources/instance-types-emr-5.11.4.json @@ -28,8 +28,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -59,10 +57,6 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -93,13 +87,6 @@ "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", @@ -110,14 +97,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", @@ -129,26 +108,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.12.0.json b/moto/emr/resources/instance-types-emr-5.12.0.json index e9fe4b1fb434..00ad07951fd8 100644 --- a/moto/emr/resources/instance-types-emr-5.12.0.json +++ b/moto/emr/resources/instance-types-emr-5.12.0.json @@ -28,8 +28,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -59,10 +57,6 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -93,13 +87,6 @@ "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", @@ -110,14 +97,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", @@ -129,26 +108,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.14.2.json b/moto/emr/resources/instance-types-emr-5.14.2.json index 4b370b9c4712..3deace1b4d4f 100644 --- a/moto/emr/resources/instance-types-emr-5.14.2.json +++ b/moto/emr/resources/instance-types-emr-5.14.2.json @@ -42,6 +42,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -85,6 +87,10 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -129,6 +135,13 @@ "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", @@ -139,6 +152,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", @@ -150,17 +171,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.18.1.json b/moto/emr/resources/instance-types-emr-5.18.1.json index b2bcba067c1d..d7e31ad81fab 100644 --- a/moto/emr/resources/instance-types-emr-5.18.1.json +++ b/moto/emr/resources/instance-types-emr-5.18.1.json @@ -42,6 +42,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -85,6 +87,10 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -132,6 +138,13 @@ "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", @@ -147,6 +160,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", @@ -162,17 +183,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.28.0.json b/moto/emr/resources/instance-types-emr-5.28.0.json index 2706e4e5f1c5..637a50091bba 100644 --- a/moto/emr/resources/instance-types-emr-5.28.0.json +++ b/moto/emr/resources/instance-types-emr-5.28.0.json @@ -54,6 +54,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -102,6 +104,10 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -162,6 +168,13 @@ "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", @@ -177,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", @@ -198,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 ae14a9c26fee..b842ca72a7b1 100644 --- a/moto/emr/resources/instance-types-emr-5.30.2.json +++ b/moto/emr/resources/instance-types-emr-5.30.2.json @@ -60,6 +60,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -108,6 +110,10 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -174,6 +180,13 @@ "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", @@ -189,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", @@ -210,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.0.json b/moto/emr/resources/instance-types-emr-5.31.0.json index 5c4928e0527e..bc2a06966e04 100644 --- a/moto/emr/resources/instance-types-emr-5.31.0.json +++ b/moto/emr/resources/instance-types-emr-5.31.0.json @@ -74,8 +74,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -137,10 +135,6 @@ "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 +207,6 @@ "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", @@ -249,14 +236,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 +257,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.36.1.json b/moto/emr/resources/instance-types-emr-5.36.1.json index 4d1b3522f0fa..60b49e2ca6af 100644 --- a/moto/emr/resources/instance-types-emr-5.36.1.json +++ b/moto/emr/resources/instance-types-emr-5.36.1.json @@ -148,8 +148,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -289,13 +287,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", @@ -453,13 +444,6 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -521,14 +505,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 +566,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.7.0.json b/moto/emr/resources/instance-types-emr-5.7.0.json index ba6d480e4f8a..b2c1e0e8df93 100644 --- a/moto/emr/resources/instance-types-emr-5.7.0.json +++ b/moto/emr/resources/instance-types-emr-5.7.0.json @@ -28,6 +28,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -57,6 +59,10 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "r7a.xlarge", "r7a.2xlarge", "r7a.4xlarge", @@ -81,6 +87,13 @@ "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", @@ -91,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.0.json b/moto/emr/resources/instance-types-emr-5.8.0.json index b2c1e0e8df93..ba6d480e4f8a 100644 --- a/moto/emr/resources/instance-types-emr-5.8.0.json +++ b/moto/emr/resources/instance-types-emr-5.8.0.json @@ -28,8 +28,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -59,10 +57,6 @@ "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 +81,6 @@ "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", @@ -104,40 +91,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.9.0.json b/moto/emr/resources/instance-types-emr-5.9.0.json index 92bdf13fedb3..43dcd1cefbd8 100644 --- a/moto/emr/resources/instance-types-emr-5.9.0.json +++ b/moto/emr/resources/instance-types-emr-5.9.0.json @@ -28,8 +28,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c7a.xlarge", "c7a.2xlarge", "c7a.4xlarge", @@ -59,10 +57,6 @@ "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 +81,6 @@ "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", @@ -104,14 +91,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", @@ -123,26 +102,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.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.1.0.json b/moto/emr/resources/instance-types-emr-6.1.0.json index 5c4928e0527e..bc2a06966e04 100644 --- a/moto/emr/resources/instance-types-emr-6.1.0.json +++ b/moto/emr/resources/instance-types-emr-6.1.0.json @@ -74,8 +74,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -137,10 +135,6 @@ "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 +207,6 @@ "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", @@ -249,14 +236,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 +257,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.10.0.json b/moto/emr/resources/instance-types-emr-6.10.0.json index 4d1b3522f0fa..60b49e2ca6af 100644 --- a/moto/emr/resources/instance-types-emr-6.10.0.json +++ b/moto/emr/resources/instance-types-emr-6.10.0.json @@ -148,8 +148,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -289,13 +287,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", @@ -453,13 +444,6 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -521,14 +505,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 +566,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.10.1.json b/moto/emr/resources/instance-types-emr-6.10.1.json index 4d1b3522f0fa..60b49e2ca6af 100644 --- a/moto/emr/resources/instance-types-emr-6.10.1.json +++ b/moto/emr/resources/instance-types-emr-6.10.1.json @@ -148,8 +148,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -289,13 +287,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", @@ -453,13 +444,6 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -521,14 +505,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 +566,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.11.0.json b/moto/emr/resources/instance-types-emr-6.11.0.json index 4d1b3522f0fa..60b49e2ca6af 100644 --- a/moto/emr/resources/instance-types-emr-6.11.0.json +++ b/moto/emr/resources/instance-types-emr-6.11.0.json @@ -148,8 +148,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -289,13 +287,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", @@ -453,13 +444,6 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -521,14 +505,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 +566,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.12.0.json b/moto/emr/resources/instance-types-emr-6.12.0.json index 4d1b3522f0fa..60b49e2ca6af 100644 --- a/moto/emr/resources/instance-types-emr-6.12.0.json +++ b/moto/emr/resources/instance-types-emr-6.12.0.json @@ -148,8 +148,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -289,13 +287,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", @@ -453,13 +444,6 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -521,14 +505,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 +566,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..802804e04a4a 100644 --- a/moto/emr/resources/instance-types-emr-6.14.0.json +++ b/moto/emr/resources/instance-types-emr-6.14.0.json @@ -148,8 +148,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -289,13 +287,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", @@ -454,13 +445,6 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -522,14 +506,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 +567,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.8.0.json b/moto/emr/resources/instance-types-emr-6.8.0.json index 450098856d09..6d3cd5f8a506 100644 --- a/moto/emr/resources/instance-types-emr-6.8.0.json +++ b/moto/emr/resources/instance-types-emr-6.8.0.json @@ -112,8 +112,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -225,10 +223,6 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -341,13 +335,6 @@ "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", @@ -377,14 +364,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", @@ -425,32 +404,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.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.13.0.json b/moto/emr/resources/instance-types-emr-7.13.0.json index a0d617669e67..4ebcb8e7b65b 100644 --- a/moto/emr/resources/instance-types-emr-7.13.0.json +++ b/moto/emr/resources/instance-types-emr-7.13.0.json @@ -569,6 +569,14 @@ "r8i-flex.8xlarge", "r8i-flex.12xlarge", "r8i-flex.16xlarge", + "r9g.xlarge", + "r9g.2xlarge", + "r9g.4xlarge", + "r9g.8xlarge", + "r9g.12xlarge", + "r9g.16xlarge", + "r9g.24xlarge", + "r9g.48xlarge", "z1d.xlarge", "z1d.2xlarge", "z1d.3xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.14.0.json b/moto/emr/resources/instance-types-emr-7.14.0.json index a0d617669e67..4ebcb8e7b65b 100644 --- a/moto/emr/resources/instance-types-emr-7.14.0.json +++ b/moto/emr/resources/instance-types-emr-7.14.0.json @@ -569,6 +569,14 @@ "r8i-flex.8xlarge", "r8i-flex.12xlarge", "r8i-flex.16xlarge", + "r9g.xlarge", + "r9g.2xlarge", + "r9g.4xlarge", + "r9g.8xlarge", + "r9g.12xlarge", + "r9g.16xlarge", + "r9g.24xlarge", + "r9g.48xlarge", "z1d.xlarge", "z1d.2xlarge", "z1d.3xlarge", 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 c8dacb50137b..6afdf4dadcce 100644 --- a/moto/emr/resources/instance-types-emr-7.3.0.json +++ b/moto/emr/resources/instance-types-emr-7.3.0.json @@ -156,6 +156,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -303,6 +305,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", @@ -471,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", @@ -540,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", @@ -609,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.4.0.json b/moto/emr/resources/instance-types-emr-7.4.0.json index 6afdf4dadcce..c8dacb50137b 100644 --- a/moto/emr/resources/instance-types-emr-7.4.0.json +++ b/moto/emr/resources/instance-types-emr-7.4.0.json @@ -156,8 +156,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -305,13 +303,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", @@ -480,13 +471,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", @@ -556,14 +540,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", @@ -633,32 +609,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.8.0.json b/moto/emr/resources/instance-types-emr-7.8.0.json index 5aa7bb7770c2..cb0cb4396f74 100644 --- a/moto/emr/resources/instance-types-emr-7.8.0.json +++ b/moto/emr/resources/instance-types-emr-7.8.0.json @@ -156,8 +156,6 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -305,13 +303,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", @@ -488,13 +479,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", @@ -564,14 +548,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 +617,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-spark-8.0.0.json b/moto/emr/resources/instance-types-emr-spark-8.0.0.json index a0d617669e67..4ebcb8e7b65b 100644 --- a/moto/emr/resources/instance-types-emr-spark-8.0.0.json +++ b/moto/emr/resources/instance-types-emr-spark-8.0.0.json @@ -569,6 +569,14 @@ "r8i-flex.8xlarge", "r8i-flex.12xlarge", "r8i-flex.16xlarge", + "r9g.xlarge", + "r9g.2xlarge", + "r9g.4xlarge", + "r9g.8xlarge", + "r9g.12xlarge", + "r9g.16xlarge", + "r9g.24xlarge", + "r9g.48xlarge", "z1d.xlarge", "z1d.2xlarge", "z1d.3xlarge", diff --git a/moto/emr/resources/instance-types-emr-spark-8.1.0.json b/moto/emr/resources/instance-types-emr-spark-8.1.0.json index a0d617669e67..cf268bd9b601 100644 --- a/moto/emr/resources/instance-types-emr-spark-8.1.0.json +++ b/moto/emr/resources/instance-types-emr-spark-8.1.0.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", @@ -538,13 +529,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", @@ -569,6 +553,14 @@ "r8i-flex.8xlarge", "r8i-flex.12xlarge", "r8i-flex.16xlarge", + "r9g.xlarge", + "r9g.2xlarge", + "r9g.4xlarge", + "r9g.8xlarge", + "r9g.12xlarge", + "r9g.16xlarge", + "r9g.24xlarge", + "r9g.48xlarge", "z1d.xlarge", "z1d.2xlarge", "z1d.3xlarge", @@ -624,14 +616,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", @@ -701,32 +685,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.json b/moto/emr/resources/instance_types.json index 527e54cbfe2f..f56e1cd8b8a0 100644 --- a/moto/emr/resources/instance_types.json +++ b/moto/emr/resources/instance_types.json @@ -9099,6 +9099,110 @@ "Type": "r8i.xlarge", "VCPU": 4 }, + "r9g.12xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 366.0, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.12xlarge", + "VCPU": 48 + }, + "r9g.16xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 488.0, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.16xlarge", + "VCPU": 64 + }, + "r9g.24xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 732.0, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.24xlarge", + "VCPU": 96 + }, + "r9g.2xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 61.0, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.2xlarge", + "VCPU": 8 + }, + "r9g.48xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 1464.0, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.48xlarge", + "VCPU": 192 + }, + "r9g.4xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 122.0, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.4xlarge", + "VCPU": 16 + }, + "r9g.8xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 244.0, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.8xlarge", + "VCPU": 32 + }, + "r9g.xlarge": { + "Architecture": "AARCH64", + "EbsOptimizedAvailable": true, + "EbsOptimizedByDefault": true, + "EbsStorageOnly": true, + "InstanceFamilyId": "HI_MEM_CURRENT_GEN", + "Is64BitsOnly": true, + "MemoryGB": 30.5, + "NumberOfDisks": 0, + "StorageGB": 0, + "Type": "r9g.xlarge", + "VCPU": 4 + }, "x1.16xlarge": { "Architecture": "X86_64", "EbsOptimizedAvailable": true,