Fixing a few issues

aws-cloudformation · Feb 11, 2021 · 776f7fb · 776f7fb
1 parent 46ce4d9
commit 776f7fb
Show file tree

Hide file tree

Showing 61 changed files with 50,233 additions and 106,561 deletions.
diff --git a/scripts/update_specs_from_pricing.py b/scripts/update_specs_from_pricing.py
@@ -218,7 +218,7 @@ def main():
 
     outputs = update_outputs('Ec2InstanceType', get_results('AmazonEC2', ['Compute Instance', 'Compute Instance (bare metal)']), outputs)
     outputs = update_outputs('AWS::AmazonMQ::Broker.HostInstanceType', get_mq_pricing(), outputs)
-    outputs = update_outputs('RdsInstanceType', get_rds_pricing(), outputs)
+    outputs = update_outputs('AWS::RDS::DBInstance.DBInstanceClass', get_rds_pricing(), outputs)
     outputs = update_outputs('RedshiftInstanceType', get_results('AmazonRedshift', ['Compute Instance']), outputs)
     outputs = update_outputs('DAXInstanceType', get_dax_pricing(), outputs)
     outputs = update_outputs('DocumentDBInstanceClass', get_results('AmazonDocDB', ['Database Instance']), outputs)

diff --git a/src/cfnlint/data/CloudSpecs/af-south-1.json b/src/cfnlint/data/CloudSpecs/af-south-1.json
diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json
diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json
diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json
diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json
diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json
diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json
diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json
diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json
diff --git a/src/cfnlint/data/CloudSpecs/cn-north-1.json b/src/cfnlint/data/CloudSpecs/cn-north-1.json
diff --git a/src/cfnlint/data/CloudSpecs/cn-northwest-1.json b/src/cfnlint/data/CloudSpecs/cn-northwest-1.json
diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json
diff --git a/src/cfnlint/data/CloudSpecs/eu-north-1.json b/src/cfnlint/data/CloudSpecs/eu-north-1.json
diff --git a/src/cfnlint/data/CloudSpecs/eu-south-1.json b/src/cfnlint/data/CloudSpecs/eu-south-1.json
diff --git a/src/cfnlint/data/CloudSpecs/eu-west-1.json b/src/cfnlint/data/CloudSpecs/eu-west-1.json
diff --git a/src/cfnlint/data/CloudSpecs/eu-west-2.json b/src/cfnlint/data/CloudSpecs/eu-west-2.json
diff --git a/src/cfnlint/data/CloudSpecs/eu-west-3.json b/src/cfnlint/data/CloudSpecs/eu-west-3.json
diff --git a/src/cfnlint/data/CloudSpecs/me-south-1.json b/src/cfnlint/data/CloudSpecs/me-south-1.json
diff --git a/src/cfnlint/data/CloudSpecs/sa-east-1.json b/src/cfnlint/data/CloudSpecs/sa-east-1.json
diff --git a/src/cfnlint/data/CloudSpecs/us-east-1.json b/src/cfnlint/data/CloudSpecs/us-east-1.json
diff --git a/src/cfnlint/data/CloudSpecs/us-east-2.json b/src/cfnlint/data/CloudSpecs/us-east-2.json
diff --git a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json
diff --git a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json
diff --git a/src/cfnlint/data/CloudSpecs/us-west-1.json b/src/cfnlint/data/CloudSpecs/us-west-1.json
diff --git a/src/cfnlint/data/CloudSpecs/us-west-2.json b/src/cfnlint/data/CloudSpecs/us-west-2.json
diff --git a/src/cfnlint/data/ExtendedSpecs/af-south-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/af-south-1/05_pricing_property_values.json
@@ -94,7 +94,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m5.12xlarge",
       "db.m5.16xlarge",

diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json
@@ -248,15 +248,6 @@
       "Ec2FleetType": {
         "botocore": "ec2/2016-11-15/FleetType"
       },
-      "Ec2FlowLogDestinationType": {
-        "botocore": "ec2/2016-11-15/LogDestinationType"
-      },
-      "Ec2FlowLogResourceType": {
-        "botocore": "ec2/2016-11-15/FlowLogsResourceType"
-      },
-      "Ec2FlowLogTrafficType": {
-        "botocore": "ec2/2016-11-15/TrafficType"
-      },
       "Ec2HostAutoPlacement": {
         "botocore": "ec2/2016-11-15/AutoPlacement"
       },
