aws-sdk-waf 1.2.0 → 1.3.0

data/lib/aws-sdk-waf/client_api.rb

@@ -39,6 +39,8 @@ module Aws::WAF
     CreateRegexMatchSetResponse = Shapes::StructureShape.new(name: 'CreateRegexMatchSetResponse')
     CreateRegexPatternSetRequest = Shapes::StructureShape.new(name: 'CreateRegexPatternSetRequest')
     CreateRegexPatternSetResponse = Shapes::StructureShape.new(name: 'CreateRegexPatternSetResponse')
+    CreateRuleGroupRequest = Shapes::StructureShape.new(name: 'CreateRuleGroupRequest')
+    CreateRuleGroupResponse = Shapes::StructureShape.new(name: 'CreateRuleGroupResponse')
     CreateRuleRequest = Shapes::StructureShape.new(name: 'CreateRuleRequest')
     CreateRuleResponse = Shapes::StructureShape.new(name: 'CreateRuleResponse')
     CreateSizeConstraintSetRequest = Shapes::StructureShape.new(name: 'CreateSizeConstraintSetRequest')
@@ -61,6 +63,8 @@ module Aws::WAF
     DeleteRegexMatchSetResponse = Shapes::StructureShape.new(name: 'DeleteRegexMatchSetResponse')
     DeleteRegexPatternSetRequest = Shapes::StructureShape.new(name: 'DeleteRegexPatternSetRequest')
     DeleteRegexPatternSetResponse = Shapes::StructureShape.new(name: 'DeleteRegexPatternSetResponse')
+    DeleteRuleGroupRequest = Shapes::StructureShape.new(name: 'DeleteRuleGroupRequest')
+    DeleteRuleGroupResponse = Shapes::StructureShape.new(name: 'DeleteRuleGroupResponse')
     DeleteRuleRequest = Shapes::StructureShape.new(name: 'DeleteRuleRequest')
     DeleteRuleResponse = Shapes::StructureShape.new(name: 'DeleteRuleResponse')
     DeleteSizeConstraintSetRequest = Shapes::StructureShape.new(name: 'DeleteSizeConstraintSetRequest')
@@ -99,6 +103,8 @@ module Aws::WAF
     GetRegexMatchSetResponse = Shapes::StructureShape.new(name: 'GetRegexMatchSetResponse')
     GetRegexPatternSetRequest = Shapes::StructureShape.new(name: 'GetRegexPatternSetRequest')
     GetRegexPatternSetResponse = Shapes::StructureShape.new(name: 'GetRegexPatternSetResponse')
+    GetRuleGroupRequest = Shapes::StructureShape.new(name: 'GetRuleGroupRequest')
+    GetRuleGroupResponse = Shapes::StructureShape.new(name: 'GetRuleGroupResponse')
     GetRuleRequest = Shapes::StructureShape.new(name: 'GetRuleRequest')
     GetRuleResponse = Shapes::StructureShape.new(name: 'GetRuleResponse')
     GetSampledRequestsMaxItems = Shapes::IntegerShape.new(name: 'GetSampledRequestsMaxItems')
@@ -129,6 +135,8 @@ module Aws::WAF
     IPSetUpdate = Shapes::StructureShape.new(name: 'IPSetUpdate')
     IPSetUpdates = Shapes::ListShape.new(name: 'IPSetUpdates')
     IPString = Shapes::StringShape.new(name: 'IPString')
+    ListActivatedRulesInRuleGroupRequest = Shapes::StructureShape.new(name: 'ListActivatedRulesInRuleGroupRequest')
+    ListActivatedRulesInRuleGroupResponse = Shapes::StructureShape.new(name: 'ListActivatedRulesInRuleGroupResponse')
     ListByteMatchSetsRequest = Shapes::StructureShape.new(name: 'ListByteMatchSetsRequest')
     ListByteMatchSetsResponse = Shapes::StructureShape.new(name: 'ListByteMatchSetsResponse')
     ListGeoMatchSetsRequest = Shapes::StructureShape.new(name: 'ListGeoMatchSetsRequest')
@@ -141,12 +149,16 @@ module Aws::WAF
     ListRegexMatchSetsResponse = Shapes::StructureShape.new(name: 'ListRegexMatchSetsResponse')
     ListRegexPatternSetsRequest = Shapes::StructureShape.new(name: 'ListRegexPatternSetsRequest')
     ListRegexPatternSetsResponse = Shapes::StructureShape.new(name: 'ListRegexPatternSetsResponse')
+    ListRuleGroupsRequest = Shapes::StructureShape.new(name: 'ListRuleGroupsRequest')
+    ListRuleGroupsResponse = Shapes::StructureShape.new(name: 'ListRuleGroupsResponse')
     ListRulesRequest = Shapes::StructureShape.new(name: 'ListRulesRequest')
     ListRulesResponse = Shapes::StructureShape.new(name: 'ListRulesResponse')
     ListSizeConstraintSetsRequest = Shapes::StructureShape.new(name: 'ListSizeConstraintSetsRequest')
     ListSizeConstraintSetsResponse = Shapes::StructureShape.new(name: 'ListSizeConstraintSetsResponse')
     ListSqlInjectionMatchSetsRequest = Shapes::StructureShape.new(name: 'ListSqlInjectionMatchSetsRequest')
     ListSqlInjectionMatchSetsResponse = Shapes::StructureShape.new(name: 'ListSqlInjectionMatchSetsResponse')
+    ListSubscribedRuleGroupsRequest = Shapes::StructureShape.new(name: 'ListSubscribedRuleGroupsRequest')
+    ListSubscribedRuleGroupsResponse = Shapes::StructureShape.new(name: 'ListSubscribedRuleGroupsResponse')
     ListWebACLsRequest = Shapes::StructureShape.new(name: 'ListWebACLsRequest')
     ListWebACLsResponse = Shapes::StructureShape.new(name: 'ListWebACLsResponse')
     ListXssMatchSetsRequest = Shapes::StructureShape.new(name: 'ListXssMatchSetsRequest')
