AllowedValues from botocore during --update-specs (#1682)

#50 (comment) AWS::WorkSpaces::Workspace.ComputeTypeName should pick up POWERPRO and GRAPHICSPRO: https://github.com/boto/botocore/blob/ae2d0855ac3162520e584a24f5522b633de4e2a9/botocore/data/workspaces/2015-04-08/service-2.json#L822-L823 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename AWS::CodeBuild::Project.Environment.Type should pick up WINDOWS_SERVER_2019_CONTAINER: https://github.com/boto/botocore/blob/ae2d0855ac3162520e584a24f5522b633de4e2a9/botocore/data/codebuild/2016-10-06/service-2.json#L1873 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-type AWS::S3::Bucket.TopicConfiguration.Event should pick up s3:ObjectRestore:* and s3:Replication:*: https://github.com/boto/botocore/blob/ae2d0855ac3162520e584a24f5522b633de4e2a9/botocore/data/s3/2006-03-01/service-2.json#L2887-L2890 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html#cfn-s3-bucket-notificationconfig-topicconfig-event https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html#notification-how-to-event-types-and-destinations EbsVolumeType should pick up io2: https://aws.amazon.com/blogs/aws/new-ebs-volume-type-io2-more-iops-gib-higher-durability/ https://raw.githubusercontent.com/boto/botocore/master/botocore/data/ec2/2016-11-15/service-2.json https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-volumetype https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-volumetype AWS::GuardDuty::IPSet.Format should pick up ALIEN_VAULT and PROOF_POINT and FIRE_EYE: https://github.com/boto/botocore/blob/ae2d0855ac3162520e584a24f5522b633de4e2a9/botocore/data/guardduty/2017-11-28/service-2.json#L3130-L3132 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-format AWS::CodeBuild::Project.Environment.ComputeType should pick up BUILD_GENERAL1_2XLARGE: https://github.com/boto/botocore/blob/16958153b1e01dcbf5d4334394a14715438b53f1/botocore/data/codebuild/2016-10-06/service-2.json#L1413 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-computetype https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html AWS::CloudFront::Distribution.SslSupportMethod should pick up static-ip: https://github.com/boto/botocore/blob/ae2d0855ac3162520e584a24f5522b633de4e2a9/botocore/data/cloudfront/2020-05-31/service-2.json#L6101 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html#cfn-cloudfront-distribution-viewercertificate-sslsupportmethod AWS::WAFv2::RuleGroup.Rate.AggregateKeyType should pick up FORWARDED_IP: https://github.com/boto/botocore/blob/b9b494aac2a0dc03433a8cda711d3dfabb4e5b45/botocore/data/wafv2/2019-07-29/service-2.json#L2715 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-aggregatekeytype https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-aggregatekeytype https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-aggregatekeytype https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-aggregatekeytype AWS::Glue::Connection.ConnectionInput.ConnectionType picks up NETWORK: https://github.com/boto/botocore/blob/ae2d0855ac3162520e584a24f5522b633de4e2a9/botocore/data/glue/2017-03-31/service-2.json#L3372 https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-connectiontype AWS::EC2::LaunchTemplate.TagSpecification.ResourceType should pick up 42 values: https://raw.githubusercontent.com/boto/botocore/master/botocore/data/ec2/2016-11-15/service-2.json https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype * caching botocore service data to mitigate slowdown there are 145 types from 37 services, so this should reduce requests ~4x $ time cfn-lint --update-specs # before real 10m3.694s user 2m12.121s sys 0m27.602s $ time cfn-lint --update-specs # after real 2m15.260s user 0m52.673s sys 0m9.445s
aws-cloudformation · Sep 25, 2020 · 1f39305 · 1f39305
1 parent 8577a72
commit 1f39305
Show file tree

Hide file tree

Showing 51 changed files with 2,774 additions and 2,143 deletions.
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/all/03_value_types.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json
diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_amazonmq.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_amazonmq.json
@@ -3,19 +3,14 @@
     "op": "add",
     "path": "/ValueTypes/AWS::AmazonMQ::Broker.DeploymentMode",
     "value": {
-      "AllowedValues": [
-        "ACTIVE_STANDBY_MULTI_AZ",
-        "SINGLE_INSTANCE"
-      ]
+      "botocore": "mq/2017-11-27/DeploymentMode"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::AmazonMQ::Broker.EngineType",
     "value": {
-      "AllowedValues": [
-        "ACTIVEMQ"
-      ]
+      "botocore": "mq/2017-11-27/EngineType"
     }
   },
   {

diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_apigateway.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_apigateway.json
@@ -3,49 +3,21 @@
     "op": "add",
     "path": "/ValueTypes/AWS::ApiGateway::RestApi.ApiKeySourceType",
     "value": {
-      "AllowedValues": [
-        "AUTHORIZER",
-        "HEADER"
-      ]
+      "botocore": "apigateway/2015-07-09/ApiKeySourceType"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::ApiGateway::Authorizer.Type",
     "value": {
-      "AllowedValues": [
-        "COGNITO_USER_POOLS",
-        "REQUEST",
-        "TOKEN"
-      ]
+      "botocore": "apigateway/2015-07-09/AuthorizerType"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::ApiGateway::GatewayResponse.ResponseType",
     "value": {
-      "AllowedValues": [
-        "ACCESS_DENIED",
-        "API_CONFIGURATION_ERROR",
-        "AUTHORIZER_FAILURE",
-        "AUTHORIZER_CONFIGURATION_ERROR",
-        "BAD_REQUEST_PARAMETERS",
-        "BAD_REQUEST_BODY",
-        "DEFAULT_4XX",
-        "DEFAULT_5XX",
-        "EXPIRED_TOKEN",
-        "INVALID_SIGNATURE",
-        "INTEGRATION_FAILURE",
-        "INTEGRATION_TIMEOUT",
-        "INVALID_API_KEY",
-        "MISSING_AUTHENTICATION_TOKEN",
-        "QUOTA_EXCEEDED",
-        "REQUEST_TOO_LARGE",
-        "RESOURCE_NOT_FOUND",
-        "THROTTLED",
-        "UNAUTHORIZED",
-        "UNSUPPORTED_MEDIA_TYPE"
-      ]
+      "botocore": "apigateway/2015-07-09/GatewayResponseType"
     }
   },
   {

diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_applicationautoscaling.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_applicationautoscaling.json
@@ -3,34 +3,14 @@
     "op": "add",
     "path": "/ValueTypes/AWS::ApplicationAutoScaling::ScalingPolicy.PolicyType",
     "value": {
-      "AllowedValues": [
-        "StepScaling",
-        "TargetTrackingScaling"
-      ]
+      "botocore": "application-autoscaling/2016-02-06/PolicyType"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification.PredefinedMetricType",
     "value": {
-      "AllowedValues": [
-        "ALBRequestCountPerTarget",
-        "AppStreamAverageCapacityUtilization",
-        "CassandraReadCapacityUtilization",
-        "CassandraWriteCapacityUtilization",
-        "ComprehendInferenceUtilization",
-        "DynamoDBReadCapacityUtilization",
-        "DynamoDBWriteCapacityUtilization",
-        "EC2SpotFleetRequestAverageCPUUtilization",
-        "EC2SpotFleetRequestAverageNetworkIn",
-        "EC2SpotFleetRequestAverageNetworkOut",
-        "ECSServiceAverageCPUUtilization",
-        "ECSServiceAverageMemoryUtilization",
-        "RDSReaderAverageCPUUtilization",
-        "RDSReaderAverageDatabaseConnections",
-        "SageMakerVariantInvocationsPerInstance",
-        "LambdaProvisionedConcurrencyUtilization"
-      ]
+      "botocore": "application-autoscaling/2016-02-06/MetricType"
     }
   }
 ]
diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_appsync.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_appsync.json
@@ -3,36 +3,21 @@
     "op": "add",
     "path": "/ValueTypes/AWS::AppSync::DataSource.Type",
     "value": {
-      "AllowedValues": [
-        "AMAZON_DYNAMODB",
-        "AMAZON_ELASTICSEARCH",
-        "AWS_LAMBDA",
-        "HTTP",
-        "NONE",
-        "RELATIONAL_DATABASE"
-      ]
+      "botocore": "appsync/2017-07-25/DataSourceType"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::AppSync::GraphQLApi.AuthType",
     "value": {
-      "AllowedValues": [
-        "AMAZON_COGNITO_USER_POOLS",
-        "API_KEY",
-        "AWS_IAM",
-        "OPENID_CONNECT"
-      ]
+      "botocore": "appsync/2017-07-25/AuthenticationType"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::AppSync::Resolver.Kind",
     "value": {
-      "AllowedValues": [
-        "PIPELINE",
-        "UNIT"
-      ]
+      "botocore": "appsync/2017-07-25/ResolverKind"
     }
   }
 ]
diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_autoscaling.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_autoscaling.json
@@ -66,25 +66,14 @@
     "op": "add",
     "path": "/ValueTypes/AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification.Statistic",
     "value": {
-      "AllowedValues": [
-        "Average",
-        "Minimum",
-        "Maximum",
-        "SampleCount",
-        "Sum"
-      ]
+      "botocore": "autoscaling/2011-01-01/MetricStatistic"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification.PredefinedMetricType",
     "value": {
-      "AllowedValues": [
-        "ALBRequestCountPerTarget",
-        "ASGAverageCPUUtilization",
-        "ASGAverageNetworkIn",
-        "ASGAverageNetworkOut"
-      ]
+      "botocore": "autoscaling/2011-01-01/MetricType"
     }
   }
 ]
diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_autoscalingplans.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_autoscalingplans.json
@@ -3,50 +3,28 @@
     "op": "add",
     "path": "/ValueTypes/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction.ScalableDimension",
     "value": {
-      "AllowedValues": [
-        "autoscaling:autoScalingGroup:DesiredCapacity",
-        "ecs:service:DesiredCount",
-        "ec2:spot-fleet-request:TargetCapacity",
-        "dynamodb:table:ReadCapacityUnits",
-        "dynamodb:table:WriteCapacityUnits",
-        "dynamodb:index:ReadCapacityUnits",
-        "dynamodb:index:WriteCapacityUnits",
-        "rds:cluster:ReadReplicaCount"
-      ]
+      "botocore": "autoscaling-plans/2018-01-06/ScalableDimension"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction.ServiceNamespace",
     "value": {
-      "AllowedValues": [
-        "autoscaling",
-        "dynamodb",
-        "ecs",
-        "ec2",
-        "rds"
-      ]
+      "botocore": "autoscaling-plans/2018-01-06/ServiceNamespace"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction.PredictiveScalingMaxCapacityBehavior",
     "value": {
-      "AllowedValues": [
-        "SetForecastCapacityToMaxCapacity",
-        "SetMaxCapacityToForecastCapacity",
-        "SetMaxCapacityAboveForecastCapacity"
-      ]
+      "botocore": "autoscaling-plans/2018-01-06/PredictiveScalingMaxCapacityBehavior"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction.PredictiveScalingMode",
     "value": {
-      "AllowedValues": [
-        "ForecastAndScale",
-        "ForecastOnly"
-      ]
+      "botocore": "autoscaling-plans/2018-01-06/PredictiveScalingMode"
     }
   }
 ]
diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_budget.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types/aws_budget.json
@@ -3,47 +3,28 @@
     "op": "add",
     "path": "/ValueTypes/AWS::Budgets::Budget.BudgetType",
     "value": {
-      "AllowedValues": [
-        "COST",
-        "RI_COVERAGE",
-        "RI_UTILIZATION",
-        "SAVINGS_PLANS_COVERAGE",
-        "SAVINGS_PLANS_UTILIZATION",
-        "USAGE"
-      ]
+      "botocore": "budgets/2016-10-20/BudgetType"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::Budgets::Budget.TimeUnit",
     "value": {
-      "AllowedValues": [
-        "ANNUALLY",
-        "DAILY",
-        "MONTHLY",
-        "QUARTERLY"
-      ]
+      "botocore": "budgets/2016-10-20/TimeUnit"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::Budgets::Budget.ComparisonOperator",
     "value": {
-      "AllowedValues": [
-        "EQUAL_TO",
-        "GREATER_THAN",
-        "LESS_THAN"
-      ]
+      "botocore": "budgets/2016-10-20/ComparisonOperator"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::Budgets::Budget.NotificationType",
     "value": {
-      "AllowedValues": [
-        "ACTUAL",
-        "FORECASTED"
-      ]
+      "botocore": "budgets/2016-10-20/NotificationType"
     }
   },
   {
@@ -58,20 +39,14 @@
     "op": "add",
     "path": "/ValueTypes/AWS::Budgets::Budget.ThresholdType",
     "value": {
-      "AllowedValues": [
-        "ABSOLUTE_VALUE",
-        "PERCENTAGE"
-      ]
+      "botocore": "budgets/2016-10-20/ThresholdType"
     }
   },
   {
     "op": "add",
     "path": "/ValueTypes/AWS::Budgets::Budget.SubscriptionType",
     "value": {
-      "AllowedValues": [
-        "EMAIL",
-        "SNS"
-      ]
+      "botocore": "budgets/2016-10-20/SubscriptionType"
     }
   }
 ]