diff --git a/moto/emr/resources/instance-types-emr-4.4.0.json b/moto/emr/resources/instance-types-emr-4.4.0.json index 0637a088a01e..fd512be485e7 100644 --- a/moto/emr/resources/instance-types-emr-4.4.0.json +++ b/moto/emr/resources/instance-types-emr-4.4.0.json @@ -1 +1,89 @@ -[] \ No newline at end of file +[ + "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 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..d39320c1fc1f 100644 --- a/moto/emr/resources/instance-types-emr-4.6.0.json +++ b/moto/emr/resources/instance-types-emr-4.6.0.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,37 +87,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.3.json b/moto/emr/resources/instance-types-emr-4.9.3.json index 910d8fd01829..0d2e37e36e71 100644 --- a/moto/emr/resources/instance-types-emr-4.9.3.json +++ b/moto/emr/resources/instance-types-emr-4.9.3.json @@ -5,78 +5,37 @@ "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", - "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", + "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", @@ -87,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.1.0.json b/moto/emr/resources/instance-types-emr-5.1.0.json index 8a27ce2baf50..40f59a6d75c2 100644 --- a/moto/emr/resources/instance-types-emr-5.1.0.json +++ b/moto/emr/resources/instance-types-emr-5.1.0.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,22 +104,39 @@ "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", + "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.0.json b/moto/emr/resources/instance-types-emr-5.11.0.json index e9fe4b1fb434..efe5a55393a0 100644 --- a/moto/emr/resources/instance-types-emr-5.11.0.json +++ b/moto/emr/resources/instance-types-emr-5.11.0.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", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -93,13 +123,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", @@ -110,14 +151,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 +162,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.3.json b/moto/emr/resources/instance-types-emr-5.11.3.json index e9fe4b1fb434..efe5a55393a0 100644 --- a/moto/emr/resources/instance-types-emr-5.11.3.json +++ b/moto/emr/resources/instance-types-emr-5.11.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", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -93,13 +123,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", @@ -110,14 +151,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 +162,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 e436c56d3658..3deace1b4d4f 100644 --- a/moto/emr/resources/instance-types-emr-5.14.2.json +++ b/moto/emr/resources/instance-types-emr-5.14.2.json @@ -36,30 +36,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -97,30 +81,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -165,24 +135,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", @@ -193,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", @@ -204,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.17.1.json b/moto/emr/resources/instance-types-emr-5.17.1.json index 73853fac735c..f11b80975e14 100644 --- a/moto/emr/resources/instance-types-emr-5.17.1.json +++ b/moto/emr/resources/instance-types-emr-5.17.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", @@ -157,14 +198,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", @@ -180,26 +213,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.17.2.json b/moto/emr/resources/instance-types-emr-5.17.2.json index f11b80975e14..73853fac735c 100644 --- a/moto/emr/resources/instance-types-emr-5.17.2.json +++ b/moto/emr/resources/instance-types-emr-5.17.2.json @@ -36,30 +36,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -97,30 +81,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -165,24 +135,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", @@ -198,6 +157,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", @@ -213,17 +180,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.19.0.json b/moto/emr/resources/instance-types-emr-5.19.0.json index 21e54720daaa..f11392a1ee31 100644 --- a/moto/emr/resources/instance-types-emr-5.19.0.json +++ b/moto/emr/resources/instance-types-emr-5.19.0.json @@ -36,30 +36,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -97,30 +81,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -169,24 +139,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -202,6 +161,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -217,17 +184,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.20.0.json b/moto/emr/resources/instance-types-emr-5.20.0.json index 123bc1aa92e8..d34ef9388455 100644 --- a/moto/emr/resources/instance-types-emr-5.20.0.json +++ b/moto/emr/resources/instance-types-emr-5.20.0.json @@ -48,30 +48,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -114,30 +98,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -198,24 +168,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -231,6 +190,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -246,17 +213,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.23.0.json b/moto/emr/resources/instance-types-emr-5.23.0.json index 123bc1aa92e8..d34ef9388455 100644 --- a/moto/emr/resources/instance-types-emr-5.23.0.json +++ b/moto/emr/resources/instance-types-emr-5.23.0.json @@ -48,30 +48,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -114,30 +98,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -198,24 +168,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -231,6 +190,14 @@ "r3.4xlarge", "r3.8xlarge", "r3.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -246,17 +213,26 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-5.23.1.json b/moto/emr/resources/instance-types-emr-5.23.1.json index d34ef9388455..123bc1aa92e8 100644 --- a/moto/emr/resources/instance-types-emr-5.23.1.json +++ b/moto/emr/resources/instance-types-emr-5.23.1.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", @@ -168,13 +198,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", @@ -190,14 +231,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", @@ -213,26 +246,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.24.1.json b/moto/emr/resources/instance-types-emr-5.24.1.json index d34ef9388455..123bc1aa92e8 100644 --- a/moto/emr/resources/instance-types-emr-5.24.1.json +++ b/moto/emr/resources/instance-types-emr-5.24.1.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", @@ -168,13 +198,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", @@ -190,14 +231,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", @@ -213,26 +246,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.30.1.json b/moto/emr/resources/instance-types-emr-5.30.1.json index b842ca72a7b1..d06d98887efa 100644 --- a/moto/emr/resources/instance-types-emr-5.30.1.json +++ b/moto/emr/resources/instance-types-emr-5.30.1.json @@ -54,14 +54,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", @@ -104,16 +120,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", @@ -180,13 +210,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", @@ -202,14 +243,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", @@ -231,26 +264,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.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.0.json b/moto/emr/resources/instance-types-emr-5.36.0.json index 38320dfed7da..e7399ac479dd 100644 --- a/moto/emr/resources/instance-types-emr-5.36.0.json +++ b/moto/emr/resources/instance-types-emr-5.36.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-5.5.4.json b/moto/emr/resources/instance-types-emr-5.5.4.json index b2c1e0e8df93..d7c349509bd6 100644 --- a/moto/emr/resources/instance-types-emr-5.5.4.json +++ b/moto/emr/resources/instance-types-emr-5.5.4.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.8.3.json b/moto/emr/resources/instance-types-emr-5.8.3.json index d7c349509bd6..b2c1e0e8df93 100644 --- a/moto/emr/resources/instance-types-emr-5.8.3.json +++ b/moto/emr/resources/instance-types-emr-5.8.3.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-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.11.1.json b/moto/emr/resources/instance-types-emr-6.11.1.json index 257c85549d0a..4d1b3522f0fa 100644 --- a/moto/emr/resources/instance-types-emr-6.11.1.json +++ b/moto/emr/resources/instance-types-emr-6.11.1.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -150,22 +142,14 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -299,30 +283,19 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -472,14 +445,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -488,16 +453,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -559,6 +521,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -620,17 +590,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.13.0.json b/moto/emr/resources/instance-types-emr-6.13.0.json index 4d1b3522f0fa..257c85549d0a 100644 --- a/moto/emr/resources/instance-types-emr-6.13.0.json +++ b/moto/emr/resources/instance-types-emr-6.13.0.json @@ -134,6 +134,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", + "m8a.xlarge", + "m8a.2xlarge", + "m8a.4xlarge", + "m8a.8xlarge", + "m8a.12xlarge", + "m8a.16xlarge", + "m8a.24xlarge", + "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -142,14 +150,22 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", + "m8i.xlarge", + "m8i.2xlarge", + "m8i.4xlarge", + "m8i.8xlarge", + "m8i.12xlarge", + "m8i.16xlarge", + "m8i.24xlarge", + "m8i.32xlarge", + "m8i.48xlarge", + "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -283,19 +299,30 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", + "c8gn.xlarge", + "c8gn.2xlarge", + "c8gn.4xlarge", + "c8gn.8xlarge", + "c8gn.12xlarge", + "c8gn.16xlarge", + "c8gn.24xlarge", + "c8gn.48xlarge", + "c8i.xlarge", + "c8i.2xlarge", + "c8i.4xlarge", + "c8i.8xlarge", + "c8i.12xlarge", + "c8i.16xlarge", + "c8i.24xlarge", + "c8i.32xlarge", + "c8i.48xlarge", + "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", - "f2.6xlarge", - "f2.12xlarge", - "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -445,6 +472,14 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", + "r8a.xlarge", + "r8a.2xlarge", + "r8a.4xlarge", + "r8a.8xlarge", + "r8a.12xlarge", + "r8a.16xlarge", + "r8a.24xlarge", + "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -453,13 +488,16 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", + "r8i.xlarge", + "r8i.2xlarge", + "r8i.4xlarge", + "r8i.8xlarge", + "r8i.12xlarge", + "r8i.16xlarge", + "r8i.24xlarge", + "r8i.32xlarge", + "r8i.48xlarge", + "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -521,14 +559,6 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -590,32 +620,17 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", - "d3en.xlarge", - "d3en.2xlarge", - "d3en.4xlarge", - "d3en.6xlarge", - "d3en.8xlarge", - "d3en.12xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", - "c1.medium", - "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.2.0.json b/moto/emr/resources/instance-types-emr-6.2.0.json index 5c4928e0527e..8572ee7bd83e 100644 --- a/moto/emr/resources/instance-types-emr-6.2.0.json +++ b/moto/emr/resources/instance-types-emr-6.2.0.json @@ -68,14 +68,30 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", + "m8a.xlarge", + "m8a.2xlarge", + "m8a.4xlarge", + "m8a.8xlarge", + "m8a.12xlarge", + "m8a.16xlarge", + "m8a.24xlarge", + "m8a.48xlarge", + "m8i.xlarge", + "m8i.2xlarge", + "m8i.4xlarge", + "m8i.8xlarge", + "m8i.12xlarge", + "m8i.16xlarge", + "m8i.24xlarge", + "m8i.32xlarge", + "m8i.48xlarge", + "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", - "m3.2xlarge", - "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -131,16 +147,30 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", + "c8gn.xlarge", + "c8gn.2xlarge", + "c8gn.4xlarge", + "c8gn.8xlarge", + "c8gn.12xlarge", + "c8gn.16xlarge", + "c8gn.24xlarge", + "c8gn.48xlarge", + "c8i.xlarge", + "c8i.2xlarge", + "c8i.4xlarge", + "c8i.8xlarge", + "c8i.12xlarge", + "c8i.16xlarge", + "c8i.24xlarge", + "c8i.32xlarge", + "c8i.48xlarge", + "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", - "c3.2xlarge", - "c3.4xlarge", - "c3.8xlarge", - "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -213,13 +243,24 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8gb.xlarge", - "r8gb.2xlarge", - "r8gb.4xlarge", - "r8gb.8xlarge", - "r8gb.12xlarge", - "r8gb.16xlarge", - "r8gb.24xlarge", + "r8a.xlarge", + "r8a.2xlarge", + "r8a.4xlarge", + "r8a.8xlarge", + "r8a.12xlarge", + "r8a.16xlarge", + "r8a.24xlarge", + "r8a.48xlarge", + "r8i.xlarge", + "r8i.2xlarge", + "r8i.4xlarge", + "r8i.8xlarge", + "r8i.12xlarge", + "r8i.16xlarge", + "r8i.24xlarge", + "r8i.32xlarge", + "r8i.48xlarge", + "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -249,14 +290,6 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", - "r8gn.12xlarge", - "r8gn.16xlarge", - "r8gn.24xlarge", - "r8gn.2xlarge", - "r8gn.48xlarge", - "r8gn.4xlarge", - "r8gn.8xlarge", - "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -278,26 +311,17 @@ "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", - "c1.medium", - "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.2.1.json b/moto/emr/resources/instance-types-emr-6.2.1.json index 8572ee7bd83e..5c4928e0527e 100644 --- a/moto/emr/resources/instance-types-emr-6.2.1.json +++ b/moto/emr/resources/instance-types-emr-6.2.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-6.4.0.json b/moto/emr/resources/instance-types-emr-6.4.0.json index c2b4b9c3b3dd..755eb1ecf217 100644 --- a/moto/emr/resources/instance-types-emr-6.4.0.json +++ b/moto/emr/resources/instance-types-emr-6.4.0.json @@ -81,30 +81,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -179,30 +163,16 @@ "c7i-flex.8xlarge", "c7i-flex.12xlarge", "c7i-flex.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -290,24 +260,13 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -337,6 +296,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -362,17 +329,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-6.5.0.json b/moto/emr/resources/instance-types-emr-6.5.0.json index 755eb1ecf217..c2b4b9c3b3dd 100644 --- a/moto/emr/resources/instance-types-emr-6.5.0.json +++ b/moto/emr/resources/instance-types-emr-6.5.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-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.8.1.json b/moto/emr/resources/instance-types-emr-6.8.1.json index 1e4eb07d4313..450098856d09 100644 --- a/moto/emr/resources/instance-types-emr-6.8.1.json +++ b/moto/emr/resources/instance-types-emr-6.8.1.json @@ -106,30 +106,14 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -235,30 +219,16 @@ "c7g.8xlarge", "c7g.12xlarge", "c7g.16xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -371,24 +341,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", @@ -418,6 +377,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", @@ -458,17 +425,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.1.json b/moto/emr/resources/instance-types-emr-6.9.1.json index e0b7c0d82e51..9ac6a74070a6 100644 --- a/moto/emr/resources/instance-types-emr-6.9.1.json +++ b/moto/emr/resources/instance-types-emr-6.9.1.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.0.0.json b/moto/emr/resources/instance-types-emr-7.0.0.json index 09ef25afbffb..852f25659e87 100644 --- a/moto/emr/resources/instance-types-emr-7.0.0.json +++ b/moto/emr/resources/instance-types-emr-7.0.0.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -150,22 +142,14 @@ "m8g.16xlarge", "m8g.24xlarge", "m8g.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -299,30 +283,19 @@ "c8g.16xlarge", "c8g.24xlarge", "c8g.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -473,14 +446,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -489,16 +454,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -560,6 +522,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -621,17 +591,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.1.0.json b/moto/emr/resources/instance-types-emr-7.1.0.json index deeea9b6263f..c216cab1e8e7 100644 --- a/moto/emr/resources/instance-types-emr-7.1.0.json +++ b/moto/emr/resources/instance-types-emr-7.1.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", @@ -489,14 +462,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", @@ -505,6 +470,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", @@ -513,16 +485,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", @@ -584,6 +546,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", @@ -653,17 +623,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.10.0.json b/moto/emr/resources/instance-types-emr-7.10.0.json index 063ee320360e..1337c9593959 100644 --- a/moto/emr/resources/instance-types-emr-7.10.0.json +++ b/moto/emr/resources/instance-types-emr-7.10.0.json @@ -174,6 +174,8 @@ "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -339,6 +341,13 @@ "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -523,6 +532,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8gd.xlarge", "r8gd.2xlarge", "r8gd.4xlarge", @@ -602,6 +618,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -671,17 +695,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.11.0.json b/moto/emr/resources/instance-types-emr-7.11.0.json index 1337c9593959..063ee320360e 100644 --- a/moto/emr/resources/instance-types-emr-7.11.0.json +++ b/moto/emr/resources/instance-types-emr-7.11.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", @@ -532,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", @@ -618,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", @@ -695,32 +671,17 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", - "d3en.xlarge", - "d3en.2xlarge", - "d3en.4xlarge", - "d3en.6xlarge", - "d3en.8xlarge", - "d3en.12xlarge", - "m1.small", - "m1.medium", - "m1.large", - "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", - "c1.medium", - "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", - "m2.xlarge", - "m2.2xlarge", - "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.3.0.json b/moto/emr/resources/instance-types-emr-7.3.0.json index 321bfde052bc..6afdf4dadcce 100644 --- a/moto/emr/resources/instance-types-emr-7.3.0.json +++ b/moto/emr/resources/instance-types-emr-7.3.0.json @@ -134,14 +134,6 @@ "m7i-flex.8xlarge", "m7i-flex.12xlarge", "m7i-flex.16xlarge", - "m8a.xlarge", - "m8a.2xlarge", - "m8a.4xlarge", - "m8a.8xlarge", - "m8a.12xlarge", - "m8a.16xlarge", - "m8a.24xlarge", - "m8a.48xlarge", "m8g.xlarge", "m8g.2xlarge", "m8g.4xlarge", @@ -158,22 +150,14 @@ "m8gd.16xlarge", "m8gd.24xlarge", "m8gd.48xlarge", - "m8i.xlarge", - "m8i.2xlarge", - "m8i.4xlarge", - "m8i.8xlarge", - "m8i.12xlarge", - "m8i.16xlarge", - "m8i.24xlarge", - "m8i.32xlarge", - "m8i.48xlarge", - "m8i.96xlarge", "m8i-flex.xlarge", "m8i-flex.2xlarge", "m8i-flex.4xlarge", "m8i-flex.8xlarge", "m8i-flex.12xlarge", "m8i-flex.16xlarge", + "m3.2xlarge", + "m3.xlarge", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", @@ -315,30 +299,19 @@ "c8gd.16xlarge", "c8gd.24xlarge", "c8gd.48xlarge", - "c8gn.xlarge", - "c8gn.2xlarge", - "c8gn.4xlarge", - "c8gn.8xlarge", - "c8gn.12xlarge", - "c8gn.16xlarge", - "c8gn.24xlarge", - "c8gn.48xlarge", - "c8i.xlarge", - "c8i.2xlarge", - "c8i.4xlarge", - "c8i.8xlarge", - "c8i.12xlarge", - "c8i.16xlarge", - "c8i.24xlarge", - "c8i.32xlarge", - "c8i.48xlarge", - "c8i.96xlarge", "c8i-flex.xlarge", "c8i-flex.2xlarge", "c8i-flex.4xlarge", "c8i-flex.8xlarge", "c8i-flex.12xlarge", "c8i-flex.16xlarge", + "c3.2xlarge", + "c3.4xlarge", + "c3.8xlarge", + "c3.xlarge", + "f2.6xlarge", + "f2.12xlarge", + "f2.48xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", @@ -499,14 +472,6 @@ "r7iz.12xlarge", "r7iz.16xlarge", "r7iz.32xlarge", - "r8a.xlarge", - "r8a.2xlarge", - "r8a.4xlarge", - "r8a.8xlarge", - "r8a.12xlarge", - "r8a.16xlarge", - "r8a.24xlarge", - "r8a.48xlarge", "r8g.xlarge", "r8g.2xlarge", "r8g.4xlarge", @@ -515,6 +480,13 @@ "r8g.16xlarge", "r8g.24xlarge", "r8g.48xlarge", + "r8gb.xlarge", + "r8gb.2xlarge", + "r8gb.4xlarge", + "r8gb.8xlarge", + "r8gb.12xlarge", + "r8gb.16xlarge", + "r8gb.24xlarge", "r8gd.xlarge", "r8gd.2xlarge", "r8gd.4xlarge", @@ -523,16 +495,6 @@ "r8gd.16xlarge", "r8gd.24xlarge", "r8gd.48xlarge", - "r8i.xlarge", - "r8i.2xlarge", - "r8i.4xlarge", - "r8i.8xlarge", - "r8i.12xlarge", - "r8i.16xlarge", - "r8i.24xlarge", - "r8i.32xlarge", - "r8i.48xlarge", - "r8i.96xlarge", "r8i-flex.xlarge", "r8i-flex.2xlarge", "r8i-flex.4xlarge", @@ -594,6 +556,14 @@ "r5n.4xlarge", "r5n.8xlarge", "r5n.xlarge", + "r8gn.12xlarge", + "r8gn.16xlarge", + "r8gn.24xlarge", + "r8gn.2xlarge", + "r8gn.48xlarge", + "r8gn.4xlarge", + "r8gn.8xlarge", + "r8gn.xlarge", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", @@ -663,17 +633,32 @@ "d3.2xlarge", "d3.4xlarge", "d3.8xlarge", + "d3en.xlarge", + "d3en.2xlarge", + "d3en.4xlarge", + "d3en.6xlarge", + "d3en.8xlarge", + "d3en.12xlarge", + "m1.small", + "m1.medium", + "m1.large", + "m1.xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", + "c1.medium", + "c1.xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", + "m2.xlarge", + "m2.2xlarge", + "m2.4xlarge", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", diff --git a/moto/emr/resources/instance-types-emr-7.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 063ee320360e..5aa7bb7770c2 100644 --- a/moto/emr/resources/instance-types-emr-7.7.0.json +++ b/moto/emr/resources/instance-types-emr-7.7.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.9.0.json b/moto/emr/resources/instance-types-emr-7.9.0.json index 1337c9593959..063ee320360e 100644 --- a/moto/emr/resources/instance-types-emr-7.9.0.json +++ b/moto/emr/resources/instance-types-emr-7.9.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", @@ -532,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", @@ -618,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", @@ -695,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",