@@ -187,6 +199,11 @@ module Aws::WAF
     ResourceId = Shapes::StringShape.new(name: 'ResourceId')
     ResourceName = Shapes::StringShape.new(name: 'ResourceName')
     Rule = Shapes::StructureShape.new(name: 'Rule')
+    RuleGroup = Shapes::StructureShape.new(name: 'RuleGroup')
+    RuleGroupSummaries = Shapes::ListShape.new(name: 'RuleGroupSummaries')
+    RuleGroupSummary = Shapes::StructureShape.new(name: 'RuleGroupSummary')
+    RuleGroupUpdate = Shapes::StructureShape.new(name: 'RuleGroupUpdate')
+    RuleGroupUpdates = Shapes::ListShape.new(name: 'RuleGroupUpdates')
     RulePriority = Shapes::IntegerShape.new(name: 'RulePriority')
     RuleSummaries = Shapes::ListShape.new(name: 'RuleSummaries')
     RuleSummary = Shapes::StructureShape.new(name: 'RuleSummary')
@@ -210,6 +227,8 @@ module Aws::WAF
     SqlInjectionMatchSetUpdates = Shapes::ListShape.new(name: 'SqlInjectionMatchSetUpdates')
     SqlInjectionMatchTuple = Shapes::StructureShape.new(name: 'SqlInjectionMatchTuple')
     SqlInjectionMatchTuples = Shapes::ListShape.new(name: 'SqlInjectionMatchTuples')
+    SubscribedRuleGroupSummaries = Shapes::ListShape.new(name: 'SubscribedRuleGroupSummaries')
+    SubscribedRuleGroupSummary = Shapes::StructureShape.new(name: 'SubscribedRuleGroupSummary')
     TextTransformation = Shapes::StringShape.new(name: 'TextTransformation')
     TimeWindow = Shapes::StructureShape.new(name: 'TimeWindow')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
@@ -226,6 +245,8 @@ module Aws::WAF
     UpdateRegexMatchSetResponse = Shapes::StructureShape.new(name: 'UpdateRegexMatchSetResponse')
     UpdateRegexPatternSetRequest = Shapes::StructureShape.new(name: 'UpdateRegexPatternSetRequest')
     UpdateRegexPatternSetResponse = Shapes::StructureShape.new(name: 'UpdateRegexPatternSetResponse')
+    UpdateRuleGroupRequest = Shapes::StructureShape.new(name: 'UpdateRuleGroupRequest')
+    UpdateRuleGroupResponse = Shapes::StructureShape.new(name: 'UpdateRuleGroupResponse')
     UpdateRuleRequest = Shapes::StructureShape.new(name: 'UpdateRuleRequest')
     UpdateRuleResponse = Shapes::StructureShape.new(name: 'UpdateRuleResponse')
     UpdateSizeConstraintSetRequest = Shapes::StructureShape.new(name: 'UpdateSizeConstraintSetRequest')
@@ -248,8 +269,11 @@ module Aws::WAF
     WAFNonexistentItemException = Shapes::StructureShape.new(name: 'WAFNonexistentItemException')
     WAFReferencedItemException = Shapes::StructureShape.new(name: 'WAFReferencedItemException')
     WAFStaleDataException = Shapes::StructureShape.new(name: 'WAFStaleDataException')
+    WAFSubscriptionNotFoundException = Shapes::StructureShape.new(name: 'WAFSubscriptionNotFoundException')
     WafAction = Shapes::StructureShape.new(name: 'WafAction')
     WafActionType = Shapes::StringShape.new(name: 'WafActionType')
+    WafOverrideAction = Shapes::StructureShape.new(name: 'WafOverrideAction')
+    WafOverrideActionType = Shapes::StringShape.new(name: 'WafOverrideActionType')
     WafRuleType = Shapes::StringShape.new(name: 'WafRuleType')
     WebACL = Shapes::StructureShape.new(name: 'WebACL')
     WebACLSummaries = Shapes::ListShape.new(name: 'WebACLSummaries')
@@ -267,7 +291,8 @@ module Aws::WAF
 
     ActivatedRule.add_member(:priority, Shapes::ShapeRef.new(shape: RulePriority, required: true, location_name: "Priority"))
     ActivatedRule.add_member(:rule_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleId"))
-    ActivatedRule.add_member(:action, Shapes::ShapeRef.new(shape: WafAction, required: true, location_name: "Action"))
+    ActivatedRule.add_member(:action, Shapes::ShapeRef.new(shape: WafAction, location_name: "Action"))
+    ActivatedRule.add_member(:override_action, Shapes::ShapeRef.new(shape: WafOverrideAction, location_name: "OverrideAction"))
     ActivatedRule.add_member(:type, Shapes::ShapeRef.new(shape: WafRuleType, location_name: "Type"))
     ActivatedRule.struct_class = Types::ActivatedRule
 
@@ -349,6 +374,15 @@ module Aws::WAF
     CreateRegexPatternSetResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
     CreateRegexPatternSetResponse.struct_class = Types::CreateRegexPatternSetResponse
 
+    CreateRuleGroupRequest.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "Name"))
+    CreateRuleGroupRequest.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
+    CreateRuleGroupRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
+    CreateRuleGroupRequest.struct_class = Types::CreateRuleGroupRequest
+
+    CreateRuleGroupResponse.add_member(:rule_group, Shapes::ShapeRef.new(shape: RuleGroup, location_name: "RuleGroup"))
+    CreateRuleGroupResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
+    CreateRuleGroupResponse.struct_class = Types::CreateRuleGroupResponse
+
     CreateRuleRequest.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "Name"))
     CreateRuleRequest.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
     CreateRuleRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
@@ -434,6 +468,13 @@ module Aws::WAF
     DeleteRegexPatternSetResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
     DeleteRegexPatternSetResponse.struct_class = Types::DeleteRegexPatternSetResponse
 