@@ -270,15 +261,9 @@
       "Ec2Tenancy": {
         "botocore": "ec2/2016-11-15/Tenancy"
       },
-      "EcsLaunchType": {
-        "botocore": "ecs/2014-11-13/LaunchType"
-      },
       "EcsNetworkMode": {
         "botocore": "ecs/2014-11-13/NetworkMode"
       },
-      "EcsSchedulingStrategy": {
-        "botocore": "ecs/2014-11-13/SchedulingStrategy"
-      },
       "EcsTaskDefinitionProxyType": {
         "botocore": "ecs/2014-11-13/ProxyConfigurationType"
       },
@@ -320,18 +305,7 @@
           ]
         }
       },
-      "KmsKey.Id": {
-        "GetAtt": {},
-        "Ref": {
-          "Parameters": [
-            "String"
-          ],
-          "Resources": [
-            "AWS::KMS::Key"
-          ]
-        }
-      },
-      "KmsKey.IdOrArn": {
+      "AWS::KMS::Alias.TargetKeyId": {
         "GetAtt": {
           "AWS::KMS::Key": "Arn"
         },
@@ -482,13 +456,6 @@
           "60"
         ]
       },
-      "RdsInstanceType": {
-        "Ref": {
-          "Parameters": [
-            "String"
-          ]
-        }
-      },
       "RecordSetFailover": {
         "botocore": "route53/2013-04-01/ResourceRecordSetFailover"
       },
@@ -559,12 +526,6 @@
           ]
         }
       },
-      "Route53HealthCheckConfigHealthStatus": {
-        "botocore": "route53/2013-04-01/InsufficientDataHealthStatus"
-      },
-      "Route53HealthCheckConfigType": {
-        "botocore": "route53/2013-04-01/HealthCheckType"
-      },
       "Route53ResolverEndpointDirection": {
         "botocore": "route53resolver/2018-04-01/ResolverEndpointDirection"
       },
@@ -664,14 +625,6 @@
           ]
         }
       },
-      "String": {
-        "GetAtt": {},
-        "Ref": {
-          "Parameters": [
-            "String"
-          ]
-        }
-      },
       "SubnetId": {
         "GetAtt": {},
         "Ref": {

diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_wafv2.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_wafv2.json
diff --git a/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json b/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json
@@ -237,20 +237,6 @@
       "ValueType": "EbsVolumeType"
     }
   },
-  {
-    "op": "add",
-    "path": "/PropertyTypes/AWS::Route53::HealthCheck.HealthCheckConfig/Properties/InsufficientDataHealthStatus/Value",
-    "value": {
-      "ValueType": "Route53HealthCheckConfigHealthStatus"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/PropertyTypes/AWS::Route53::HealthCheck.HealthCheckConfig/Properties/Type/Value",
-    "value": {
-      "ValueType": "Route53HealthCheckConfigType"
-    }
-  },
   {
     "op": "add",
     "path": "/PropertyTypes/AWS::S3::Bucket.AccelerateConfiguration/Properties/AccelerationStatus/Value",
@@ -682,27 +668,6 @@
       "ValueType": "Ec2FleetType"
     }
   },
