Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rate based number limits #1507

Merged
merged 1 commit into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/cfnlint/data/CloudSpecs/af-south-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -20838,6 +20838,15 @@
"NumberMax": 16384,
"NumberMin": 5
},
"AWS::WAFv2::RuleGroup.Rate.AggregateKeyType": {
"AllowedValues": [
"IP"
]
},
"AWS::WAFv2::RuleGroup.Rate.Limit": {
"NumberMax": 20000000,
"NumberMin": 100
},
"AWS::WorkSpaces::Workspace.ComputeTypeName": {
"AllowedValues": [
"GRAPHICS",
Expand Down
49 changes: 41 additions & 8 deletions src/cfnlint/data/CloudSpecs/ap-east-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -14966,13 +14966,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-scopedownstatement",
Expand All @@ -14989,13 +14995,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-scopedownstatement",
Expand Down Expand Up @@ -15634,13 +15646,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-scopedownstatement",
Expand All @@ -15657,13 +15675,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-scopedownstatement",
Expand Down Expand Up @@ -33586,6 +33610,15 @@
"NumberMax": 16384,
"NumberMin": 5
},
"AWS::WAFv2::RuleGroup.Rate.AggregateKeyType": {
"AllowedValues": [
"IP"
]
},
"AWS::WAFv2::RuleGroup.Rate.Limit": {
"NumberMax": 20000000,
"NumberMin": 100
},
"AWS::WorkSpaces::Workspace.ComputeTypeName": {
"AllowedValues": [
"GRAPHICS",
Expand Down
49 changes: 41 additions & 8 deletions src/cfnlint/data/CloudSpecs/ap-northeast-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -29036,13 +29036,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-scopedownstatement",
Expand All @@ -29059,13 +29065,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-scopedownstatement",
Expand Down Expand Up @@ -29704,13 +29716,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-scopedownstatement",
Expand All @@ -29727,13 +29745,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-scopedownstatement",
Expand Down Expand Up @@ -55166,6 +55190,15 @@
"NumberMax": 16384,
"NumberMin": 5
},
"AWS::WAFv2::RuleGroup.Rate.AggregateKeyType": {
"AllowedValues": [
"IP"
]
},
"AWS::WAFv2::RuleGroup.Rate.Limit": {
"NumberMax": 20000000,
"NumberMin": 100
},
"AWS::WorkSpaces::Workspace.ComputeTypeName": {
"AllowedValues": [
"GRAPHICS",
Expand Down
49 changes: 41 additions & 8 deletions src/cfnlint/data/CloudSpecs/ap-northeast-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -27486,13 +27486,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-scopedownstatement",
Expand All @@ -27509,13 +27515,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-scopedownstatement",
Expand Down Expand Up @@ -28154,13 +28166,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-scopedownstatement",
Expand All @@ -28177,13 +28195,19 @@
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-aggregatekeytype",
"PrimitiveType": "String",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.AggregateKeyType"
}
},
"Limit": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-limit",
"PrimitiveType": "Integer",
"Required": true,
"UpdateType": "Mutable"
"UpdateType": "Mutable",
"Value": {
"ValueType": "AWS::WAFv2::RuleGroup.Rate.Limit"
}
},
"ScopeDownStatement": {
"Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-scopedownstatement",
Expand Down Expand Up @@ -52762,6 +52786,15 @@
"NumberMax": 16384,
"NumberMin": 5
},
"AWS::WAFv2::RuleGroup.Rate.AggregateKeyType": {
"AllowedValues": [
"IP"
]
},
"AWS::WAFv2::RuleGroup.Rate.Limit": {
"NumberMax": 20000000,
"NumberMin": 100
},
"AWS::WorkSpaces::Workspace.ComputeTypeName": {
"AllowedValues": [
"GRAPHICS",
Expand Down
9 changes: 9 additions & 0 deletions src/cfnlint/data/CloudSpecs/ap-northeast-3.json
Original file line number Diff line number Diff line change
Expand Up @@ -26151,6 +26151,15 @@
"NumberMax": 16384,
"NumberMin": 5
},
"AWS::WAFv2::RuleGroup.Rate.AggregateKeyType": {
"AllowedValues": [
"IP"
]
},
"AWS::WAFv2::RuleGroup.Rate.Limit": {
"NumberMax": 20000000,
"NumberMin": 100
},
"AWS::WorkSpaces::Workspace.ComputeTypeName": {
"AllowedValues": [
"GRAPHICS",
Expand Down
Loading