+    DeleteRuleGroupRequest.add_member(:rule_group_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleGroupId"))
+    DeleteRuleGroupRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
+    DeleteRuleGroupRequest.struct_class = Types::DeleteRuleGroupRequest
+
+    DeleteRuleGroupResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
+    DeleteRuleGroupResponse.struct_class = Types::DeleteRuleGroupResponse
+
     DeleteRuleRequest.add_member(:rule_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleId"))
     DeleteRuleRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
     DeleteRuleRequest.struct_class = Types::DeleteRuleRequest
@@ -551,6 +592,12 @@ module Aws::WAF
     GetRegexPatternSetResponse.add_member(:regex_pattern_set, Shapes::ShapeRef.new(shape: RegexPatternSet, location_name: "RegexPatternSet"))
     GetRegexPatternSetResponse.struct_class = Types::GetRegexPatternSetResponse
 
+    GetRuleGroupRequest.add_member(:rule_group_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleGroupId"))
+    GetRuleGroupRequest.struct_class = Types::GetRuleGroupRequest
+
+    GetRuleGroupResponse.add_member(:rule_group, Shapes::ShapeRef.new(shape: RuleGroup, location_name: "RuleGroup"))
+    GetRuleGroupResponse.struct_class = Types::GetRuleGroupResponse
+
     GetRuleRequest.add_member(:rule_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleId"))
     GetRuleRequest.struct_class = Types::GetRuleRequest
 
@@ -629,6 +676,15 @@ module Aws::WAF
 
     IPSetUpdates.member = Shapes::ShapeRef.new(shape: IPSetUpdate)
 
+    ListActivatedRulesInRuleGroupRequest.add_member(:rule_group_id, Shapes::ShapeRef.new(shape: ResourceId, location_name: "RuleGroupId"))
+    ListActivatedRulesInRuleGroupRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListActivatedRulesInRuleGroupRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
+    ListActivatedRulesInRuleGroupRequest.struct_class = Types::ListActivatedRulesInRuleGroupRequest
+
+    ListActivatedRulesInRuleGroupResponse.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListActivatedRulesInRuleGroupResponse.add_member(:activated_rules, Shapes::ShapeRef.new(shape: ActivatedRules, location_name: "ActivatedRules"))
+    ListActivatedRulesInRuleGroupResponse.struct_class = Types::ListActivatedRulesInRuleGroupResponse
+
     ListByteMatchSetsRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
     ListByteMatchSetsRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
     ListByteMatchSetsRequest.struct_class = Types::ListByteMatchSetsRequest
@@ -677,6 +733,14 @@ module Aws::WAF
     ListRegexPatternSetsResponse.add_member(:regex_pattern_sets, Shapes::ShapeRef.new(shape: RegexPatternSetSummaries, location_name: "RegexPatternSets"))
     ListRegexPatternSetsResponse.struct_class = Types::ListRegexPatternSetsResponse
 
+    ListRuleGroupsRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListRuleGroupsRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
+    ListRuleGroupsRequest.struct_class = Types::ListRuleGroupsRequest
+
+    ListRuleGroupsResponse.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListRuleGroupsResponse.add_member(:rule_groups, Shapes::ShapeRef.new(shape: RuleGroupSummaries, location_name: "RuleGroups"))
+    ListRuleGroupsResponse.struct_class = Types::ListRuleGroupsResponse
+
     ListRulesRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
     ListRulesRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
     ListRulesRequest.struct_class = Types::ListRulesRequest
@@ -701,6 +765,14 @@ module Aws::WAF
     ListSqlInjectionMatchSetsResponse.add_member(:sql_injection_match_sets, Shapes::ShapeRef.new(shape: SqlInjectionMatchSetSummaries, location_name: "SqlInjectionMatchSets"))
     ListSqlInjectionMatchSetsResponse.struct_class = Types::ListSqlInjectionMatchSetsResponse
 
+    ListSubscribedRuleGroupsRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListSubscribedRuleGroupsRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
+    ListSubscribedRuleGroupsRequest.struct_class = Types::ListSubscribedRuleGroupsRequest
+
+    ListSubscribedRuleGroupsResponse.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListSubscribedRuleGroupsResponse.add_member(:rule_groups, Shapes::ShapeRef.new(shape: SubscribedRuleGroupSummaries, location_name: "RuleGroups"))
+    ListSubscribedRuleGroupsResponse.struct_class = Types::ListSubscribedRuleGroupsResponse
+
     ListWebACLsRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
     ListWebACLsRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
     ListWebACLsRequest.struct_class = Types::ListWebACLsRequest
@@ -783,6 +855,23 @@ module Aws::WAF
     Rule.add_member(:predicates, Shapes::ShapeRef.new(shape: Predicates, required: true, location_name: "Predicates"))
     Rule.struct_class = Types::Rule
 
+    RuleGroup.add_member(:rule_group_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleGroupId"))
+    RuleGroup.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, location_name: "Name"))
+    RuleGroup.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, location_name: "MetricName"))
+    RuleGroup.struct_class = Types::RuleGroup
+
+    RuleGroupSummaries.member = Shapes::ShapeRef.new(shape: RuleGroupSummary)
+
+    RuleGroupSummary.add_member(:rule_group_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleGroupId"))
+    RuleGroupSummary.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "Name"))
+    RuleGroupSummary.struct_class = Types::RuleGroupSummary
+
+    RuleGroupUpdate.add_member(:action, Shapes::ShapeRef.new(shape: ChangeAction, required: true, location_name: "Action"))
+    RuleGroupUpdate.add_member(:activated_rule, Shapes::ShapeRef.new(shape: ActivatedRule, required: true, location_name: "ActivatedRule"))
+    RuleGroupUpdate.struct_class = Types::RuleGroupUpdate
+
+    RuleGroupUpdates.member = Shapes::ShapeRef.new(shape: RuleGroupUpdate)
+
     RuleSummaries.member = Shapes::ShapeRef.new(shape: RuleSummary)
 
     RuleSummary.add_member(:rule_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleId"))
@@ -799,6 +888,7 @@ module Aws::WAF
     SampledHTTPRequest.add_member(:weight, Shapes::ShapeRef.new(shape: SampleWeight, required: true, location_name: "Weight"))
     SampledHTTPRequest.add_member(:timestamp, Shapes::ShapeRef.new(shape: Timestamp, location_name: "Timestamp"))
     SampledHTTPRequest.add_member(:action, Shapes::ShapeRef.new(shape: Action, location_name: "Action"))
+    SampledHTTPRequest.add_member(:rule_within_rule_group, Shapes::ShapeRef.new(shape: ResourceId, location_name: "RuleWithinRuleGroup"))
     SampledHTTPRequest.struct_class = Types::SampledHTTPRequest
 
     SampledHTTPRequests.member = Shapes::ShapeRef.new(shape: SampledHTTPRequest)
@@ -851,6 +941,13 @@ module Aws::WAF
 
     SqlInjectionMatchTuples.member = Shapes::ShapeRef.new(shape: SqlInjectionMatchTuple)
 
+    SubscribedRuleGroupSummaries.member = Shapes::ShapeRef.new(shape: SubscribedRuleGroupSummary)
+
+    SubscribedRuleGroupSummary.add_member(:rule_group_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleGroupId"))
+    SubscribedRuleGroupSummary.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "Name"))
+    SubscribedRuleGroupSummary.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
+    SubscribedRuleGroupSummary.struct_class = Types::SubscribedRuleGroupSummary
+
     TimeWindow.add_member(:start_time, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "StartTime"))
     TimeWindow.add_member(:end_time, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "EndTime"))
     TimeWindow.struct_class = Types::TimeWindow