-  {
-    "op": "add",
-    "path": "/ResourceTypes/AWS::EC2::FlowLog/Properties/LogDestinationType/Value",
-    "value": {
-      "ValueType": "Ec2FlowLogDestinationType"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/ResourceTypes/AWS::EC2::FlowLog/Properties/ResourceType/Value",
-    "value": {
-      "ValueType": "Ec2FlowLogResourceType"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/ResourceTypes/AWS::EC2::FlowLog/Properties/TrafficType/Value",
-    "value": {
-      "ValueType": "Ec2FlowLogTrafficType"
-    }
-  },
   {
     "op": "add",
     "path": "/ResourceTypes/AWS::EC2::Host/Properties/AvailabilityZone/Value",
@@ -808,20 +773,6 @@
       "ValueType": "PlacementTenancy"
     }
   },
-  {
-    "op": "add",
-    "path": "/ResourceTypes/AWS::ECS::Service/Properties/LaunchType/Value",
-    "value": {
-      "ValueType": "EcsLaunchType"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/ResourceTypes/AWS::ECS::Service/Properties/SchedulingStrategy/Value",
-    "value": {
-      "ValueType": "EcsSchedulingStrategy"
-    }
-  },
   {
     "op": "add",
     "path": "/ResourceTypes/AWS::ECS::TaskDefinition/Properties/NetworkMode/Value",
@@ -923,13 +874,6 @@
       "ValueType": "TargetGroupHealthyThresholdCount"
     }
   },
-  {
-    "op": "add",
-    "path": "/ResourceTypes/AWS::KMS::Alias/Properties/TargetKeyId/Value",
-    "value": {
-      "ValueType": "KmsKey.IdOrArn"
-    }
-  },
   {
     "op": "add",
     "path": "/ResourceTypes/AWS::Lambda::Function/Properties/Runtime/Value",

diff --git a/src/cfnlint/data/ExtendedSpecs/all/04_property_values/aws_lambda.json b/src/cfnlint/data/ExtendedSpecs/all/04_property_values/aws_lambda.json
@@ -76,5 +76,12 @@
     "value": {
       "ValueType": "AWS::Lambda::EventSourceMapping.EventSourceArn"
     }
+  },
+  {
+    "op": "add",
+    "path": "/ResourceTypes/AWS::Lambda::EventSourceMapping/Properties/MaximumBatchingWindowInSeconds/Value",
+    "value": {
+      "ValueType": "AWS::Lambda::EventSourceMapping.MaximumBatchingWindowInSeconds"
+    }
   }
 ]
diff --git a/src/cfnlint/data/ExtendedSpecs/all/04_property_values/aws_rds.json b/src/cfnlint/data/ExtendedSpecs/all/04_property_values/aws_rds.json
@@ -20,6 +20,13 @@
       "ValueType": "AWS::RDS::DBInstance.PromotionTier"
     }
   },
+  {
+    "op": "add",
+    "path": "/ResourceTypes/AWS::RDS::DBInstance/Properties/DBInstanceClass/Value",
+    "value": {
+      "ValueType": "AWS::RDS::DBInstance.DBInstanceClass"
+    }
+  },
   {
     "op": "add",
     "path": "/PropertyTypes/AWS::RDS::DBSecurityGroup.Ingress/Properties/CIDRIP/Value",

diff --git a/src/cfnlint/data/ExtendedSpecs/all/04_property_values/aws_wafv2.json b/src/cfnlint/data/ExtendedSpecs/all/04_property_values/aws_wafv2.json
diff --git a/src/cfnlint/data/ExtendedSpecs/all/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/all/05_pricing_property_values.json
@@ -19,5 +19,10 @@
     "value": [
       "stream.standard.large"
     ]
+  },
+  {
+    "op": "add",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass",
+    "value": {}
   }
 ]
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
@@ -150,7 +150,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m5.12xlarge",
       "db.m5.16xlarge",

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
@@ -343,7 +343,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m1.large",
       "db.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
@@ -263,7 +263,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m4.10xlarge",
       "db.m4.16xlarge",

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
@@ -121,7 +121,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m4.10xlarge",
       "db.m4.16xlarge",

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
@@ -258,7 +258,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m4.10xlarge",
       "db.m4.16xlarge",

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
@@ -367,7 +367,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m1.large",
       "db.m1.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
@@ -326,7 +326,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m1.large",
       "db.m1.medium",

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
@@ -236,7 +236,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m4.10xlarge",
       "db.m4.16xlarge",

diff --git a/src/cfnlint/data/ExtendedSpecs/cn-north-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/cn-north-1/05_pricing_property_values.json
@@ -186,7 +186,7 @@
   },
   {
     "op": "add",
-    "path": "/ValueTypes/RdsInstanceType/AllowedValues",
+    "path": "/ValueTypes/AWS::RDS::DBInstance.DBInstanceClass/AllowedValues",
     "value": [
       "db.m1.small",
       "db.m3.2xlarge",