Include bare metal from pricing API (aws-cloudformation#1010)

fatbasstard · Jul 9, 2019 · e637f24 · e637f24
1 parent 6cde171
commit e637f24
Show file tree

Hide file tree

Showing 39 changed files with 139 additions and 1 deletion.
diff --git 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
@@ -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
@@ -43693,13 +43693,15 @@
         "i3.4xlarge",
         "i3.8xlarge",
         "i3.large",
+        "i3.metal",
         "i3.xlarge",
         "i3en.12xlarge",
         "i3en.24xlarge",
         "i3en.2xlarge",
         "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -43704,13 +43704,15 @@
         "i3.4xlarge",
         "i3.8xlarge",
         "i3.large",
+        "i3.metal",
         "i3.xlarge",
         "i3en.12xlarge",
         "i3en.24xlarge",
         "i3en.2xlarge",
         "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
@@ -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
@@ -46132,13 +46132,15 @@
         "i3.4xlarge",
         "i3.8xlarge",
         "i3.large",
+        "i3.metal",
         "i3.xlarge",
         "i3en.12xlarge",
         "i3en.24xlarge",
         "i3en.2xlarge",
         "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
@@ -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
@@ -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
@@ -46172,13 +46172,15 @@
         "i3.4xlarge",
         "i3.8xlarge",
         "i3.large",
+        "i3.metal",
         "i3.xlarge",
         "i3en.12xlarge",
         "i3en.24xlarge",
         "i3en.2xlarge",
         "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": {