@@ -904,6 +1001,14 @@ module Aws::WAF
     UpdateRegexPatternSetResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
     UpdateRegexPatternSetResponse.struct_class = Types::UpdateRegexPatternSetResponse
 
+    UpdateRuleGroupRequest.add_member(:rule_group_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleGroupId"))
+    UpdateRuleGroupRequest.add_member(:updates, Shapes::ShapeRef.new(shape: RuleGroupUpdates, required: true, location_name: "Updates"))
+    UpdateRuleGroupRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
+    UpdateRuleGroupRequest.struct_class = Types::UpdateRuleGroupRequest
+
+    UpdateRuleGroupResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
+    UpdateRuleGroupResponse.struct_class = Types::UpdateRuleGroupResponse
+
     UpdateRuleRequest.add_member(:rule_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "RuleId"))
     UpdateRuleRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
     UpdateRuleRequest.add_member(:updates, Shapes::ShapeRef.new(shape: RuleUpdates, required: true, location_name: "Updates"))
@@ -948,6 +1053,9 @@ module Aws::WAF
     WafAction.add_member(:type, Shapes::ShapeRef.new(shape: WafActionType, required: true, location_name: "Type"))
     WafAction.struct_class = Types::WafAction
 
+    WafOverrideAction.add_member(:type, Shapes::ShapeRef.new(shape: WafOverrideActionType, required: true, location_name: "Type"))
+    WafOverrideAction.struct_class = Types::WafOverrideAction
+
     WebACL.add_member(:web_acl_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "WebACLId"))
     WebACL.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, location_name: "Name"))
     WebACL.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, location_name: "MetricName"))
@@ -1097,6 +1205,18 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
       end)
 
+      api.add_operation(:create_rule_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateRuleGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateRuleGroupRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateRuleGroupResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFStaleDataException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFDisallowedNameException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+      end)
+
       api.add_operation(:create_size_constraint_set, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateSizeConstraintSet"
         o.http_method = "POST"
@@ -1251,6 +1371,19 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFNonEmptyEntityException)
       end)
 
+      api.add_operation(:delete_rule_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteRuleGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteRuleGroupRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteRuleGroupResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFStaleDataException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFReferencedItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonEmptyEntityException)
+      end)
+
       api.add_operation(:delete_size_constraint_set, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteSizeConstraintSet"
         o.http_method = "POST"
@@ -1415,6 +1548,16 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
       end)
 
+      api.add_operation(:get_rule_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetRuleGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetRuleGroupRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetRuleGroupResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+      end)
+
       api.add_operation(:get_sampled_requests, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetSampledRequests"
         o.http_method = "POST"
@@ -1469,6 +1612,17 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
       end)
 
+      api.add_operation(:list_activated_rules_in_rule_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListActivatedRulesInRuleGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListActivatedRulesInRuleGroupRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListActivatedRulesInRuleGroupResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
+      end)
+
       api.add_operation(:list_byte_match_sets, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListByteMatchSets"
         o.http_method = "POST"
@@ -1529,6 +1683,15 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidAccountException)
       end)
 
+      api.add_operation(:list_rule_groups, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListRuleGroups"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListRuleGroupsRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListRuleGroupsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+      end)
+
       api.add_operation(:list_rules, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListRules"
         o.http_method = "POST"
@@ -1559,6 +1722,16 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidAccountException)
       end)
 
+      api.add_operation(:list_subscribed_rule_groups, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListSubscribedRuleGroups"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListSubscribedRuleGroupsRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListSubscribedRuleGroupsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+      end)
+
       api.add_operation(:list_web_acls, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListWebACLs"
         o.http_method = "POST"
@@ -1671,6 +1844,7 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFStaleDataException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentContainerException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidOperationException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidAccountException)
@@ -1694,6 +1868,21 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
       end)
 
