diff --git a/scripts/update_specs_from_pricing.py b/scripts/update_specs_from_pricing.py index f79706b91d..a348fe44cf 100755 --- a/scripts/update_specs_from_pricing.py +++ b/scripts/update_specs_from_pricing.py @@ -99,7 +99,7 @@ def get_ec2_pricing(): products = json.loads(price_item) product = products.get('product', {}) if product: - if product.get('productFamily') == 'Compute Instance': + if product.get('productFamily') in ['Compute Instance', 'Compute Instance (bare metal)']: if not results.get(region_map[product.get('attributes').get('location')]): results[region_map[product.get('attributes').get('location')]] = set() results[region_map[product.get('attributes').get('location')]].add( diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json index 08f11487db..1855df39cf 100644 --- a/src/cfnlint/data/CloudSpecs/ap-east-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-east-1.json @@ -21522,6 +21522,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -21530,6 +21531,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t3.2xlarge", "t3.large", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json index a6ded897ef..18fd6a881f 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json @@ -43693,6 +43693,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -43700,6 +43701,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -43769,6 +43771,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -43785,6 +43788,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -43814,6 +43818,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json index ee3be3af38..c414e35a71 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json @@ -38795,6 +38795,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -38803,6 +38804,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json index ffd6c2f9c8..2b5285cc81 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json @@ -23992,6 +23992,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -24000,6 +24001,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json index ab5a8de64e..192eddd994 100644 --- a/src/cfnlint/data/CloudSpecs/ap-south-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-south-1.json @@ -38082,6 +38082,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -38090,6 +38091,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json index b3527bd1ea..9c98e35768 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json @@ -39246,6 +39246,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -39268,6 +39269,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -39304,6 +39306,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json index 9362987bf8..04921a688b 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json @@ -43463,6 +43463,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m1.large", "m1.medium", @@ -43531,6 +43532,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -43547,6 +43549,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -43576,6 +43579,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json index f536f041ac..62a9505848 100644 --- a/src/cfnlint/data/CloudSpecs/ca-central-1.json +++ b/src/cfnlint/data/CloudSpecs/ca-central-1.json @@ -32899,6 +32899,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -32907,6 +32908,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json index 53c7bbe365..633c96eb63 100644 --- a/src/cfnlint/data/CloudSpecs/eu-central-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-central-1.json @@ -43704,6 +43704,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -43711,6 +43712,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m3.2xlarge", "m3.large", @@ -43772,6 +43774,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -43788,6 +43791,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", @@ -43816,6 +43820,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/eu-north-1.json b/src/cfnlint/data/CloudSpecs/eu-north-1.json index bc51dcf0ab..282669e943 100644 --- a/src/cfnlint/data/CloudSpecs/eu-north-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-north-1.json @@ -24776,6 +24776,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m5.12xlarge", "m5.16xlarge", @@ -24802,6 +24803,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -24810,6 +24812,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t3.2xlarge", "t3.large", diff --git a/src/cfnlint/data/CloudSpecs/eu-west-1.json b/src/cfnlint/data/CloudSpecs/eu-west-1.json index 2cd9785df7..a45a39db3d 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-1.json @@ -46132,6 +46132,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -46139,6 +46140,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -46208,6 +46210,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -46224,6 +46227,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -46260,6 +46264,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/eu-west-2.json b/src/cfnlint/data/CloudSpecs/eu-west-2.json index 84f98b3038..1a342b580e 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-2.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-2.json @@ -36970,6 +36970,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -36978,6 +36979,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", @@ -37000,6 +37002,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/eu-west-3.json b/src/cfnlint/data/CloudSpecs/eu-west-3.json index ff536e8db8..523d75ed62 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-3.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-3.json @@ -29721,6 +29721,8 @@ "AllowedValues": [ "c4.2xlarge", "c4.4xlarge", + "c4.8xlarge", + "c4.large", "c4.xlarge", "c5.12xlarge", "c5.18xlarge", @@ -29747,8 +29749,10 @@ "i3.8xlarge", "i3.large", "i3.xlarge", + "m4.10xlarge", "m4.16xlarge", "m4.2xlarge", + "m4.4xlarge", "m4.large", "m4.xlarge", "m5.12xlarge", @@ -29782,6 +29786,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -29790,6 +29795,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/CloudSpecs/us-east-1.json b/src/cfnlint/data/CloudSpecs/us-east-1.json index b781cd9839..b509b9944f 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-east-1.json @@ -46172,6 +46172,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -46179,6 +46180,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -46254,6 +46256,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -46276,6 +46279,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -46312,6 +46316,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/us-east-2.json b/src/cfnlint/data/CloudSpecs/us-east-2.json index 50287a2e34..cae78ec8c5 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-2.json +++ b/src/cfnlint/data/CloudSpecs/us-east-2.json @@ -40006,6 +40006,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -40013,6 +40014,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m4.10xlarge", "m4.16xlarge", @@ -40076,6 +40078,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -40098,6 +40101,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json index 28a97aa179..eaa0514dde 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json @@ -22288,6 +22288,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m5.12xlarge", "m5.16xlarge", @@ -22314,6 +22315,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -22322,6 +22324,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t3.2xlarge", "t3.large", diff --git a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json index b742fee2bd..451d32e900 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json @@ -24211,6 +24211,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m1.large", "m1.medium", @@ -24271,6 +24272,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -24279,6 +24281,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/us-west-1.json b/src/cfnlint/data/CloudSpecs/us-west-1.json index 80fbf2ea92..c66afb6495 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-west-1.json @@ -32849,6 +32849,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -32856,6 +32857,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -32910,6 +32912,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -32918,6 +32921,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -32939,6 +32943,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/CloudSpecs/us-west-2.json b/src/cfnlint/data/CloudSpecs/us-west-2.json index 3345681b4e..8350a9d1a2 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-2.json +++ b/src/cfnlint/data/CloudSpecs/us-west-2.json @@ -46097,6 +46097,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -46104,6 +46105,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -46179,6 +46181,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -46201,6 +46204,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -46237,6 +46241,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ], "Ref": { diff --git a/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json index 92ce35c376..d1c2002385 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json @@ -50,6 +50,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -58,6 +59,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t3.2xlarge", "t3.large", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json index e2ca69a563..56d84a1ef2 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json @@ -55,6 +55,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -62,6 +63,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -131,6 +133,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -147,6 +150,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -176,6 +180,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json index ec0891f86f..7c93bae222 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json @@ -97,6 +97,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -105,6 +106,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json index fc8f281bec..8ff1357e02 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json @@ -81,6 +81,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -89,6 +90,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json index 56aabd12b7..3d5882d722 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json @@ -79,6 +79,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -87,6 +88,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json index 1dbeeaf5bb..9c3840b61d 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json @@ -123,6 +123,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -145,6 +146,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -181,6 +183,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json index 2fc50e7a2d..d4cd3a0a68 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json @@ -50,6 +50,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m1.large", "m1.medium", @@ -118,6 +119,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -134,6 +136,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -163,6 +166,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json index 9c05890792..d5fcb315a1 100644 --- a/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json @@ -73,6 +73,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -81,6 +82,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json index e27a21f615..e06cba6c78 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json @@ -53,6 +53,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -60,6 +61,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m3.2xlarge", "m3.large", @@ -121,6 +123,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -137,6 +140,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", @@ -165,6 +169,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json index ced522a71a..b7cf48e62b 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json @@ -27,6 +27,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m5.12xlarge", "m5.16xlarge", @@ -53,6 +54,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -61,6 +63,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t3.2xlarge", "t3.large", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json index c32f7a49b0..66a08ec0c0 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json @@ -70,6 +70,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -77,6 +78,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -146,6 +148,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -162,6 +165,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -198,6 +202,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json index 2469b182f5..8aca78f4b5 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json @@ -77,6 +77,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -85,6 +86,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", @@ -107,6 +109,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json index 48df8e4b31..9df16ad214 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json @@ -5,6 +5,8 @@ "value": [ "c4.2xlarge", "c4.4xlarge", + "c4.8xlarge", + "c4.large", "c4.xlarge", "c5.12xlarge", "c5.18xlarge", @@ -31,8 +33,10 @@ "i3.8xlarge", "i3.large", "i3.xlarge", + "m4.10xlarge", "m4.16xlarge", "m4.2xlarge", + "m4.4xlarge", "m4.large", "m4.xlarge", "m5.12xlarge", @@ -66,6 +70,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -74,6 +79,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json index e9f34a1c1b..47684e02d2 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json @@ -70,6 +70,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -77,6 +78,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -152,6 +154,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -174,6 +177,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -210,6 +214,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json index e4e3b50a9d..7a020379cf 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json @@ -52,6 +52,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -59,6 +60,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m4.10xlarge", "m4.16xlarge", @@ -122,6 +124,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -144,6 +147,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t2.2xlarge", "t2.large", diff --git a/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json index 8ecd642b5d..552ec9e5f4 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json @@ -26,6 +26,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m5.12xlarge", "m5.16xlarge", @@ -52,6 +53,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -60,6 +62,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t3.2xlarge", "t3.large", diff --git a/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json index 7aeab8d002..050d02c366 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json @@ -57,6 +57,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "m1.large", "m1.medium", @@ -117,6 +118,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -125,6 +127,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json index 9b8cee49cf..fcb621cda0 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json @@ -49,6 +49,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -56,6 +57,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -110,6 +112,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5d.12xlarge", "r5d.16xlarge", @@ -118,6 +121,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -139,6 +143,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] }, diff --git a/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json index e9f34a1c1b..47684e02d2 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json @@ -70,6 +70,7 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", + "i3.metal", "i3.xlarge", "i3en.12xlarge", "i3en.24xlarge", @@ -77,6 +78,7 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", + "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -152,6 +154,7 @@ "r5.4xlarge", "r5.8xlarge", "r5.large", + "r5.metal", "r5.xlarge", "r5a.12xlarge", "r5a.16xlarge", @@ -174,6 +177,7 @@ "r5d.4xlarge", "r5d.8xlarge", "r5d.large", + "r5d.metal", "r5d.xlarge", "t1.micro", "t2.2xlarge", @@ -210,6 +214,7 @@ "z1d.3xlarge", "z1d.6xlarge", "z1d.large", + "z1d.metal", "z1d.xlarge" ] },