From 29019eb8322c8910e669aa56f6a77d55545b1e0e Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Mon, 15 Jul 2019 14:56:13 -0400 Subject: [PATCH] Release/v0.22.3 (#1024) * Release v0.22.3 --- CHANGELOG.md | 9 + README.md | 2 +- .../data/AdditionalSpecs/RdsProperties.json | 481 +----------------- .../data/CloudSpecs/ap-northeast-1.json | 1 - .../data/CloudSpecs/ap-northeast-2.json | 7 + .../data/CloudSpecs/ap-northeast-3.json | 3 - .../data/CloudSpecs/ap-southeast-1.json | 1 - .../data/CloudSpecs/ap-southeast-2.json | 1 - src/cfnlint/data/CloudSpecs/eu-central-1.json | 1 - src/cfnlint/data/CloudSpecs/eu-west-1.json | 1 - src/cfnlint/data/CloudSpecs/eu-west-2.json | 62 +++ src/cfnlint/data/CloudSpecs/eu-west-3.json | 9 - src/cfnlint/data/CloudSpecs/us-east-1.json | 2 - src/cfnlint/data/CloudSpecs/us-east-2.json | 1 - .../data/CloudSpecs/us-gov-west-1.json | 1 - src/cfnlint/data/CloudSpecs/us-west-1.json | 1 - src/cfnlint/data/CloudSpecs/us-west-2.json | 1 - .../05_pricing_property_values.json | 1 - .../05_pricing_property_values.json | 7 + .../05_pricing_property_values.json | 3 - .../05_pricing_property_values.json | 1 - .../05_pricing_property_values.json | 1 - .../05_pricing_property_values.json | 1 - .../eu-north-1/07_ssm_service_addition.json | 93 ---- .../eu-west-1/05_pricing_property_values.json | 1 - .../eu-west-2/07_ssm_service_addition.json | 66 +++ .../eu-west-3/05_pricing_property_values.json | 9 - .../us-east-1/05_pricing_property_values.json | 2 - .../us-east-2/05_pricing_property_values.json | 1 - .../05_pricing_property_values.json | 1 - .../us-west-1/05_pricing_property_values.json | 1 - .../us-west-2/05_pricing_property_values.json | 1 - src/cfnlint/version.py | 2 +- .../good/resources/rds/instance_sizes.yaml | 2 +- 34 files changed, 156 insertions(+), 621 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 535576391a..84ee4acff2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +### 0.22.3 +###### CloudFormation Specifications +- Patch in `AWS::SageMaker::CodeRepository` to the CloudFormation spec (issue #[1005](https://github.com/aws-cloudformation/cfn-python-lint/issues/1005)) +- Patch in Tags into IAM Roles and Users (issue #[1015](https://github.com/aws-cloudformation/cfn-python-lint/issues/1015)) +- Update CloudFormation spec to version 4.2.0 (pull #[1023](https://github.com/aws-cloudformation/cfn-python-lint/pull/1023)) +- Update specs from pricing and SSM data as of 2019.07.13 +###### Fixes +- Add more Availability Zones (pull #[1021](https://github.com/aws-cloudformation/cfn-python-lint/pull/1021)) + ### 0.22.2 ###### CloudFormation Specifications - Patch in `AWS::Cognito::UserPool` resource information for `ap-south-1` and `ap-southeast-1` (issue #[1002](https://github.com/aws-cloudformation/cfn-python-lint/issues/1002)) diff --git a/README.md b/README.md index ace8a7ed14..f52363c2e7 100644 --- a/README.md +++ b/README.md @@ -209,7 +209,7 @@ If you'd like cfn-lint to be run automatically when making changes to files in y ```yaml repos: - repo: https://github.com/aws-cloudformation/cfn-python-lint - rev: v0.22.2 # The version of cfn-lint to use + rev: v0.22.3 # The version of cfn-lint to use hooks: - id: cfn-python-lint files: path/to/cfn/dir/.*\.(json|yml|yaml)$ diff --git a/src/cfnlint/data/AdditionalSpecs/RdsProperties.json b/src/cfnlint/data/AdditionalSpecs/RdsProperties.json index 8888b04963..a2593ec56e 100644 --- a/src/cfnlint/data/AdditionalSpecs/RdsProperties.json +++ b/src/cfnlint/data/AdditionalSpecs/RdsProperties.json @@ -22,13 +22,6 @@ "db.t3.xlarge" ], "ap-northeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -47,7 +40,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -62,7 +54,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -105,7 +96,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -170,7 +160,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -195,13 +184,6 @@ "db.x1.32xlarge" ], "ap-southeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -220,7 +202,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -235,7 +216,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -258,13 +238,6 @@ "db.z1d.xlarge" ], "ap-southeast-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -283,7 +256,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -298,7 +270,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -385,7 +356,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -442,13 +412,6 @@ "db.t3.xlarge" ], "eu-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -467,7 +430,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -482,7 +444,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -585,13 +546,6 @@ "db.x1.32xlarge" ], "sa-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -609,14 +563,12 @@ "db.m5.large", "db.m5.xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r4.16xlarge", "db.r4.2xlarge", "db.r4.4xlarge", "db.r4.8xlarge", "db.r4.large", "db.r4.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -633,13 +585,6 @@ "db.x1.32xlarge" ], "us-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -658,7 +603,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -673,7 +617,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -716,7 +659,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -767,13 +709,6 @@ "db.t2.xlarge" ], "us-gov-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -784,9 +719,10 @@ "db.m4.4xlarge", "db.m4.large", "db.m4.xlarge", + "db.m5.12xlarge", + "db.m5.24xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -811,13 +747,6 @@ "db.x1.32xlarge" ], "us-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -836,7 +765,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -851,7 +779,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -872,13 +799,6 @@ "db.z1d.xlarge" ], "us-west-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -897,7 +817,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.16xlarge", @@ -912,7 +831,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -959,13 +877,6 @@ "db.t3.xlarge" ], "ap-northeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -980,7 +891,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -992,7 +902,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1026,7 +935,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1080,7 +988,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1102,13 +1009,6 @@ "db.t3.xlarge" ], "ap-southeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1123,7 +1023,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1135,7 +1034,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1155,13 +1053,6 @@ "db.z1d.xlarge" ], "ap-southeast-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1176,7 +1067,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1188,7 +1078,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1257,7 +1146,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1304,13 +1192,6 @@ "db.t3.xlarge" ], "eu-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1325,7 +1206,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1337,7 +1217,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1419,13 +1298,6 @@ "db.t3.xlarge" ], "sa-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1439,13 +1311,11 @@ "db.m5.large", "db.m5.xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r4.2xlarge", "db.r4.4xlarge", "db.r4.8xlarge", "db.r4.large", "db.r4.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1460,13 +1330,6 @@ "db.t3.xlarge" ], "us-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1481,7 +1344,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1493,7 +1355,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1527,7 +1388,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1570,13 +1430,6 @@ "db.t2.xlarge" ], "us-gov-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1589,7 +1442,6 @@ "db.m4.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1609,13 +1461,6 @@ "db.t2.xlarge" ], "us-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1630,7 +1475,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1642,7 +1486,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1662,13 +1505,6 @@ "db.z1d.xlarge" ], "us-west-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1683,7 +1519,6 @@ "db.m5.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", - "db.r3.8xlarge", "db.r3.large", "db.r3.xlarge", "db.r4.2xlarge", @@ -1695,7 +1530,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1737,13 +1571,6 @@ "db.t3.xlarge" ], "ap-northeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1768,7 +1595,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1870,13 +1696,6 @@ "db.t3.xlarge" ], "ap-southeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1901,7 +1720,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -1920,13 +1738,6 @@ "db.z1d.xlarge" ], "ap-southeast-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -1951,7 +1762,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2061,13 +1871,6 @@ "db.t3.xlarge" ], "eu-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2092,7 +1895,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2170,13 +1972,6 @@ "db.t3.xlarge" ], "sa-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2194,7 +1989,6 @@ "db.r4.4xlarge", "db.r4.large", "db.r4.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2209,13 +2003,6 @@ "db.t3.xlarge" ], "us-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2240,7 +2027,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2312,13 +2098,6 @@ "db.t2.xlarge" ], "us-gov-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2349,13 +2128,6 @@ "db.t2.xlarge" ], "us-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2380,7 +2152,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2399,13 +2170,6 @@ "db.z1d.xlarge" ], "us-west-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2430,7 +2194,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2470,13 +2233,6 @@ "db.t3.xlarge" ], "ap-northeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2501,7 +2257,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2603,13 +2358,6 @@ "db.t3.xlarge" ], "ap-southeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2634,7 +2382,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2653,13 +2400,6 @@ "db.z1d.xlarge" ], "ap-southeast-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2684,7 +2424,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2794,13 +2533,6 @@ "db.t3.xlarge" ], "eu-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2825,7 +2557,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2903,13 +2634,6 @@ "db.t3.xlarge" ], "sa-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2927,7 +2651,6 @@ "db.r4.4xlarge", "db.r4.large", "db.r4.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -2942,13 +2665,6 @@ "db.t3.xlarge" ], "us-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -2973,7 +2689,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -3045,13 +2760,6 @@ "db.t2.xlarge" ], "us-gov-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -3074,7 +2782,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -3083,13 +2790,6 @@ "db.t2.xlarge" ], "us-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -3114,7 +2814,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -3133,13 +2832,6 @@ "db.z1d.xlarge" ], "us-west-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -3164,7 +2856,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -7397,13 +7088,6 @@ "license-included": { "oracle-se1": { "ap-northeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7424,7 +7108,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7489,13 +7172,6 @@ "db.t3.xlarge" ], "ap-southeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7516,7 +7192,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7529,13 +7204,6 @@ "db.t3.xlarge" ], "ap-southeast-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7556,7 +7224,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7624,22 +7291,7 @@ "db.t3.small", "db.t3.xlarge" ], - "eu-north-1": [ - "db.t3.2xlarge", - "db.t3.large", - "db.t3.medium", - "db.t3.micro", - "db.t3.small", - "db.t3.xlarge" - ], "eu-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7660,7 +7312,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7696,30 +7347,7 @@ "db.t3.small", "db.t3.xlarge" ], - "eu-west-3": [ - "db.m5.2xlarge", - "db.m5.4xlarge", - "db.m5.large", - "db.m5.xlarge", - "db.r5.2xlarge", - "db.r5.4xlarge", - "db.r5.large", - "db.r5.xlarge", - "db.t3.2xlarge", - "db.t3.large", - "db.t3.medium", - "db.t3.micro", - "db.t3.small", - "db.t3.xlarge" - ], "sa-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7729,7 +7357,6 @@ "db.m5.large", "db.m5.xlarge", "db.r3.4xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7742,13 +7369,6 @@ "db.t3.xlarge" ], "us-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7769,7 +7389,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7820,13 +7439,6 @@ "db.t2.small" ], "us-gov-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7845,13 +7457,6 @@ "db.t2.small" ], "us-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7872,7 +7477,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7885,13 +7489,6 @@ "db.t3.xlarge" ], "us-west-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7912,7 +7509,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.large", "db.t2.medium", "db.t2.micro", @@ -7927,13 +7523,6 @@ }, "oracle-se2": { "ap-northeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -7958,7 +7547,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -8053,13 +7641,6 @@ "db.t3.xlarge" ], "ap-southeast-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -8084,7 +7665,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -8099,13 +7679,6 @@ "db.t3.xlarge" ], "ap-southeast-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -8130,7 +7703,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -8229,13 +7801,6 @@ "db.t3.xlarge" ], "eu-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -8260,7 +7825,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -8331,13 +7895,6 @@ "db.t3.xlarge" ], "sa-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -8355,7 +7912,6 @@ "db.r4.4xlarge", "db.r4.large", "db.r4.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -8370,13 +7926,6 @@ "db.t3.xlarge" ], "us-east-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -8401,7 +7950,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -8466,19 +8014,10 @@ "db.t2.xlarge" ], "us-gov-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", "db.m3.xlarge", - "db.m4.10xlarge", - "db.m4.16xlarge", "db.m4.2xlarge", "db.m4.4xlarge", "db.m4.large", @@ -8503,13 +8042,6 @@ "db.t2.xlarge" ], "us-west-1": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -8534,7 +8066,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", @@ -8549,13 +8080,6 @@ "db.t3.xlarge" ], "us-west-2": [ - "db.m1.large", - "db.m1.medium", - "db.m1.small", - "db.m1.xlarge", - "db.m2.2xlarge", - "db.m2.4xlarge", - "db.m2.xlarge", "db.m3.2xlarge", "db.m3.large", "db.m3.medium", @@ -8580,7 +8104,6 @@ "db.r5.4xlarge", "db.r5.large", "db.r5.xlarge", - "db.t1.micro", "db.t2.2xlarge", "db.t2.large", "db.t2.medium", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json index 97a704f5d3..b652bdb0c7 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json @@ -43857,7 +43857,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json index a66e9c9bfa..02e2257716 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json @@ -39344,6 +39344,13 @@ "i3.8xlarge", "i3.large", "i3.xlarge", + "i3en.12xlarge", + "i3en.24xlarge", + "i3en.2xlarge", + "i3en.3xlarge", + "i3en.6xlarge", + "i3en.large", + "i3en.xlarge", "m3.2xlarge", "m3.large", "m3.medium", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json index 9c43e7dd85..8e0f87ac84 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json @@ -24097,7 +24097,6 @@ "i3.xlarge", "m3.2xlarge", "m3.large", - "m3.medium", "m3.xlarge", "m4.10xlarge", "m4.16xlarge", @@ -24125,7 +24124,6 @@ "m5d.xlarge", "r3.2xlarge", "r3.4xlarge", - "r3.8xlarge", "r3.large", "r3.xlarge", "r4.16xlarge", @@ -24163,7 +24161,6 @@ "t3.large", "t3.medium", "t3.micro", - "t3.nano", "t3.small", "t3.xlarge" ], diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json index 6077bbc2a2..7f09b39619 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json @@ -39872,7 +39872,6 @@ "r5d.large", "r5d.metal", "r5d.xlarge", - "t1.micro", "t2.2xlarge", "t2.large", "t2.medium", diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json index 61bdca035e..084afdb276 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json @@ -43619,7 +43619,6 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", - "i3.metal", "i3.xlarge", "m1.large", "m1.medium", diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json index 2e4a5503a1..90d2aa0e8b 100644 --- a/src/cfnlint/data/CloudSpecs/eu-central-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-central-1.json @@ -43868,7 +43868,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m3.2xlarge", "m3.large", diff --git a/src/cfnlint/data/CloudSpecs/eu-west-1.json b/src/cfnlint/data/CloudSpecs/eu-west-1.json index 2ca2097a58..d715fd0c0e 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-1.json @@ -46296,7 +46296,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", diff --git a/src/cfnlint/data/CloudSpecs/eu-west-2.json b/src/cfnlint/data/CloudSpecs/eu-west-2.json index 468261eb92..70d2c46bfd 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-2.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-2.json @@ -28838,6 +28838,68 @@ } } }, + "AWS::FSx::FileSystem": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html", + "Properties": { + "BackupId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-backupid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "FileSystemType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-filesystemtype", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-kmskeyid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "LustreConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-lustreconfiguration", + "Required": false, + "Type": "LustreConfiguration", + "UpdateType": "Mutable" + }, + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "StorageCapacity": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-storagecapacity", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Immutable" + }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-subnetids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "WindowsConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-windowsconfiguration", + "Required": false, + "Type": "WindowsConfiguration", + "UpdateType": "Mutable" + } + } + }, "AWS::GameLift::Alias": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html", "Properties": { diff --git a/src/cfnlint/data/CloudSpecs/eu-west-3.json b/src/cfnlint/data/CloudSpecs/eu-west-3.json index 051c7d1a97..ea1754328d 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-3.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-3.json @@ -30473,10 +30473,6 @@ "Ec2InstanceType": { "AllowedValues": [ "c4.2xlarge", - "c4.4xlarge", - "c4.8xlarge", - "c4.large", - "c4.xlarge", "c5.12xlarge", "c5.18xlarge", "c5.24xlarge", @@ -30502,12 +30498,7 @@ "i3.8xlarge", "i3.large", "i3.xlarge", - "m4.10xlarge", "m4.16xlarge", - "m4.2xlarge", - "m4.4xlarge", - "m4.large", - "m4.xlarge", "m5.12xlarge", "m5.16xlarge", "m5.24xlarge", diff --git a/src/cfnlint/data/CloudSpecs/us-east-1.json b/src/cfnlint/data/CloudSpecs/us-east-1.json index 50eeec22ae..052024d366 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-east-1.json @@ -46336,7 +46336,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -46453,7 +46452,6 @@ "t3.small", "t3.xlarge", "t3a.2xlarge", - "t3a.large", "t3a.medium", "t3a.micro", "t3a.nano", diff --git a/src/cfnlint/data/CloudSpecs/us-east-2.json b/src/cfnlint/data/CloudSpecs/us-east-2.json index 175c8e005d..4a3848e5ac 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-2.json +++ b/src/cfnlint/data/CloudSpecs/us-east-2.json @@ -40615,7 +40615,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m4.10xlarge", "m4.16xlarge", diff --git a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json index bc15e2c5e6..01cc012e92 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json @@ -24932,7 +24932,6 @@ "t2.large", "t2.medium", "t2.micro", - "t2.nano", "t2.small", "t2.xlarge", "t3.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/us-west-1.json b/src/cfnlint/data/CloudSpecs/us-west-1.json index ab3241adf7..366d660038 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-west-1.json @@ -33650,7 +33650,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", diff --git a/src/cfnlint/data/CloudSpecs/us-west-2.json b/src/cfnlint/data/CloudSpecs/us-west-2.json index d87e7a0a3a..8bb2d7c89a 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-2.json +++ b/src/cfnlint/data/CloudSpecs/us-west-2.json @@ -46261,7 +46261,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", 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 56d84a1ef2..0c62ecbeca 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 @@ -63,7 +63,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", 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 7c93bae222..ec0f17bc2f 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 @@ -45,6 +45,13 @@ "i3.8xlarge", "i3.large", "i3.xlarge", + "i3en.12xlarge", + "i3en.24xlarge", + "i3en.2xlarge", + "i3en.3xlarge", + "i3en.6xlarge", + "i3en.large", + "i3en.xlarge", "m3.2xlarge", "m3.large", "m3.medium", 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 8ff1357e02..5e2984221e 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 @@ -37,7 +37,6 @@ "i3.xlarge", "m3.2xlarge", "m3.large", - "m3.medium", "m3.xlarge", "m4.10xlarge", "m4.16xlarge", @@ -65,7 +64,6 @@ "m5d.xlarge", "r3.2xlarge", "r3.4xlarge", - "r3.8xlarge", "r3.large", "r3.xlarge", "r4.16xlarge", @@ -103,7 +101,6 @@ "t3.large", "t3.medium", "t3.micro", - "t3.nano", "t3.small", "t3.xlarge" ] 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 9c3840b61d..84778e1f08 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 @@ -148,7 +148,6 @@ "r5d.large", "r5d.metal", "r5d.xlarge", - "t1.micro", "t2.2xlarge", "t2.large", "t2.medium", 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 d4cd3a0a68..511a974f48 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,7 +50,6 @@ "i3.4xlarge", "i3.8xlarge", "i3.large", - "i3.metal", "i3.xlarge", "m1.large", "m1.medium", 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 e06cba6c78..adb1847d42 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 @@ -61,7 +61,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m3.2xlarge", "m3.large", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json index 37187cdb3f..ed3275c6f4 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json @@ -46,99 +46,6 @@ } } }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Inspector::AssessmentTarget", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttarget.html", - "Properties": { - "AssessmentTargetName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttarget.html#cfn-inspector-assessmenttarget-assessmenttargetname", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "ResourceGroupArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttarget.html#cfn-inspector-assessmenttarget-resourcegrouparn", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Inspector::AssessmentTemplate", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html", - "Properties": { - "AssessmentTargetArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-assessmenttargetarn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "AssessmentTemplateName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-assessmenttemplatename", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "DurationInSeconds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-durationinseconds", - "PrimitiveType": "Integer", - "Required": true, - "UpdateType": "Immutable" - }, - "RulesPackageArns": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-rulespackagearns", - "PrimitiveItemType": "String", - "Required": true, - "Type": "List", - "UpdateType": "Immutable" - }, - "UserAttributesForFindings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-userattributesforfindings", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Inspector::ResourceGroup", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-resourcegroup.html", - "Properties": { - "ResourceGroupTags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-resourcegroup.html#cfn-inspector-resourcegroup-resourcegrouptags", - "ItemType": "Tag", - "Required": true, - "Type": "List", - "UpdateType": "Immutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::Glue::Classifier", 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 66a08ec0c0..4710a1211c 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 @@ -78,7 +78,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json index 5c62167ae7..e189606ed7 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json @@ -1359,5 +1359,71 @@ } } } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::FSx::FileSystem", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html", + "Properties": { + "BackupId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-backupid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "FileSystemType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-filesystemtype", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-kmskeyid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "LustreConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-lustreconfiguration", + "Required": false, + "Type": "LustreConfiguration", + "UpdateType": "Mutable" + }, + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "StorageCapacity": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-storagecapacity", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Immutable" + }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-subnetids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "WindowsConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-windowsconfiguration", + "Required": false, + "Type": "WindowsConfiguration", + "UpdateType": "Mutable" + } + } + } } ] \ No newline at end of file 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 9df16ad214..d4512a1ccf 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 @@ -4,10 +4,6 @@ "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ "c4.2xlarge", - "c4.4xlarge", - "c4.8xlarge", - "c4.large", - "c4.xlarge", "c5.12xlarge", "c5.18xlarge", "c5.24xlarge", @@ -33,12 +29,7 @@ "i3.8xlarge", "i3.large", "i3.xlarge", - "m4.10xlarge", "m4.16xlarge", - "m4.2xlarge", - "m4.4xlarge", - "m4.large", - "m4.xlarge", "m5.12xlarge", "m5.16xlarge", "m5.24xlarge", 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 47684e02d2..7cdccfc45c 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 @@ -78,7 +78,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", @@ -195,7 +194,6 @@ "t3.small", "t3.xlarge", "t3a.2xlarge", - "t3a.large", "t3a.medium", "t3a.micro", "t3a.nano", 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 7a020379cf..972d8bc5fe 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 @@ -60,7 +60,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m4.10xlarge", "m4.16xlarge", 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 050d02c366..6b2296625c 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 @@ -134,7 +134,6 @@ "t2.large", "t2.medium", "t2.micro", - "t2.nano", "t2.small", "t2.xlarge", "t3.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 fcb621cda0..c2f8e4f32c 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 @@ -57,7 +57,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", 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 47684e02d2..33c2d7ffd8 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 @@ -78,7 +78,6 @@ "i3en.3xlarge", "i3en.6xlarge", "i3en.large", - "i3en.metal", "i3en.xlarge", "m1.large", "m1.medium", diff --git a/src/cfnlint/version.py b/src/cfnlint/version.py index cdc8726f8e..241677786f 100644 --- a/src/cfnlint/version.py +++ b/src/cfnlint/version.py @@ -15,4 +15,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -__version__ = '0.22.2' +__version__ = '0.22.3' diff --git a/test/fixtures/templates/good/resources/rds/instance_sizes.yaml b/test/fixtures/templates/good/resources/rds/instance_sizes.yaml index 0b5b8f87fb..f6ae2edcd5 100644 --- a/test/fixtures/templates/good/resources/rds/instance_sizes.yaml +++ b/test/fixtures/templates/good/resources/rds/instance_sizes.yaml @@ -42,5 +42,5 @@ Resources: DBInstance6: Type: AWS::RDS::DBInstance Properties: - DBInstanceClass: db.m1.small + DBInstanceClass: db.m3.medium Engine: oracle-ee