+      api.add_operation(:update_rule_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UpdateRuleGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: UpdateRuleGroupRequest)
+        o.output = Shapes::ShapeRef.new(shape: UpdateRuleGroupResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFStaleDataException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentContainerException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
+      end)
+
       api.add_operation(:update_size_constraint_set, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UpdateSizeConstraintSet"
         o.http_method = "POST"
@@ -1742,6 +1931,7 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFReferencedItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFSubscriptionNotFoundException)
       end)
 
       api.add_operation(:update_xss_match_set, Seahorse::Model::Operation.new.tap do |o|

data/lib/aws-sdk-waf/types.rb

@@ -22,10 +22,13 @@ module Aws::WAF
     #       {
     #         priority: 1, # required
     #         rule_id: "ResourceId", # required
-    #         action: { # required
+    #         action: {
     #           type: "BLOCK", # required, accepts BLOCK, ALLOW, COUNT
     #         },
-    #         type: "REGULAR", # accepts REGULAR, RATE_BASED
+    #         override_action: {
+    #           type: "NONE", # required, accepts NONE, COUNT
+    #         },
+    #         type: "REGULAR", # accepts REGULAR, RATE_BASED, GROUP
     #       }
     #
     # @!attribute [rw] priority
@@ -58,15 +61,39 @@ module Aws::WAF
     #   * `COUNT`\: AWS WAF increments a counter of requests that match the
     #     conditions in the rule and then continues to inspect the web
     #     request based on the remaining rules in the web ACL.
+    #
+    #   The `Action` data type within `ActivatedRule` is used only when
+    #   submitting an `UpdateWebACL` request. `ActivatedRule|Action` is not
+    #   applicable and therefore not available for `UpdateRuleGroup`.
     #   @return [Types::WafAction]
     #
+    # @!attribute [rw] override_action
+    #   Use the `OverrideAction` to test your `RuleGroup`.
+    #
+    #   Any rule in a `RuleGroup` can potentially block a request. If you
+    #   set the `OverrideAction` to `None`, the `RuleGroup` will block a
+    #   request if any individual rule in the `RuleGroup` matches the
+    #   request and is configured to block that request. However if you
+    #   first want to test the `RuleGroup`, set the `OverrideAction` to
+    #   `Count`. The `RuleGroup` will then override any block action
+    #   specified by individual rules contained within the group. Instead of
+    #   blocking matching requests, those requests will be counted. You can
+    #   view a record of counted requests using GetSampledRequests.
+    #
+    #   The `OverrideAction` data type within `ActivatedRule` is used only
+    #   when submitting an `UpdateRuleGroup` request.
+    #   `ActivatedRule|OverrideAction` is not applicable and therefore not
+    #   available for `UpdateWebACL`.
+    #   @return [Types::WafOverrideAction]
+    #
     # @!attribute [rw] type
-    #   The rule type, either `REGULAR`, as defined by Rule, or
-    #   `RATE_BASED`, as defined by RateBasedRule. The default is REGULAR.
-    #   Although this field is optional, be aware that if you try to add a
-    #   RATE\_BASED rule to a web ACL without setting the type, the
-    #   UpdateWebACL request will fail because the request tries to add a
-    #   REGULAR rule with the specified ID, which does not exist.
+    #   The rule type, either `REGULAR`, as defined by Rule, `RATE_BASED`,
+    #   as defined by RateBasedRule, or `GROUP`, as defined by RuleGroup.
+    #   The default is REGULAR. Although this field is optional, be aware
+    #   that if you try to add a RATE\_BASED rule to a web ACL without
+    #   setting the type, the UpdateWebACL request will fail because the
+    #   request tries to add a REGULAR rule with the specified ID, which
+    #   does not exist.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ActivatedRule AWS API Documentation
@@ -75,6 +102,7 @@ module Aws::WAF
       :priority,
       :rule_id,
       :action,
+      :override_action,
       :type)
       include Aws::Structure
     end
@@ -693,6 +721,58 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateRuleGroupRequest
+    #   data as a hash:
+    #
+    #       {
+    #         name: "ResourceName", # required
+    #         metric_name: "MetricName", # required
+    #         change_token: "ChangeToken", # required
+    #       }
+    #
+    # @!attribute [rw] name
+    #   A friendly name or description of the RuleGroup. You can't change
+    #   `Name` after you create a `RuleGroup`.
+    #   @return [String]
+    #
+    # @!attribute [rw] metric_name
+    #   A friendly name or description for the metrics for this `RuleGroup`.
+    #   The name can contain only alphanumeric characters (A-Z, a-z, 0-9);
+    #   the name can't contain whitespace. You can't change the name of
+    #   the metric after you create the `RuleGroup`.
+    #   @return [String]
+    #
+    # @!attribute [rw] change_token
+    #   The value returned by the most recent call to GetChangeToken.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateRuleGroupRequest AWS API Documentation
+    #
+    class CreateRuleGroupRequest < Struct.new(
+      :name,
+      :metric_name,
+      :change_token)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] rule_group
+    #   An empty RuleGroup.
+    #   @return [Types::RuleGroup]
+    #
+    # @!attribute [rw] change_token
+    #   The `ChangeToken` that you used to submit the `CreateRuleGroup`
+    #   request. You can also use this value to query the status of the
+    #   request. For more information, see GetChangeTokenStatus.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateRuleGroupResponse AWS API Documentation
+    #
+    class CreateRuleGroupResponse < Struct.new(
+      :rule_group,
+      :change_token)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateRuleRequest
     #   data as a hash:
     #
@@ -1181,6 +1261,44 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DeleteRuleGroupRequest
+    #   data as a hash:
+    #
+    #       {
+    #         rule_group_id: "ResourceId", # required
+    #         change_token: "ChangeToken", # required
+    #       }
+    #
+    # @!attribute [rw] rule_group_id
+    #   The `RuleGroupId` of the RuleGroup that you want to delete.
+    #   `RuleGroupId` is returned by CreateRuleGroup and by ListRuleGroups.
+    #   @return [String]
+    #
+    # @!attribute [rw] change_token
+    #   The value returned by the most recent call to GetChangeToken.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/DeleteRuleGroupRequest AWS API Documentation
+    #
+    class DeleteRuleGroupRequest < Struct.new(
+      :rule_group_id,
+      :change_token)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] change_token
+    #   The `ChangeToken` that you used to submit the `DeleteRuleGroup`
+    #   request. You can also use this value to query the status of the
+    #   request. For more information, see GetChangeTokenStatus.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/DeleteRuleGroupResponse AWS API Documentation
+    #
+    class DeleteRuleGroupResponse < Struct.new(
+      :change_token)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DeleteRuleRequest
     #   data as a hash:
     #
@@ -1857,6 +1975,37 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetRuleGroupRequest
+    #   data as a hash:
+    #
+    #       {
+    #         rule_group_id: "ResourceId", # required
+    #       }
+    #
+    # @!attribute [rw] rule_group_id
+    #   The `RuleGroupId` of the RuleGroup that you want to get.
+    #   `RuleGroupId` is returned by CreateRuleGroup and by ListRuleGroups.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/GetRuleGroupRequest AWS API Documentation
+    #
+    class GetRuleGroupRequest < Struct.new(
+      :rule_group_id)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] rule_group
+    #   Information about the RuleGroup that you specified in the
+    #   `GetRuleGroup` request.
+    #   @return [Types::RuleGroup]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/GetRuleGroupResponse AWS API Documentation
+    #
+    class GetRuleGroupResponse < Struct.new(
+      :rule_group)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass GetRuleRequest
     #   data as a hash:
     #
@@ -1913,10 +2062,11 @@ module Aws::WAF
     #   @return [String]
     #
     # @!attribute [rw] rule_id
-    #   `RuleId` is one of two values:
+    #   `RuleId` is one of three values:
     #
-    #   * The `RuleId` of the `Rule` for which you want `GetSampledRequests`
-    #     to return a sample of requests.
+    #   * The `RuleId` of the `Rule` or the `RuleGroupId` of the `RuleGroup`
+    #     for which you want `GetSampledRequests` to return a sample of
+    #     requests.
     #
     #   * `Default_Action`, which causes `GetSampledRequests` to return a
     #     sample of the requests that didn't match any of the rules in the
@@ -2387,6 +2537,68 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ListActivatedRulesInRuleGroupRequest
+    #   data as a hash:
+    #
+    #       {
+    #         rule_group_id: "ResourceId",
+    #         next_marker: "NextMarker",
+    #         limit: 1,
+    #       }
+    #
+    # @!attribute [rw] rule_group_id
+    #   The `RuleGroupId` of the RuleGroup for which you want to get a list
+    #   of ActivatedRule objects.
+    #   @return [String]
+    #
+    # @!attribute [rw] next_marker
+    #   If you specify a value for `Limit` and you have more
+    #   `ActivatedRules` than the value of `Limit`, AWS WAF returns a
+    #   `NextMarker` value in the response that allows you to list another
+    #   group of `ActivatedRules`. For the second and subsequent
+    #   `ListActivatedRulesInRuleGroup` requests, specify the value of
+    #   `NextMarker` from the previous response to get information about
+    #   another batch of `ActivatedRules`.
+    #   @return [String]
+    #
+    # @!attribute [rw] limit
+    #   Specifies the number of `ActivatedRules` that you want AWS WAF to
+    #   return for this request. If you have more `ActivatedRules` than the
+    #   number that you specify for `Limit`, the response includes a
+    #   `NextMarker` value that you can use to get another batch of
+    #   `ActivatedRules`.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListActivatedRulesInRuleGroupRequest AWS API Documentation
+    #
+    class ListActivatedRulesInRuleGroupRequest < Struct.new(
+      :rule_group_id,
+      :next_marker,
+      :limit)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_marker
+    #   If you have more `ActivatedRules` than the number that you specified
+    #   for `Limit` in the request, the response includes a `NextMarker`
+    #   value. To list more `ActivatedRules`, submit another
+    #   `ListActivatedRulesInRuleGroup` request, and specify the
+    #   `NextMarker` value from the response in the `NextMarker` value in
+    #   the next request.
+    #   @return [String]
+    #
+    # @!attribute [rw] activated_rules
+    #   An array of `ActivatedRules` objects.
+    #   @return [Array<Types::ActivatedRule>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListActivatedRulesInRuleGroupResponse AWS API Documentation
+    #
+    class ListActivatedRulesInRuleGroupResponse < Struct.new(
+      :next_marker,
+      :activated_rules)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListByteMatchSetsRequest
     #   data as a hash:
     #
@@ -2709,6 +2921,58 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ListRuleGroupsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         next_marker: "NextMarker",
+    #         limit: 1,
+    #       }
+    #
+    # @!attribute [rw] next_marker
+    #   If you specify a value for `Limit` and you have more `RuleGroups`
+    #   than the value of `Limit`, AWS WAF returns a `NextMarker` value in
+    #   the response that allows you to list another group of `RuleGroups`.
+    #   For the second and subsequent `ListRuleGroups` requests, specify the
+    #   value of `NextMarker` from the previous response to get information
+    #   about another batch of `RuleGroups`.
+    #   @return [String]
+    #
+    # @!attribute [rw] limit
+    #   Specifies the number of `RuleGroups` that you want AWS WAF to return
+    #   for this request. If you have more `RuleGroups` than the number that
+    #   you specify for `Limit`, the response includes a `NextMarker` value
+    #   that you can use to get another batch of `RuleGroups`.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListRuleGroupsRequest AWS API Documentation
+    #
+    class ListRuleGroupsRequest < Struct.new(
+      :next_marker,
+      :limit)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_marker
+    #   If you have more `RuleGroups` than the number that you specified for
+    #   `Limit` in the request, the response includes a `NextMarker` value.
+    #   To list more `RuleGroups`, submit another `ListRuleGroups` request,
+    #   and specify the `NextMarker` value from the response in the
+    #   `NextMarker` value in the next request.
+    #   @return [String]
+    #
+    # @!attribute [rw] rule_groups
+    #   An array of RuleGroup objects.
+    #   @return [Array<Types::RuleGroupSummary>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListRuleGroupsResponse AWS API Documentation
+    #
+    class ListRuleGroupsResponse < Struct.new(
+      :next_marker,
+      :rule_groups)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListRulesRequest
     #   data as a hash:
     #
@@ -2876,6 +3140,59 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ListSubscribedRuleGroupsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         next_marker: "NextMarker",
+    #         limit: 1,
+    #       }
+    #
+    # @!attribute [rw] next_marker
+    #   If you specify a value for `Limit` and you have more
+    #   `ByteMatchSets`subscribed rule groups than the value of `Limit`, AWS
+    #   WAF returns a `NextMarker` value in the response that allows you to
+    #   list another group of subscribed rule groups. For the second and
+    #   subsequent `ListSubscribedRuleGroupsRequest` requests, specify the
+    #   value of `NextMarker` from the previous response to get information
+    #   about another batch of subscribed rule groups.
+    #   @return [String]
+    #
+    # @!attribute [rw] limit
+    #   Specifies the number of subscribed rule groups that you want AWS WAF
+    #   to return for this request. If you have more objects than the number
+    #   you specify for `Limit`, the response includes a `NextMarker` value
+    #   that you can use to get another batch of objects.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListSubscribedRuleGroupsRequest AWS API Documentation
+    #
+    class ListSubscribedRuleGroupsRequest < Struct.new(
+      :next_marker,
+      :limit)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_marker
+    #   If you have more objects than the number that you specified for
+    #   `Limit` in the request, the response includes a `NextMarker` value.
+    #   To list more objects, submit another `ListSubscribedRuleGroups`
+    #   request, and specify the `NextMarker` value from the response in the
+    #   `NextMarker` value in the next request.
+    #   @return [String]
+    #
+    # @!attribute [rw] rule_groups
+    #   An array of RuleGroup objects.
+    #   @return [Array<Types::SubscribedRuleGroupSummary>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListSubscribedRuleGroupsResponse AWS API Documentation
+    #
+    class ListSubscribedRuleGroupsResponse < Struct.new(
+      :next_marker,
+      :rule_groups)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListWebACLsRequest
     #   data as a hash:
     #
@@ -3497,6 +3814,115 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # A collection of predefined rules that you can add to a web ACL.
+    #
+    # Rule groups are subject to the following limits:
+    #
+    # * Three rule groups per account. You can request an increase to this
+    #   limit by contacting customer support.
+    #
+    # * One rule group per web ACL.
+    #
+    # * Ten rules per rule group.
+    #
+    # @!attribute [rw] rule_group_id
+    #   A unique identifier for a `RuleGroup`. You use `RuleGroupId` to get
+    #   more information about a `RuleGroup` (see GetRuleGroup), update a
+    #   `RuleGroup` (see UpdateRuleGroup), insert a `RuleGroup` into a
+    #   `WebACL` or delete a one from a `WebACL` (see UpdateWebACL), or
+    #   delete a `RuleGroup` from AWS WAF (see DeleteRuleGroup).
+    #
+    #   `RuleGroupId` is returned by CreateRuleGroup and by ListRuleGroups.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   The friendly name or description for the `RuleGroup`. You can't
+    #   change the name of a `RuleGroup` after you create it.
+    #   @return [String]
+    #
+    # @!attribute [rw] metric_name
+    #   A friendly name or description for the metrics for this `RuleGroup`.
+    #   The name can contain only alphanumeric characters (A-Z, a-z, 0-9);
+    #   the name can't contain whitespace. You can't change the name of
+    #   the metric after you create the `RuleGroup`.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/RuleGroup AWS API Documentation
+    #
+    class RuleGroup < Struct.new(
+      :rule_group_id,
+      :name,
+      :metric_name)
+      include Aws::Structure
+    end
+
+    # Contains the identifier and the friendly name or description of the
+    # `RuleGroup`.
+    #
+    # @!attribute [rw] rule_group_id
+    #   A unique identifier for a `RuleGroup`. You use `RuleGroupId` to get
+    #   more information about a `RuleGroup` (see GetRuleGroup), update a
+    #   `RuleGroup` (see UpdateRuleGroup), insert a `RuleGroup` into a
+    #   `WebACL` or delete one from a `WebACL` (see UpdateWebACL), or delete
+    #   a `RuleGroup` from AWS WAF (see DeleteRuleGroup).
+    #
+    #   `RuleGroupId` is returned by CreateRuleGroup and by ListRuleGroups.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   A friendly name or description of the RuleGroup. You can't change
+    #   the name of a `RuleGroup` after you create it.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/RuleGroupSummary AWS API Documentation
+    #
+    class RuleGroupSummary < Struct.new(
+      :rule_group_id,
+      :name)
+      include Aws::Structure
+    end
+
+    # Specifies an `ActivatedRule` and indicates whether you want to add it
+    # to a `RuleGroup` or delete it from a `RuleGroup`.
+    #
+    # @note When making an API call, you may pass RuleGroupUpdate
+    #   data as a hash:
+    #
+    #       {
+    #         action: "INSERT", # required, accepts INSERT, DELETE
+    #         activated_rule: { # required
+    #           priority: 1, # required
+    #           rule_id: "ResourceId", # required
+    #           action: {
+    #             type: "BLOCK", # required, accepts BLOCK, ALLOW, COUNT
+    #           },
+    #           override_action: {
+    #             type: "NONE", # required, accepts NONE, COUNT
+    #           },
+    #           type: "REGULAR", # accepts REGULAR, RATE_BASED, GROUP
+    #         },
+    #       }
+    #
+    # @!attribute [rw] action
+    #   Specify `INSERT` to add an `ActivatedRule` to a `RuleGroup`. Use
+    #   `DELETE` to remove an `ActivatedRule` from a `RuleGroup`.
+    #   @return [String]
+    #
+    # @!attribute [rw] activated_rule
+    #   The `ActivatedRule` object specifies a `Rule` that you want to
+    #   insert or delete, the priority of the `Rule` in the `WebACL`, and
+    #   the action that you want AWS WAF to take when a web request matches
+    #   the `Rule` (`ALLOW`, `BLOCK`, or `COUNT`).
+    #   @return [Types::ActivatedRule]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/RuleGroupUpdate AWS API Documentation
+    #
+    class RuleGroupUpdate < Struct.new(
+      :action,
+      :activated_rule)
+      include Aws::Structure
+    end
+
     # Contains the identifier and the friendly name or description of the
     # `Rule`.
     #
@@ -3583,13 +4009,21 @@ module Aws::WAF
     #   `BLOCK`, or `COUNT`.
     #   @return [String]
     #
+    # @!attribute [rw] rule_within_rule_group
+    #   This value is returned if the `GetSampledRequests` request specifies
+    #   the ID of a `RuleGroup` rather than the ID of an individual rule.
+    #   `RuleWithinRuleGroup` is the rule within the specified `RuleGroup`
+    #   that matched the request listed in the response.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/SampledHTTPRequest AWS API Documentation
     #
     class SampledHTTPRequest < Struct.new(
       :request,
       :weight,
       :timestamp,
-      :action)
+      :action,
+      :rule_within_rule_group)
       include Aws::Structure
     end
 
@@ -4060,6 +4494,33 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # A summary of the rule groups you are subscribed to.
+    #
+    # @!attribute [rw] rule_group_id
+    #   A unique identifier for a `RuleGroup`.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   A friendly name or description of the `RuleGroup`. You can't change
+    #   the name of a `RuleGroup` after you create it.
+    #   @return [String]
+    #
+    # @!attribute [rw] metric_name
+    #   A friendly name or description for the metrics for this `RuleGroup`.
+    #   The name can contain only alphanumeric characters (A-Z, a-z, 0-9);
+    #   the name can't contain whitespace. You can't change the name of
+    #   the metric after you create the `RuleGroup`.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/SubscribedRuleGroupSummary AWS API Documentation
+    #
+    class SubscribedRuleGroupSummary < Struct.new(
+      :rule_group_id,
+      :name,
+      :metric_name)
+      include Aws::Structure
+    end
+
     # In a GetSampledRequests request, the `StartTime` and `EndTime` objects
     # specify the time range for which you want AWS WAF to return a sample
     # of web requests.
@@ -4469,6 +4930,72 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass UpdateRuleGroupRequest
+    #   data as a hash:
+    #
+    #       {
+    #         rule_group_id: "ResourceId", # required
+    #         updates: [ # required
+    #           {
+    #             action: "INSERT", # required, accepts INSERT, DELETE
+    #             activated_rule: { # required
+    #               priority: 1, # required
+    #               rule_id: "ResourceId", # required
+    #               action: {
+    #                 type: "BLOCK", # required, accepts BLOCK, ALLOW, COUNT
+    #               },
+    #               override_action: {
+    #                 type: "NONE", # required, accepts NONE, COUNT
+    #               },
+    #               type: "REGULAR", # accepts REGULAR, RATE_BASED, GROUP
+    #             },
+    #           },
+    #         ],
+    #         change_token: "ChangeToken", # required
+    #       }
+    #
+    # @!attribute [rw] rule_group_id
+    #   The `RuleGroupId` of the RuleGroup that you want to update.
+    #   `RuleGroupId` is returned by CreateRuleGroup and by ListRuleGroups.
+    #   @return [String]
+    #
+    # @!attribute [rw] updates
+    #   An array of `RuleGroupUpdate` objects that you want to insert into
+    #   or delete from a RuleGroup.
+    #
+    #   You can only insert `REGULAR` rules into a rule group.
+    #
+    #   The `Action` data type within `ActivatedRule` is used only when
+    #   submitting an `UpdateWebACL` request. `ActivatedRule|Action` is not
+    #   applicable and therefore not available for `UpdateRuleGroup`.
+    #   @return [Array<Types::RuleGroupUpdate>]
+    #
+    # @!attribute [rw] change_token
+    #   The value returned by the most recent call to GetChangeToken.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/UpdateRuleGroupRequest AWS API Documentation
+    #
+    class UpdateRuleGroupRequest < Struct.new(
+      :rule_group_id,
+      :updates,
+      :change_token)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] change_token
+    #   The `ChangeToken` that you used to submit the `UpdateRuleGroup`
+    #   request. You can also use this value to query the status of the
+    #   request. For more information, see GetChangeTokenStatus.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/UpdateRuleGroupResponse AWS API Documentation
+    #
+    class UpdateRuleGroupResponse < Struct.new(
+      :change_token)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass UpdateRuleRequest
     #   data as a hash:
     #
@@ -4681,10 +5208,13 @@ module Aws::WAF
     #             activated_rule: { # required
     #               priority: 1, # required
     #               rule_id: "ResourceId", # required
-    #               action: { # required
+    #               action: {
     #                 type: "BLOCK", # required, accepts BLOCK, ALLOW, COUNT
     #               },
-    #               type: "REGULAR", # accepts REGULAR, RATE_BASED
+    #               override_action: {
+    #                 type: "NONE", # required, accepts NONE, COUNT
+    #               },
+    #               type: "REGULAR", # accepts REGULAR, RATE_BASED, GROUP
     #             },
     #           },
     #         ],
@@ -4711,7 +5241,11 @@ module Aws::WAF
     #
     #   * WebACLUpdate: Contains `Action` and `ActivatedRule`
     #
-    #   * ActivatedRule: Contains `Action`, `Priority`, `RuleId`, and `Type`
+    #   * ActivatedRule: Contains `Action`, `Priority`, `RuleId`, and
+    #     `Type`. The `OverrideAction` data type within `ActivatedRule` is
+    #     used only when submitting an `UpdateRuleGroup` request.
+    #     `ActivatedRule|OverrideAction` is not applicable and therefore not
+    #     available for `UpdateWebACL`.
     #
     #   * WafAction: Contains `Type`
     #   @return [Array<Types::WebACLUpdate>]
@@ -4849,6 +5383,29 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # The action to take if any rule within the `RuleGroup` matches a
+    # request.
+    #
+    # @note When making an API call, you may pass WafOverrideAction
+    #   data as a hash:
+    #
+    #       {
+    #         type: "NONE", # required, accepts NONE, COUNT
+    #       }
+    #
+    # @!attribute [rw] type
+    #   `COUNT` overrides the action specified by the individual rule within
+    #   a `RuleGroup` . If set to `NONE`, the rule's action will take
+    #   place.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/WafOverrideAction AWS API Documentation
+    #
+    class WafOverrideAction < Struct.new(
+      :type)
+      include Aws::Structure
+    end
+
     # Contains the `Rules` that identify the requests that you want to
     # allow, block, or count. In a `WebACL`, you also specify a default
     # action (`ALLOW` or `BLOCK`), and the action for each `Rule` that you
@@ -4937,10 +5494,13 @@ module Aws::WAF
     #         activated_rule: { # required
     #           priority: 1, # required
     #           rule_id: "ResourceId", # required
-    #           action: { # required
+    #           action: {
     #             type: "BLOCK", # required, accepts BLOCK, ALLOW, COUNT
     #           },
-    #           type: "REGULAR", # accepts REGULAR, RATE_BASED
+    #           override_action: {
+    #             type: "NONE", # required, accepts NONE, COUNT
+    #           },
+    #           type: "REGULAR", # accepts REGULAR, RATE_BASED, GROUP
     #         },
     #       }
     #