aws-sdk-wafv2 1.14.0 → 1.19.0

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -14,6 +14,7 @@ module Aws::WAFV2
     include Seahorse::Model
 
     Action = Shapes::StringShape.new(name: 'Action')
+    All = Shapes::StructureShape.new(name: 'All')
     AllQueryArguments = Shapes::StructureShape.new(name: 'AllQueryArguments')
     AllowAction = Shapes::StructureShape.new(name: 'AllowAction')
     AndStatement = Shapes::StructureShape.new(name: 'AndStatement')
@@ -21,6 +22,7 @@ module Aws::WAFV2
     AssociateWebACLResponse = Shapes::StructureShape.new(name: 'AssociateWebACLResponse')
     BlockAction = Shapes::StructureShape.new(name: 'BlockAction')
     Body = Shapes::StructureShape.new(name: 'Body')
+    BodyParsingFallbackBehavior = Shapes::StringShape.new(name: 'BodyParsingFallbackBehavior')
     Boolean = Shapes::BooleanShape.new(name: 'Boolean')
     ByteMatchStatement = Shapes::StructureShape.new(name: 'ByteMatchStatement')
     CapacityUnit = Shapes::IntegerShape.new(name: 'CapacityUnit')
@@ -40,6 +42,14 @@ module Aws::WAFV2
     CreateRuleGroupResponse = Shapes::StructureShape.new(name: 'CreateRuleGroupResponse')
     CreateWebACLRequest = Shapes::StructureShape.new(name: 'CreateWebACLRequest')
     CreateWebACLResponse = Shapes::StructureShape.new(name: 'CreateWebACLResponse')
+    CustomHTTPHeader = Shapes::StructureShape.new(name: 'CustomHTTPHeader')
+    CustomHTTPHeaderName = Shapes::StringShape.new(name: 'CustomHTTPHeaderName')
+    CustomHTTPHeaderValue = Shapes::StringShape.new(name: 'CustomHTTPHeaderValue')
+    CustomHTTPHeaders = Shapes::ListShape.new(name: 'CustomHTTPHeaders')
+    CustomRequestHandling = Shapes::StructureShape.new(name: 'CustomRequestHandling')
+    CustomResponse = Shapes::StructureShape.new(name: 'CustomResponse')
+    CustomResponseBodies = Shapes::MapShape.new(name: 'CustomResponseBodies')
+    CustomResponseBody = Shapes::StructureShape.new(name: 'CustomResponseBody')
     DefaultAction = Shapes::StructureShape.new(name: 'DefaultAction')
     DeleteFirewallManagerRuleGroupsRequest = Shapes::StructureShape.new(name: 'DeleteFirewallManagerRuleGroupsRequest')
     DeleteFirewallManagerRuleGroupsResponse = Shapes::StructureShape.new(name: 'DeleteFirewallManagerRuleGroupsResponse')
@@ -110,6 +120,11 @@ module Aws::WAFV2
     IPSetSummaries = Shapes::ListShape.new(name: 'IPSetSummaries')
     IPSetSummary = Shapes::StructureShape.new(name: 'IPSetSummary')
     IPString = Shapes::StringShape.new(name: 'IPString')
+    JsonBody = Shapes::StructureShape.new(name: 'JsonBody')
+    JsonMatchPattern = Shapes::StructureShape.new(name: 'JsonMatchPattern')
+    JsonMatchScope = Shapes::StringShape.new(name: 'JsonMatchScope')
+    JsonPointerPath = Shapes::StringShape.new(name: 'JsonPointerPath')
+    JsonPointerPaths = Shapes::ListShape.new(name: 'JsonPointerPaths')
     ListAvailableManagedRuleGroupsRequest = Shapes::StructureShape.new(name: 'ListAvailableManagedRuleGroupsRequest')
     ListAvailableManagedRuleGroupsResponse = Shapes::StructureShape.new(name: 'ListAvailableManagedRuleGroupsResponse')
     ListIPSetsRequest = Shapes::StructureShape.new(name: 'ListIPSetsRequest')
@@ -167,6 +182,9 @@ module Aws::WAFV2
     ResourceArn = Shapes::StringShape.new(name: 'ResourceArn')
     ResourceArns = Shapes::ListShape.new(name: 'ResourceArns')
     ResourceType = Shapes::StringShape.new(name: 'ResourceType')
+    ResponseContent = Shapes::StringShape.new(name: 'ResponseContent')
+    ResponseContentType = Shapes::StringShape.new(name: 'ResponseContentType')
+    ResponseStatusCode = Shapes::IntegerShape.new(name: 'ResponseStatusCode')
     Rule = Shapes::StructureShape.new(name: 'Rule')
     RuleAction = Shapes::StructureShape.new(name: 'RuleAction')
     RuleGroup = Shapes::StructureShape.new(name: 'RuleGroup')
@@ -237,8 +255,11 @@ module Aws::WAFV2
     WebACLSummary = Shapes::StructureShape.new(name: 'WebACLSummary')
     XssMatchStatement = Shapes::StructureShape.new(name: 'XssMatchStatement')
 
+    All.struct_class = Types::All
+
     AllQueryArguments.struct_class = Types::AllQueryArguments
 
+    AllowAction.add_member(:custom_request_handling, Shapes::ShapeRef.new(shape: CustomRequestHandling, location_name: "CustomRequestHandling"))
     AllowAction.struct_class = Types::AllowAction
 
     AndStatement.add_member(:statements, Shapes::ShapeRef.new(shape: Statements, required: true, location_name: "Statements"))
@@ -250,6 +271,7 @@ module Aws::WAFV2
 
     AssociateWebACLResponse.struct_class = Types::AssociateWebACLResponse
 
+    BlockAction.add_member(:custom_response, Shapes::ShapeRef.new(shape: CustomResponse, location_name: "CustomResponse"))
     BlockAction.struct_class = Types::BlockAction
 
     Body.struct_class = Types::Body
@@ -267,6 +289,7 @@ module Aws::WAFV2
     CheckCapacityResponse.add_member(:capacity, Shapes::ShapeRef.new(shape: ConsumedCapacity, location_name: "Capacity"))
     CheckCapacityResponse.struct_class = Types::CheckCapacityResponse
 
+    CountAction.add_member(:custom_request_handling, Shapes::ShapeRef.new(shape: CustomRequestHandling, location_name: "CustomRequestHandling"))
     CountAction.struct_class = Types::CountAction
 
     CountryCodes.member = Shapes::ShapeRef.new(shape: CountryCode)
@@ -299,6 +322,7 @@ module Aws::WAFV2
     CreateRuleGroupRequest.add_member(:rules, Shapes::ShapeRef.new(shape: Rules, location_name: "Rules"))
     CreateRuleGroupRequest.add_member(:visibility_config, Shapes::ShapeRef.new(shape: VisibilityConfig, required: true, location_name: "VisibilityConfig"))
     CreateRuleGroupRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
+    CreateRuleGroupRequest.add_member(:custom_response_bodies, Shapes::ShapeRef.new(shape: CustomResponseBodies, location_name: "CustomResponseBodies"))
     CreateRuleGroupRequest.struct_class = Types::CreateRuleGroupRequest
 
     CreateRuleGroupResponse.add_member(:summary, Shapes::ShapeRef.new(shape: RuleGroupSummary, location_name: "Summary"))
@@ -311,11 +335,33 @@ module Aws::WAFV2
     CreateWebACLRequest.add_member(:rules, Shapes::ShapeRef.new(shape: Rules, location_name: "Rules"))
     CreateWebACLRequest.add_member(:visibility_config, Shapes::ShapeRef.new(shape: VisibilityConfig, required: true, location_name: "VisibilityConfig"))
     CreateWebACLRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
+    CreateWebACLRequest.add_member(:custom_response_bodies, Shapes::ShapeRef.new(shape: CustomResponseBodies, location_name: "CustomResponseBodies"))
     CreateWebACLRequest.struct_class = Types::CreateWebACLRequest
 
     CreateWebACLResponse.add_member(:summary, Shapes::ShapeRef.new(shape: WebACLSummary, location_name: "Summary"))
     CreateWebACLResponse.struct_class = Types::CreateWebACLResponse
 
+    CustomHTTPHeader.add_member(:name, Shapes::ShapeRef.new(shape: CustomHTTPHeaderName, required: true, location_name: "Name"))
+    CustomHTTPHeader.add_member(:value, Shapes::ShapeRef.new(shape: CustomHTTPHeaderValue, required: true, location_name: "Value"))
+    CustomHTTPHeader.struct_class = Types::CustomHTTPHeader
+
+    CustomHTTPHeaders.member = Shapes::ShapeRef.new(shape: CustomHTTPHeader)
+
+    CustomRequestHandling.add_member(:insert_headers, Shapes::ShapeRef.new(shape: CustomHTTPHeaders, required: true, location_name: "InsertHeaders"))
+    CustomRequestHandling.struct_class = Types::CustomRequestHandling
+
+    CustomResponse.add_member(:response_code, Shapes::ShapeRef.new(shape: ResponseStatusCode, required: true, location_name: "ResponseCode"))
+    CustomResponse.add_member(:custom_response_body_key, Shapes::ShapeRef.new(shape: EntityName, location_name: "CustomResponseBodyKey"))
+    CustomResponse.add_member(:response_headers, Shapes::ShapeRef.new(shape: CustomHTTPHeaders, location_name: "ResponseHeaders"))
+    CustomResponse.struct_class = Types::CustomResponse
+
+    CustomResponseBodies.key = Shapes::ShapeRef.new(shape: EntityName)
+    CustomResponseBodies.value = Shapes::ShapeRef.new(shape: CustomResponseBody)
+
+    CustomResponseBody.add_member(:content_type, Shapes::ShapeRef.new(shape: ResponseContentType, required: true, location_name: "ContentType"))
+    CustomResponseBody.add_member(:content, Shapes::ShapeRef.new(shape: ResponseContent, required: true, location_name: "Content"))
+    CustomResponseBody.struct_class = Types::CustomResponseBody
+
     DefaultAction.add_member(:block, Shapes::ShapeRef.new(shape: BlockAction, location_name: "Block"))
     DefaultAction.add_member(:allow, Shapes::ShapeRef.new(shape: AllowAction, location_name: "Allow"))
     DefaultAction.struct_class = Types::DefaultAction
@@ -395,6 +441,7 @@ module Aws::WAFV2
     FieldToMatch.add_member(:query_string, Shapes::ShapeRef.new(shape: QueryString, location_name: "QueryString"))
     FieldToMatch.add_member(:body, Shapes::ShapeRef.new(shape: Body, location_name: "Body"))
     FieldToMatch.add_member(:method, Shapes::ShapeRef.new(shape: Method, location_name: "Method"))
+    FieldToMatch.add_member(:json_body, Shapes::ShapeRef.new(shape: JsonBody, location_name: "JsonBody"))
     FieldToMatch.struct_class = Types::FieldToMatch
 
     FirewallManagerRuleGroup.add_member(:name, Shapes::ShapeRef.new(shape: EntityName, required: true, location_name: "Name"))
@@ -536,6 +583,17 @@ module Aws::WAFV2
     IPSetSummary.add_member(:arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ARN"))
     IPSetSummary.struct_class = Types::IPSetSummary
 
+    JsonBody.add_member(:match_pattern, Shapes::ShapeRef.new(shape: JsonMatchPattern, required: true, location_name: "MatchPattern"))
+    JsonBody.add_member(:match_scope, Shapes::ShapeRef.new(shape: JsonMatchScope, required: true, location_name: "MatchScope"))
+    JsonBody.add_member(:invalid_fallback_behavior, Shapes::ShapeRef.new(shape: BodyParsingFallbackBehavior, location_name: "InvalidFallbackBehavior"))
+    JsonBody.struct_class = Types::JsonBody
+
+    JsonMatchPattern.add_member(:all, Shapes::ShapeRef.new(shape: All, location_name: "All"))
+    JsonMatchPattern.add_member(:included_paths, Shapes::ShapeRef.new(shape: JsonPointerPaths, location_name: "IncludedPaths"))
+    JsonMatchPattern.struct_class = Types::JsonMatchPattern
+
+    JsonPointerPaths.member = Shapes::ShapeRef.new(shape: JsonPointerPath)
+
     ListAvailableManagedRuleGroupsRequest.add_member(:scope, Shapes::ShapeRef.new(shape: Scope, required: true, location_name: "Scope"))
     ListAvailableManagedRuleGroupsRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
     ListAvailableManagedRuleGroupsRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
@@ -716,6 +774,7 @@ module Aws::WAFV2
     RuleGroup.add_member(:description, Shapes::ShapeRef.new(shape: EntityDescription, location_name: "Description"))
     RuleGroup.add_member(:rules, Shapes::ShapeRef.new(shape: Rules, location_name: "Rules"))
     RuleGroup.add_member(:visibility_config, Shapes::ShapeRef.new(shape: VisibilityConfig, required: true, location_name: "VisibilityConfig"))
+    RuleGroup.add_member(:custom_response_bodies, Shapes::ShapeRef.new(shape: CustomResponseBodies, location_name: "CustomResponseBodies"))
     RuleGroup.struct_class = Types::RuleGroup
 
     RuleGroupReferenceStatement.add_member(:arn, Shapes::ShapeRef.new(shape: ResourceArn, required: true, location_name: "ARN"))
@@ -744,6 +803,8 @@ module Aws::WAFV2
     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_name_within_rule_group, Shapes::ShapeRef.new(shape: EntityName, location_name: "RuleNameWithinRuleGroup"))
+    SampledHTTPRequest.add_member(:request_headers_inserted, Shapes::ShapeRef.new(shape: HTTPHeaders, location_name: "RequestHeadersInserted"))
+    SampledHTTPRequest.add_member(:response_code_sent, Shapes::ShapeRef.new(shape: ResponseStatusCode, location_name: "ResponseCodeSent"))
     SampledHTTPRequest.struct_class = Types::SampledHTTPRequest
 
     SampledHTTPRequests.member = Shapes::ShapeRef.new(shape: SampledHTTPRequest)
@@ -844,6 +905,7 @@ module Aws::WAFV2
     UpdateRuleGroupRequest.add_member(:rules, Shapes::ShapeRef.new(shape: Rules, location_name: "Rules"))
     UpdateRuleGroupRequest.add_member(:visibility_config, Shapes::ShapeRef.new(shape: VisibilityConfig, required: true, location_name: "VisibilityConfig"))
     UpdateRuleGroupRequest.add_member(:lock_token, Shapes::ShapeRef.new(shape: LockToken, required: true, location_name: "LockToken"))
+    UpdateRuleGroupRequest.add_member(:custom_response_bodies, Shapes::ShapeRef.new(shape: CustomResponseBodies, location_name: "CustomResponseBodies"))
     UpdateRuleGroupRequest.struct_class = Types::UpdateRuleGroupRequest
 
     UpdateRuleGroupResponse.add_member(:next_lock_token, Shapes::ShapeRef.new(shape: LockToken, location_name: "NextLockToken"))
@@ -857,6 +919,7 @@ module Aws::WAFV2
     UpdateWebACLRequest.add_member(:rules, Shapes::ShapeRef.new(shape: Rules, location_name: "Rules"))
     UpdateWebACLRequest.add_member(:visibility_config, Shapes::ShapeRef.new(shape: VisibilityConfig, required: true, location_name: "VisibilityConfig"))
     UpdateWebACLRequest.add_member(:lock_token, Shapes::ShapeRef.new(shape: LockToken, required: true, location_name: "LockToken"))
+    UpdateWebACLRequest.add_member(:custom_response_bodies, Shapes::ShapeRef.new(shape: CustomResponseBodies, location_name: "CustomResponseBodies"))
     UpdateWebACLRequest.struct_class = Types::UpdateWebACLRequest
 
     UpdateWebACLResponse.add_member(:next_lock_token, Shapes::ShapeRef.new(shape: LockToken, location_name: "NextLockToken"))
@@ -928,6 +991,7 @@ module Aws::WAFV2
     WebACL.add_member(:pre_process_firewall_manager_rule_groups, Shapes::ShapeRef.new(shape: FirewallManagerRuleGroups, location_name: "PreProcessFirewallManagerRuleGroups"))
     WebACL.add_member(:post_process_firewall_manager_rule_groups, Shapes::ShapeRef.new(shape: FirewallManagerRuleGroups, location_name: "PostProcessFirewallManagerRuleGroups"))
     WebACL.add_member(:managed_by_firewall_manager, Shapes::ShapeRef.new(shape: Boolean, location_name: "ManagedByFirewallManager"))
+    WebACL.add_member(:custom_response_bodies, Shapes::ShapeRef.new(shape: CustomResponseBodies, location_name: "CustomResponseBodies"))
     WebACL.struct_class = Types::WebACL
 
     WebACLSummaries.member = Shapes::ShapeRef.new(shape: WebACLSummary)

data/lib/aws-sdk-wafv2/errors.rb

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

data/lib/aws-sdk-wafv2/resource.rb

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,28 +3,30 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
 module Aws::WAFV2
   module Types
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
-    # All query arguments of a web request.
+    # Inspect all of the elements that AWS WAF has parsed and extracted from
+    # the web request JSON body that are within the JsonBody `MatchScope`.
+    # This is used with the FieldToMatch option `JsonBody`.
     #
     # This is used only to indicate the web request component for AWS WAF to
     # inspect, in the FieldToMatch specification.
     #
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/All AWS API Documentation
     #
+    class All < Aws::EmptyStructure; end
+
+    # All query arguments of a web request.
     #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    # This is used only to indicate the web request component for AWS WAF to
+    # inspect, in the FieldToMatch specification.
     #
     # @api private
     #
@@ -32,43 +34,51 @@ module Aws::WAFV2
     #
     class AllQueryArguments < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
+    # Specifies that AWS WAF should allow the request and optionally defines
+    # additional custom handling for the request.
     #
-    #  </note>
+    # This is used in the context of other settings, for example to specify
+    # values for RuleAction and web ACL DefaultAction.
     #
-    # Specifies that AWS WAF should allow requests.
+    # @note When making an API call, you may pass AllowAction
+    #   data as a hash:
     #
-    # This is used only in the context of other settings, for example to
-    # specify values for RuleAction and web ACL DefaultAction.
+    #       {
+    #         custom_request_handling: {
+    #           insert_headers: [ # required
+    #             {
+    #               name: "CustomHTTPHeaderName", # required
+    #               value: "CustomHTTPHeaderValue", # required
+    #             },
+    #           ],
+    #         },
+    #       }
     #
+    # @!attribute [rw] custom_request_handling
+    #   Defines custom handling for the web request.
     #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
     #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
     #
-    # @api private
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   @return [Types::CustomRequestHandling]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/AllowAction AWS API Documentation
     #
-    class AllowAction < Aws::EmptyStructure; end
+    class AllowAction < Struct.new(
+      :custom_request_handling)
+      SENSITIVE = []
+      include Aws::Structure
+    end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A logical rule statement used to combine other rule statements with
     # AND logic. You provide more than one Statement within the
     # `AndStatement`.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass AndStatement
     #   data as a hash:
     #
@@ -94,6 +104,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -121,6 +140,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -147,6 +175,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -173,6 +210,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #               size: 1, # required
@@ -225,6 +271,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -328,58 +383,61 @@ module Aws::WAFV2
     #
     class AssociateWebACLResponse < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
+    # Specifies that AWS WAF should block the request and optionally defines
+    # additional custom handling for the response to the web request.
     #
-    #  </note>
+    # This is used in the context of other settings, for example to specify
+    # values for RuleAction and web ACL DefaultAction.
+    #
+    # @note When making an API call, you may pass BlockAction
+    #   data as a hash:
     #
-    # Specifies that AWS WAF should block requests.
+    #       {
+    #         custom_response: {
+    #           response_code: 1, # required
+    #           custom_response_body_key: "EntityName",
+    #           response_headers: [
+    #             {
+    #               name: "CustomHTTPHeaderName", # required
+    #               value: "CustomHTTPHeaderValue", # required
+    #             },
+    #           ],
+    #         },
+    #       }
     #
-    # This is used only in the context of other settings, for example to
-    # specify values for RuleAction and web ACL DefaultAction.
+    # @!attribute [rw] custom_response
+    #   Defines a custom response for the web request.
     #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
     #
     #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
     #
-    # @api private
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   @return [Types::CustomResponse]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/BlockAction AWS API Documentation
     #
-    class BlockAction < Aws::EmptyStructure; end
+    class BlockAction < Struct.new(
+      :custom_response)
+      SENSITIVE = []
+      include Aws::Structure
+    end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The body of a web request. This immediately follows the request
     # headers.
     #
     # This is used only to indicate the web request component for AWS WAF to
     # inspect, in the FieldToMatch specification.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @api private
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/Body AWS API Documentation
     #
     class Body < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement that defines a string match search for AWS WAF to
     # apply to web requests. The byte match statement provides the bytes to
     # search for, the location in requests that you want AWS WAF to search,
@@ -387,10 +445,6 @@ module Aws::WAFV2
     # that corresponds with ASCII characters. In the AWS WAF console and the
     # developer guide, this is refered to as a string match statement.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass ByteMatchStatement
     #   data as a hash:
     #
@@ -413,6 +467,15 @@ module Aws::WAFV2
     #           },
     #           method: {
     #           },
+    #           json_body: {
+    #             match_pattern: { # required
+    #               all: {
+    #               },
+    #               included_paths: ["JsonPointerPath"],
+    #             },
+    #             match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #             invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #           },
     #         },
     #         text_transformations: [ # required
     #           {
@@ -554,6 +617,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -581,6 +653,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -607,6 +688,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -633,6 +723,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #                 size: 1, # required
@@ -685,6 +784,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -735,14 +843,48 @@ module Aws::WAFV2
     #             },
     #             action: {
     #               block: {
+    #                 custom_response: {
+    #                   response_code: 1, # required
+    #                   custom_response_body_key: "EntityName",
+    #                   response_headers: [
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               allow: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #             },
     #             override_action: {
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               none: {
     #               },
@@ -797,27 +939,46 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
+    # Specifies that AWS WAF should count the request. Optionally defines
+    # additional custom handling for the request.
     #
-    #  </note>
+    # This is used in the context of other settings, for example to specify
+    # values for RuleAction and web ACL DefaultAction.
     #
-    # Specifies that AWS WAF should count requests.
+    # @note When making an API call, you may pass CountAction
+    #   data as a hash:
+    #
+    #       {
+    #         custom_request_handling: {
+    #           insert_headers: [ # required
+    #             {
+    #               name: "CustomHTTPHeaderName", # required
+    #               value: "CustomHTTPHeaderValue", # required
+    #             },
+    #           ],
+    #         },
+    #       }
     #
-    # This is used only in the context of other settings, for example to
-    # specify values for RuleAction and web ACL DefaultAction.
+    # @!attribute [rw] custom_request_handling
+    #   Defines custom handling for the web request.
     #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
     #
     #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
     #
-    # @api private
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   @return [Types::CustomRequestHandling]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CountAction AWS API Documentation
     #
-    class CountAction < Aws::EmptyStructure; end
+    class CountAction < Struct.new(
+      :custom_request_handling)
+      SENSITIVE = []
+      include Aws::Structure
+    end
 
     # @note When making an API call, you may pass CreateIPSetRequest
     #   data as a hash:
@@ -857,8 +1018,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the IP set that helps with identification. You
-    #   cannot change the description of an IP set after you create it.
+    #   A description of the IP set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] ip_address_version
@@ -868,8 +1028,8 @@ module Aws::WAFV2
     # @!attribute [rw] addresses
     #   Contains an array of strings that specify one or more IP addresses
     #   or blocks of IP addresses in Classless Inter-Domain Routing (CIDR)
-    #   notation. AWS WAF supports all address ranges for IP versions IPv4
-    #   and IPv6.
+    #   notation. AWS WAF supports all IPv4 and IPv6 CIDR ranges except for
+    #   /0.
     #
     #   Examples:
     #
@@ -973,8 +1133,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the set that helps with identification. You cannot
-    #   change the description of a set after you create it.
+    #   A description of the set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] regular_expression_list
@@ -1045,6 +1204,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1072,6 +1240,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1098,6 +1275,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1124,6 +1310,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #                 size: 1, # required
@@ -1176,6 +1371,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1226,14 +1430,48 @@ module Aws::WAFV2
     #             },
     #             action: {
     #               block: {
+    #                 custom_response: {
+    #                   response_code: 1, # required
+    #                   custom_response_body_key: "EntityName",
+    #                   response_headers: [
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               allow: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #             },
     #             override_action: {
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               none: {
     #               },
@@ -1256,6 +1494,12 @@ module Aws::WAFV2
     #             value: "TagValue", # required
     #           },
     #         ],
+    #         custom_response_bodies: {
+    #           "EntityName" => {
+    #             content_type: "TEXT_PLAIN", # required, accepts TEXT_PLAIN, TEXT_HTML, APPLICATION_JSON
+    #             content: "ResponseContent", # required
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] name
@@ -1297,8 +1541,7 @@ module Aws::WAFV2
     #   @return [Integer]
     #
     # @!attribute [rw] description
-    #   A description of the rule group that helps with identification. You
-    #   cannot change the description of a rule group after you create it.
+    #   A description of the rule group that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] rules
@@ -1317,6 +1560,27 @@ module Aws::WAFV2
     #   An array of key:value pairs to associate with the resource.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] custom_response_bodies
+    #   A map of custom response keys and content bodies. When you create a
+    #   rule with a block action, you can send a custom response to the web
+    #   request. You define these for the rule group, and then use them in
+    #   the rules that you define in the rule group.
+    #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][3] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   [3]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   @return [Hash<String,Types::CustomResponseBody>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CreateRuleGroupRequest AWS API Documentation
     #
     class CreateRuleGroupRequest < Struct.new(
@@ -1326,7 +1590,8 @@ module Aws::WAFV2
       :description,
       :rules,
       :visibility_config,
-      :tags)
+      :tags,
+      :custom_response_bodies)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1355,8 +1620,26 @@ module Aws::WAFV2
     #         scope: "CLOUDFRONT", # required, accepts CLOUDFRONT, REGIONAL
     #         default_action: { # required
     #           block: {
+    #             custom_response: {
+    #               response_code: 1, # required
+    #               custom_response_body_key: "EntityName",
+    #               response_headers: [
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #           allow: {
+    #             custom_request_handling: {
+    #               insert_headers: [ # required
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #         },
     #         description: "EntityDescription",
@@ -1384,6 +1667,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1411,6 +1703,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1437,6 +1738,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1463,6 +1773,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #                 size: 1, # required
@@ -1515,6 +1834,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -1565,14 +1893,48 @@ module Aws::WAFV2
     #             },
     #             action: {
     #               block: {
+    #                 custom_response: {
+    #                   response_code: 1, # required
+    #                   custom_response_body_key: "EntityName",
+    #                   response_headers: [
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               allow: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #             },
     #             override_action: {
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               none: {
     #               },
@@ -1595,6 +1957,12 @@ module Aws::WAFV2
     #             value: "TagValue", # required
     #           },
     #         ],
+    #         custom_response_bodies: {
+    #           "EntityName" => {
+    #             content_type: "TEXT_PLAIN", # required, accepts TEXT_PLAIN, TEXT_HTML, APPLICATION_JSON
+    #             content: "ResponseContent", # required
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] name
@@ -1623,8 +1991,7 @@ module Aws::WAFV2
     #   @return [Types::DefaultAction]
     #
     # @!attribute [rw] description
-    #   A description of the Web ACL that helps with identification. You
-    #   cannot change the description of a Web ACL after you create it.
+    #   A description of the Web ACL that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] rules
@@ -1643,6 +2010,27 @@ module Aws::WAFV2
     #   An array of key:value pairs to associate with the resource.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] custom_response_bodies
+    #   A map of custom response keys and content bodies. When you create a
+    #   rule with a block action, you can send a custom response to the web
+    #   request. You define these for the web ACL, and then use them in the
+    #   rules and default actions that you define in the web ACL.
+    #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][3] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   [3]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   @return [Hash<String,Types::CustomResponseBody>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CreateWebACLRequest AWS API Documentation
     #
     class CreateWebACLRequest < Struct.new(
@@ -1652,7 +2040,8 @@ module Aws::WAFV2
       :description,
       :rules,
       :visibility_config,
-      :tags)
+      :tags,
+      :custom_response_bodies)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1672,28 +2061,232 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
+    # A custom header for custom request and response handling. This is used
+    # in CustomResponse and CustomRequestHandling.
     #
-    #  </note>
+    # @note When making an API call, you may pass CustomHTTPHeader
+    #   data as a hash:
     #
-    # In a WebACL, this is the action that you want AWS WAF to perform when
-    # a web request doesn't match any of the rules in the `WebACL`. The
-    # default action must be a terminating action, so count is not allowed.
+    #       {
+    #         name: "CustomHTTPHeaderName", # required
+    #         value: "CustomHTTPHeaderValue", # required
+    #       }
     #
+    # @!attribute [rw] name
+    #   The name of the custom header.
     #
+    #   For custom request header insertion, when AWS WAF inserts the header
+    #   into the request, it prefixes this name `x-amzn-waf-`, to avoid
+    #   confusion with the headers that are already in the request. For
+    #   example, for the header name `sample`, AWS WAF inserts the header
+    #   `x-amzn-waf-sample`.
+    #   @return [String]
     #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    # @!attribute [rw] value
+    #   The value of the custom header.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CustomHTTPHeader AWS API Documentation
+    #
+    class CustomHTTPHeader < Struct.new(
+      :name,
+      :value)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Custom request handling behavior that inserts custom headers into a
+    # web request. You can add custom request handling for the rule actions
+    # allow and count.
+    #
+    # For information about customizing web requests and responses, see
+    # [Customizing web requests and responses in AWS WAF][1] in the [AWS WAF
+    # Developer Guide][2].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
+    # @note When making an API call, you may pass CustomRequestHandling
+    #   data as a hash:
+    #
+    #       {
+    #         insert_headers: [ # required
+    #           {
+    #             name: "CustomHTTPHeaderName", # required
+    #             value: "CustomHTTPHeaderValue", # required
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] insert_headers
+    #   The HTTP headers to insert into the request. Duplicate header names
+    #   are not allowed.
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   @return [Array<Types::CustomHTTPHeader>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CustomRequestHandling AWS API Documentation
+    #
+    class CustomRequestHandling < Struct.new(
+      :insert_headers)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A custom response to send to the client. You can define a custom
+    # response for rule actions and default web ACL actions that are set to
+    # BlockAction.
+    #
+    # For information about customizing web requests and responses, see
+    # [Customizing web requests and responses in AWS WAF][1] in the [AWS WAF
+    # Developer Guide][2].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
+    # @note When making an API call, you may pass CustomResponse
+    #   data as a hash:
+    #
+    #       {
+    #         response_code: 1, # required
+    #         custom_response_body_key: "EntityName",
+    #         response_headers: [
+    #           {
+    #             name: "CustomHTTPHeaderName", # required
+    #             value: "CustomHTTPHeaderValue", # required
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] response_code
+    #   The HTTP status code to return to the client.
+    #
+    #   For a list of status codes that you can use in your custom
+    #   reqponses, see [Supported status codes for custom response][1] in
+    #   the [AWS WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/customizing-the-response-status-codes.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   @return [Integer]
+    #
+    # @!attribute [rw] custom_response_body_key
+    #   References the response body that you want AWS WAF to return to the
+    #   web request client. You can define a custom response for a rule
+    #   action or a default web ACL action that is set to block. To do this,
+    #   you first define the response body key and value in the
+    #   `CustomResponseBodies` setting for the WebACL or RuleGroup where you
+    #   want to use it. Then, in the rule action or web ACL default action
+    #   `BlockAction` setting, you reference the response body using this
+    #   key.
+    #   @return [String]
+    #
+    # @!attribute [rw] response_headers
+    #   The HTTP headers to use in the response. Duplicate header names are
+    #   not allowed.
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   @return [Array<Types::CustomHTTPHeader>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CustomResponse AWS API Documentation
+    #
+    class CustomResponse < Struct.new(
+      :response_code,
+      :custom_response_body_key,
+      :response_headers)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The response body to use in a custom response to a web request. This
+    # is referenced by key from CustomResponse `CustomResponseBodyKey`.
+    #
+    # @note When making an API call, you may pass CustomResponseBody
+    #   data as a hash:
+    #
+    #       {
+    #         content_type: "TEXT_PLAIN", # required, accepts TEXT_PLAIN, TEXT_HTML, APPLICATION_JSON
+    #         content: "ResponseContent", # required
+    #       }
+    #
+    # @!attribute [rw] content_type
+    #   The type of content in the payload that you are defining in the
+    #   `Content` string.
+    #   @return [String]
+    #
+    # @!attribute [rw] content
+    #   The payload of the custom response.
+    #
+    #   You can use JSON escape strings in JSON content. To do this, you
+    #   must specify JSON content in the `ContentType` setting.
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/CustomResponseBody AWS API Documentation
+    #
+    class CustomResponseBody < Struct.new(
+      :content_type,
+      :content)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # In a WebACL, this is the action that you want AWS WAF to perform when
+    # a web request doesn't match any of the rules in the `WebACL`. The
+    # default action must be a terminating action, so you can't use count.
     #
     # @note When making an API call, you may pass DefaultAction
     #   data as a hash:
     #
     #       {
     #         block: {
+    #           custom_response: {
+    #             response_code: 1, # required
+    #             custom_response_body_key: "EntityName",
+    #             response_headers: [
+    #               {
+    #                 name: "CustomHTTPHeaderName", # required
+    #                 value: "CustomHTTPHeaderValue", # required
+    #               },
+    #             ],
+    #           },
     #         },
     #         allow: {
+    #           custom_request_handling: {
+    #             insert_headers: [ # required
+    #               {
+    #                 name: "CustomHTTPHeaderName", # required
+    #                 value: "CustomHTTPHeaderValue", # required
+    #               },
+    #             ],
+    #           },
     #         },
     #       }
     #
@@ -2171,22 +2764,11 @@ module Aws::WAFV2
     #
     class DisassociateWebACLResponse < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Specifies a single rule to exclude from the rule group. Excluding a
     # rule overrides its action setting for the rule group in the web ACL,
     # setting it to `COUNT`. This effectively excludes the rule from acting
     # on web requests.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass ExcludedRule
     #   data as a hash:
     #
@@ -2206,13 +2788,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The part of a web request that you want AWS WAF to inspect. Include
     # the single `FieldToMatch` type that you want to inspect, with
     # additional specifications as needed, according to the type. You
@@ -2220,10 +2795,6 @@ module Aws::WAFV2
     # statement that requires it. To inspect more than one component of a
     # web request, create a separate rule statement for each component.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass FieldToMatch
     #   data as a hash:
     #
@@ -2244,12 +2815,23 @@ module Aws::WAFV2
     #         },
     #         method: {
     #         },
+    #         json_body: {
+    #           match_pattern: { # required
+    #             all: {
+    #             },
+    #             included_paths: ["JsonPointerPath"],
+    #           },
+    #           match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #           invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #         },
     #       }
     #
     # @!attribute [rw] single_header
     #   Inspect a single header. Provide the name of the header to inspect,
     #   for example, `User-Agent` or `Referer`. This setting isn't case
     #   sensitive.
+    #
+    #   Example JSON: `"SingleHeader": \{ "Name": "haystack" \}`
     #   @return [Types::SingleHeader]
     #
     # @!attribute [rw] single_query_argument
@@ -2259,6 +2841,8 @@ module Aws::WAFV2
     #
     #   This is used only to indicate the web request component for AWS WAF
     #   to inspect, in the FieldToMatch specification.
+    #
+    #   Example JSON: `"SingleQueryArgument": \{ "Name": "myArgument" \}`
     #   @return [Types::SingleQueryArgument]
     #
     # @!attribute [rw] all_query_arguments
@@ -2276,10 +2860,10 @@ module Aws::WAFV2
     #   @return [Types::QueryString]
     #
     # @!attribute [rw] body
-    #   Inspect the request body, which immediately follows the request
-    #   headers. This is the part of a request that contains any additional
-    #   data that you want to send to your web server as the HTTP request
-    #   body, such as data from a form.
+    #   Inspect the request body as plain text. The request body immediately
+    #   follows the request headers. This is the part of a request that
+    #   contains any additional data that you want to send to your web
+    #   server as the HTTP request body, such as data from a form.
     #
     #   Note that only the first 8 KB (8192 bytes) of the request body are
     #   forwarded to AWS WAF for inspection by the underlying host service.
@@ -2297,6 +2881,23 @@ module Aws::WAFV2
     #   that the request is asking the origin to perform.
     #   @return [Types::Method]
     #
+    # @!attribute [rw] json_body
+    #   Inspect the request body as JSON. The request body immediately
+    #   follows the request headers. This is the part of a request that
+    #   contains any additional data that you want to send to your web
+    #   server as the HTTP request body, such as data from a form.
+    #
+    #   Note that only the first 8 KB (8192 bytes) of the request body are
+    #   forwarded to AWS WAF for inspection by the underlying host service.
+    #   If you don't need to inspect more than 8 KB, you can guarantee that
+    #   you don't allow additional bytes in by combining a statement that
+    #   inspects the body of the web request, such as ByteMatchStatement or
+    #   RegexPatternSetReferenceStatement, with a SizeConstraintStatement
+    #   that enforces an 8 KB size limit on the body of the request. AWS WAF
+    #   doesn't support inspecting the entire contents of web requests
+    #   whose bodies exceed the 8 KB limit.
+    #   @return [Types::JsonBody]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/FieldToMatch AWS API Documentation
     #
     class FieldToMatch < Struct.new(
@@ -2306,7 +2907,8 @@ module Aws::WAFV2
       :uri_path,
       :query_string,
       :body,
-      :method)
+      :method,
+      :json_body)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -2352,19 +2954,8 @@ module Aws::WAFV2
     #   @return [Types::OverrideAction]
     #
     # @!attribute [rw] visibility_config
-    #   <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    #   in November, 2019. For information, including how to migrate your
-    #   AWS WAF resources from the prior release, see the [AWS WAF Developer
-    #   Guide][1].
-    #
-    #    </note>
-    #
     #   Defines and enables Amazon CloudWatch metrics and web request sample
     #   collection.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
     #   @return [Types::VisibilityConfig]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/FirewallManagerRuleGroup AWS API Documentation
@@ -2384,13 +2975,6 @@ module Aws::WAFV2
     # reference.
     #
     # @!attribute [rw] managed_rule_group_statement
-    #   <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    #   in November, 2019. For information, including how to migrate your
-    #   AWS WAF resources from the prior release, see the [AWS WAF Developer
-    #   Guide][1].
-    #
-    #    </note>
-    #
     #   A rule statement used to run the rules that are defined in a managed
     #   rule group. To use this, provide the vendor name and the name of the
     #   rule group in this statement. You can retrieve the required names by
@@ -2399,20 +2983,9 @@ module Aws::WAFV2
     #   You can't nest a `ManagedRuleGroupStatement`, for example for use
     #   inside a `NotStatement` or `OrStatement`. It can only be referenced
     #   as a top-level statement within a rule.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
     #   @return [Types::ManagedRuleGroupStatement]
     #
     # @!attribute [rw] rule_group_reference_statement
-    #   <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    #   in November, 2019. For information, including how to migrate your
-    #   AWS WAF resources from the prior release, see the [AWS WAF Developer
-    #   Guide][1].
-    #
-    #    </note>
-    #
     #   A rule statement used to run the rules that are defined in a
     #   RuleGroup. To use this, create a rule group with your rules, then
     #   provide the ARN of the rule group in this statement.
@@ -2420,10 +2993,6 @@ module Aws::WAFV2
     #   You cannot nest a `RuleGroupReferenceStatement`, for example for use
     #   inside a `NotStatement` or `OrStatement`. It can only be referenced
     #   as a top-level statement within a rule.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
     #   @return [Types::RuleGroupReferenceStatement]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/FirewallManagerStatement AWS API Documentation
@@ -2482,10 +3051,10 @@ module Aws::WAFV2
     #
     #   You can specify the following fallback behaviors:
     #
-    #   * MATCH - Treat the web request as matching the rule statement. AWS
-    #     WAF applies the rule action to the request.
+    #   * `MATCH` - Treat the web request as matching the rule statement.
+    #     AWS WAF applies the rule action to the request.
     #
-    #   * NO\_MATCH - Treat the web request as not matching the rule
+    #   * `NO_MATCH` - Treat the web request as not matching the rule
     #     statement.
     #   @return [String]
     #
@@ -2498,20 +3067,9 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement used to identify web requests based on country of
     # origin.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass GeoMatchStatement
     #   data as a hash:
     #
@@ -2934,7 +3492,8 @@ module Aws::WAFV2
     #   You must specify the times in Coordinated Universal Time (UTC)
     #   format. UTC format includes the special designator, `Z`. For
     #   example, `"2016-09-27T14:50Z"`. You can specify any time range in
-    #   the previous three hours.
+    #   the previous three hours. If you specify a start time that's
+    #   earlier than three hours ago, AWS WAF sets it to three hours ago.
     #   @return [Types::TimeWindow]
     #
     # @!attribute [rw] max_items
@@ -3091,22 +3650,11 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Part of the response from GetSampledRequests. This is a complex type
     # that appears as `Headers` in the response syntax. `HTTPHeader`
     # contains the names and values of all of the headers that appear in one
     # of the web requests.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the HTTP header.
     #   @return [String]
@@ -3124,21 +3672,10 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Part of the response from GetSampledRequests. This is a complex type
     # that appears as `Request` in the response syntax. `HTTPRequest`
     # contains information about one of the web requests.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] client_ip
     #   The IP address that the request originated from. If the web ACL is
     #   associated with a CloudFront distribution, this is the value of one
@@ -3193,17 +3730,11 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Contains one or more IP addresses or blocks of IP addresses specified
     # in Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports
-    # any CIDR range. For information about CIDR notation, see the Wikipedia
-    # entry [Classless Inter-Domain Routing][2].
+    # all IPv4 and IPv6 CIDR ranges except for /0. For information about
+    # CIDR notation, see the Wikipedia entry [Classless Inter-Domain
+    # Routing][1].
     #
     # AWS WAF assigns an ARN to each `IPSet` that you create. To use an IP
     # set in a rule, you provide the ARN to the Rule statement
@@ -3211,8 +3742,7 @@ module Aws::WAFV2
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    # [2]: https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
+    # [1]: https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
     #
     # @!attribute [rw] name
     #   The name of the IP set. You cannot change the name of an `IPSet`
@@ -3230,8 +3760,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the IP set that helps with identification. You
-    #   cannot change the description of an IP set after you create it.
+    #   A description of the IP set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] ip_address_version
@@ -3241,8 +3770,8 @@ module Aws::WAFV2
     # @!attribute [rw] addresses
     #   Contains an array of strings that specify one or more IP addresses
     #   or blocks of IP addresses in Classless Inter-Domain Routing (CIDR)
-    #   notation. AWS WAF supports all address ranges for IP versions IPv4
-    #   and IPv6.
+    #   notation. AWS WAF supports all IPv4 and IPv6 CIDR ranges except for
+    #   /0.
     #
     #   Examples:
     #
@@ -3331,10 +3860,10 @@ module Aws::WAFV2
     #
     #   You can specify the following fallback behaviors:
     #
-    #   * MATCH - Treat the web request as matching the rule statement. AWS
-    #     WAF applies the rule action to the request.
+    #   * `MATCH` - Treat the web request as matching the rule statement.
+    #     AWS WAF applies the rule action to the request.
     #
-    #   * NO\_MATCH - Treat the web request as not matching the rule
+    #   * `NO_MATCH` - Treat the web request as not matching the rule
     #     statement.
     #   @return [String]
     #
@@ -3368,13 +3897,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement used to detect web requests coming from particular IP
     # addresses or address ranges. To use this, create an IPSet that
     # specifies the addresses you want to detect, then use the ARN of that
@@ -3385,10 +3907,6 @@ module Aws::WAFV2
     # single set in multiple rules. When you update the referenced set, AWS
     # WAF automatically updates all rules that reference it.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass IPSetReferenceStatement
     #   data as a hash:
     #
@@ -3427,22 +3945,11 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # High-level information about an IPSet, returned by operations like
     # create and list. This provides information like the ID, that you can
     # use to retrieve and manage an `IPSet`, and the ARN, that you provide
     # to the IPSetReferenceStatement to use the address set in a Rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the IP set. You cannot change the name of an `IPSet`
     #   after you create it.
@@ -3455,8 +3962,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the IP set that helps with identification. You
-    #   cannot change the description of an IP set after you create it.
+    #   A description of the IP set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] lock_token
@@ -3487,6 +3993,123 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
+    # The body of a web request, inspected as JSON. The body immediately
+    # follows the request headers. This is used in the FieldToMatch
+    # specification.
+    #
+    # Use the specifications in this object to indicate which parts of the
+    # JSON body to inspect using the rule's inspection criteria. AWS WAF
+    # inspects only the parts of the JSON that result from the matches that
+    # you indicate.
+    #
+    # @note When making an API call, you may pass JsonBody
+    #   data as a hash:
+    #
+    #       {
+    #         match_pattern: { # required
+    #           all: {
+    #           },
+    #           included_paths: ["JsonPointerPath"],
+    #         },
+    #         match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #         invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #       }
+    #
+    # @!attribute [rw] match_pattern
+    #   The patterns to look for in the JSON body. AWS WAF inspects the
+    #   results of these pattern matches against the rule inspection
+    #   criteria.
+    #   @return [Types::JsonMatchPattern]
+    #
+    # @!attribute [rw] match_scope
+    #   The parts of the JSON to match against using the `MatchPattern`. If
+    #   you specify `All`, AWS WAF matches against keys and values.
+    #   @return [String]
+    #
+    # @!attribute [rw] invalid_fallback_behavior
+    #   The inspection behavior to fall back to if the JSON in the request
+    #   body is invalid. For AWS WAF, invalid JSON is any content that
+    #   isn't complete syntactical JSON, content whose root node isn't an
+    #   object or an array, and duplicate keys in the content.
+    #
+    #   You can specify the following fallback behaviors:
+    #
+    #   * `MATCH` - Treat the web request as matching the rule statement.
+    #     AWS WAF applies the rule action to the request.
+    #
+    #   * `NO_MATCH` - Treat the web request as not matching the rule
+    #     statement.
+    #
+    #   * `EVALUATE_AS_STRING` - Inspect the body as plain text. This option
+    #     applies the text transformations and inspection criteria that you
+    #     defined for the JSON inspection to the body text string.
+    #
+    #   If you don't provide this setting, when AWS WAF encounters invalid
+    #   JSON, it parses and inspects what it can, up to the first invalid
+    #   JSON that it encounters.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/JsonBody AWS API Documentation
+    #
+    class JsonBody < Struct.new(
+      :match_pattern,
+      :match_scope,
+      :invalid_fallback_behavior)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The patterns to look for in the JSON body. AWS WAF inspects the
+    # results of these pattern matches against the rule inspection criteria.
+    # This is used with the FieldToMatch option `JsonBody`.
+    #
+    # @note When making an API call, you may pass JsonMatchPattern
+    #   data as a hash:
+    #
+    #       {
+    #         all: {
+    #         },
+    #         included_paths: ["JsonPointerPath"],
+    #       }
+    #
+    # @!attribute [rw] all
+    #   Match all of the elements. See also `MatchScope` in JsonBody.
+    #
+    #   You must specify either this setting or the `IncludedPaths` setting,
+    #   but not both.
+    #   @return [Types::All]
+    #
+    # @!attribute [rw] included_paths
+    #   Match only the specified include paths. See also `MatchScope` in
+    #   JsonBody.
+    #
+    #   Provide the include paths using JSON Pointer syntax. For example,
+    #   `"IncludedPaths": ["/dogs/0/name", "/dogs/1/name"]`. For information
+    #   about this syntax, see the Internet Engineering Task Force (IETF)
+    #   documentation [JavaScript Object Notation (JSON) Pointer][1].
+    #
+    #   You must specify either this setting or the `All` setting, but not
+    #   both.
+    #
+    #   <note markdown="1"> Don't use this option to include all paths. Instead, use the `All`
+    #   setting.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://tools.ietf.org/html/rfc6901
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/JsonMatchPattern AWS API Documentation
+    #
+    class JsonMatchPattern < Struct.new(
+      :all,
+      :included_paths)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListAvailableManagedRuleGroupsRequest
     #   data as a hash:
     #
@@ -4002,22 +4625,11 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Defines an association between Amazon Kinesis Data Firehose
     # destinations and a web ACL resource, for logging from AWS WAF. As part
     # of the association, you can specify parts of the standard logging
     # fields to keep out of the logs.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass LoggingConfiguration
     #   data as a hash:
     #
@@ -4042,6 +4654,15 @@ module Aws::WAFV2
     #             },
     #             method: {
     #             },
+    #             json_body: {
+    #               match_pattern: { # required
+    #                 all: {
+    #                 },
+    #                 included_paths: ["JsonPointerPath"],
+    #               },
+    #               match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #               invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #             },
     #           },
     #         ],
     #         managed_by_firewall_manager: false,
@@ -4085,13 +4706,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement used to run the rules that are defined in a managed
     # rule group. To use this, provide the vendor name and the name of the
     # rule group in this statement. You can retrieve the required names by
@@ -4101,10 +4715,6 @@ module Aws::WAFV2
     # inside a `NotStatement` or `OrStatement`. It can only be referenced as
     # a top-level statement within a rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass ManagedRuleGroupStatement
     #   data as a hash:
     #
@@ -4144,13 +4754,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # High-level information about a managed rule group, returned by
     # ListAvailableManagedRuleGroups. This provides information like the
     # name and vendor name, that you provide when you add a
@@ -4159,10 +4762,6 @@ module Aws::WAFV2
     # customers, and AWS Marketplace managed rule groups, which you can
     # subscribe to through AWS Marketplace.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] vendor_name
     #   The name of the managed rule group vendor. You use this, along with
     #   the rule group name, to identify the rule group.
@@ -4188,46 +4787,24 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The HTTP method of a web request. The method indicates the type of
     # operation that the request is asking the origin to perform.
     #
     # This is used only to indicate the web request component for AWS WAF to
     # inspect, in the FieldToMatch specification.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @api private
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/Method AWS API Documentation
     #
     class Method < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Specifies that AWS WAF should do nothing. This is generally used to
     # try out a rule without performing any actions. You set the
     # `OverrideAction` on the Rule.
     #
-    # This is used only in the context of other settings, for example to
-    # specify values for RuleAction and web ACL DefaultAction.
-    #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    # This is used in the context of other settings, for example to specify
+    # values for RuleAction and web ACL DefaultAction.
     #
     # @api private
     #
@@ -4235,20 +4812,9 @@ module Aws::WAFV2
     #
     class NoneAction < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A logical rule statement used to negate the results of another rule
     # statement. You provide one Statement within the `NotStatement`.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass NotStatement
     #   data as a hash:
     #
@@ -4273,6 +4839,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -4300,6 +4875,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -4326,6 +4910,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -4352,6 +4945,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #             size: 1, # required
@@ -4404,6 +5006,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -4467,20 +5078,9 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A logical rule statement used to combine other rule statements with OR
     # logic. You provide more than one Statement within the `OrStatement`.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass OrStatement
     #   data as a hash:
     #
@@ -4506,6 +5106,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -4533,6 +5142,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -4559,6 +5177,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -4585,6 +5212,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #               size: 1, # required
@@ -4637,6 +5273,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -4719,6 +5364,14 @@ module Aws::WAFV2
     #
     #       {
     #         count: {
+    #           custom_request_handling: {
+    #             insert_headers: [ # required
+    #               {
+    #                 name: "CustomHTTPHeaderName", # required
+    #                 value: "CustomHTTPHeaderValue", # required
+    #               },
+    #             ],
+    #           },
     #         },
     #         none: {
     #         },
@@ -4766,6 +5419,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #           ],
     #           managed_by_firewall_manager: false,
@@ -4846,36 +5508,18 @@ module Aws::WAFV2
     #
     class PutPermissionPolicyResponse < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The query string of a web request. This is the part of a URL that
     # appears after a `?` character, if any.
     #
     # This is used only to indicate the web request component for AWS WAF to
     # inspect, in the FieldToMatch specification.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @api private
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/QueryString AWS API Documentation
     #
     class QueryString < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rate-based rule tracks the rate of requests for each originating IP
     # address, and triggers the rule action when the rate exceeds a limit
     # that you specify on the number of requests in any 5-minute time span.
@@ -4909,10 +5553,6 @@ module Aws::WAFV2
     # `NotStatement` or `OrStatement`. It can only be referenced as a
     # top-level statement within a rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass RateBasedStatement
     #   data as a hash:
     #
@@ -4939,6 +5579,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -4966,6 +5615,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -4992,6 +5650,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -5018,6 +5685,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #             size: 1, # required
@@ -5070,6 +5746,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -5174,20 +5859,9 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The set of IP addresses that are currently blocked for a rate-based
     # statement.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] ip_address_version
     #   @return [String]
     #
@@ -5204,19 +5878,8 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A single regular expression. This is used in a RegexPatternSet.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass Regex
     #   data as a hash:
     #
@@ -5236,23 +5899,12 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Contains one or more regular expressions.
     #
     # AWS WAF assigns an ARN to each `RegexPatternSet` that you create. To
     # use a set in a rule, you provide the ARN to the Rule statement
     # RegexPatternSetReferenceStatement.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the set. You cannot change the name after you create the
     #   set.
@@ -5269,8 +5921,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the set that helps with identification. You cannot
-    #   change the description of a set after you create it.
+    #   A description of the set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] regular_expression_list
@@ -5289,13 +5940,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement used to search web request components for matches
     # with regular expressions. To use this, create a RegexPatternSet that
     # specifies the expressions that you want to detect, then use the ARN of
@@ -5309,10 +5953,6 @@ module Aws::WAFV2
     # referenced set, AWS WAF automatically updates all rules that reference
     # it.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass RegexPatternSetReferenceStatement
     #   data as a hash:
     #
@@ -5335,6 +5975,15 @@ module Aws::WAFV2
     #           },
     #           method: {
     #           },
+    #           json_body: {
+    #             match_pattern: { # required
+    #               all: {
+    #               },
+    #               included_paths: ["JsonPointerPath"],
+    #             },
+    #             match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #             invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #           },
     #         },
     #         text_transformations: [ # required
     #           {
@@ -5373,23 +6022,12 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # High-level information about a RegexPatternSet, returned by operations
     # like create and list. This provides information like the ID, that you
     # can use to retrieve and manage a `RegexPatternSet`, and the ARN, that
     # you provide to the RegexPatternSetReferenceStatement to use the
     # pattern set in a Rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the data type instance. You cannot change the name after
     #   you create the instance.
@@ -5402,8 +6040,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the set that helps with identification. You cannot
-    #   change the description of a set after you create it.
+    #   A description of the set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] lock_token
@@ -5434,23 +6071,12 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A single rule, which you can use in a WebACL or RuleGroup to identify
     # web requests that you want to allow, block, or count. Each rule
     # includes one top-level Statement that AWS WAF uses to identify
     # matching web requests, and parameters that govern how AWS WAF handles
     # them.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass Rule
     #   data as a hash:
     #
@@ -5477,6 +6103,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -5504,6 +6139,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -5530,6 +6174,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -5556,6 +6209,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #             size: 1, # required
@@ -5608,6 +6270,15 @@ module Aws::WAFV2
     #               },
     #               method: {
     #               },
+    #               json_body: {
+    #                 match_pattern: { # required
+    #                   all: {
+    #                   },
+    #                   included_paths: ["JsonPointerPath"],
+    #                 },
+    #                 match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                 invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #               },
     #             },
     #             text_transformations: [ # required
     #               {
@@ -5658,14 +6329,48 @@ module Aws::WAFV2
     #         },
     #         action: {
     #           block: {
+    #             custom_response: {
+    #               response_code: 1, # required
+    #               custom_response_body_key: "EntityName",
+    #               response_headers: [
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #           allow: {
+    #             custom_request_handling: {
+    #               insert_headers: [ # required
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #           count: {
+    #             custom_request_handling: {
+    #               insert_headers: [ # required
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #         },
     #         override_action: {
     #           count: {
+    #             custom_request_handling: {
+    #               insert_headers: [ # required
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #           none: {
     #           },
@@ -5749,32 +6454,47 @@ module Aws::WAFV2
       :visibility_config)
       SENSITIVE = []
       include Aws::Structure
-    end
-
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
+    end
+
     # The action that AWS WAF should take on a web request when it matches a
     # rule's statement. Settings at the web ACL level can override the rule
     # action setting.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass RuleAction
     #   data as a hash:
     #
     #       {
     #         block: {
+    #           custom_response: {
+    #             response_code: 1, # required
+    #             custom_response_body_key: "EntityName",
+    #             response_headers: [
+    #               {
+    #                 name: "CustomHTTPHeaderName", # required
+    #                 value: "CustomHTTPHeaderValue", # required
+    #               },
+    #             ],
+    #           },
     #         },
     #         allow: {
+    #           custom_request_handling: {
+    #             insert_headers: [ # required
+    #               {
+    #                 name: "CustomHTTPHeaderName", # required
+    #                 value: "CustomHTTPHeaderValue", # required
+    #               },
+    #             ],
+    #           },
     #         },
     #         count: {
+    #           custom_request_handling: {
+    #             insert_headers: [ # required
+    #               {
+    #                 name: "CustomHTTPHeaderName", # required
+    #                 value: "CustomHTTPHeaderValue", # required
+    #               },
+    #             ],
+    #           },
     #         },
     #       }
     #
@@ -5800,23 +6520,12 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule group defines a collection of rules to inspect and control web
     # requests that you can use in a WebACL. When you create a rule group,
     # you define an immutable capacity limit. If you update a rule group,
     # you must stay within the capacity. This allows others to reuse the
     # rule group with confidence in its capacity requirements.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the rule group. You cannot change the name of a rule
     #   group after you create it.
@@ -5851,8 +6560,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the rule group that helps with identification. You
-    #   cannot change the description of a rule group after you create it.
+    #   A description of the rule group that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] rules
@@ -5867,6 +6575,27 @@ module Aws::WAFV2
     #   collection.
     #   @return [Types::VisibilityConfig]
     #
+    # @!attribute [rw] custom_response_bodies
+    #   A map of custom response keys and content bodies. When you create a
+    #   rule with a block action, you can send a custom response to the web
+    #   request. You define these for the rule group, and then use them in
+    #   the rules that you define in the rule group.
+    #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][3] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   [3]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   @return [Hash<String,Types::CustomResponseBody>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/RuleGroup AWS API Documentation
     #
     class RuleGroup < Struct.new(
@@ -5876,18 +6605,12 @@ module Aws::WAFV2
       :arn,
       :description,
       :rules,
-      :visibility_config)
+      :visibility_config,
+      :custom_response_bodies)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement used to run the rules that are defined in a
     # RuleGroup. To use this, create a rule group with your rules, then
     # provide the ARN of the rule group in this statement.
@@ -5896,10 +6619,6 @@ module Aws::WAFV2
     # inside a `NotStatement` or `OrStatement`. It can only be referenced as
     # a top-level statement within a rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass RuleGroupReferenceStatement
     #   data as a hash:
     #
@@ -5930,23 +6649,12 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # High-level information about a RuleGroup, returned by operations like
     # create and list. This provides information like the ID, that you can
     # use to retrieve and manage a `RuleGroup`, and the ARN, that you
     # provide to the RuleGroupReferenceStatement to use the rule group in a
     # Rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the data type instance. You cannot change the name after
     #   you create the instance.
@@ -5959,8 +6667,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the rule group that helps with identification. You
-    #   cannot change the description of a rule group after you create it.
+    #   A description of the rule group that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] lock_token
@@ -5991,42 +6698,20 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # High-level information about a Rule, returned by operations like
     # DescribeManagedRuleGroup. This provides information like the ID, that
     # you can use to retrieve and manage a `RuleGroup`, and the ARN, that
     # you provide to the RuleGroupReferenceStatement to use the rule group
     # in a Rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the rule.
     #   @return [String]
     #
     # @!attribute [rw] action
-    #   <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    #   in November, 2019. For information, including how to migrate your
-    #   AWS WAF resources from the prior release, see the [AWS WAF Developer
-    #   Guide][1].
-    #
-    #    </note>
-    #
     #   The action that AWS WAF should take on a web request when it matches
     #   a rule's statement. Settings at the web ACL level can override the
     #   rule action setting.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
     #   @return [Types::RuleAction]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/RuleSummary AWS API Documentation
@@ -6038,23 +6723,12 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Represents a single sampled web request. The response from
     # GetSampledRequests includes a `SampledHTTPRequests` complex type that
     # appears as `SampledRequests` in the response syntax.
     # `SampledHTTPRequests` contains an array of `SampledHTTPRequest`
     # objects.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] request
     #   A complex type that contains detailed information about the request.
     #   @return [Types::HTTPRequest]
@@ -6084,6 +6758,16 @@ module Aws::WAFV2
     #   a rule group, this field is absent.
     #   @return [String]
     #
+    # @!attribute [rw] request_headers_inserted
+    #   Custom request headers inserted by AWS WAF into the request,
+    #   according to the custom request configuration for the matching rule
+    #   action.
+    #   @return [Array<Types::HTTPHeader>]
+    #
+    # @!attribute [rw] response_code_sent
+    #   The response code that was sent for the request.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/SampledHTTPRequest AWS API Documentation
     #
     class SampledHTTPRequest < Struct.new(
@@ -6091,28 +6775,19 @@ module Aws::WAFV2
       :weight,
       :timestamp,
       :action,
-      :rule_name_within_rule_group)
+      :rule_name_within_rule_group,
+      :request_headers_inserted,
+      :response_code_sent)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # One of the headers in a web request, identified by name, for example,
     # `User-Agent` or `Referer`. This setting isn't case sensitive.
     #
     # This is used only to indicate the web request component for AWS WAF to
     # inspect, in the FieldToMatch specification.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass SingleHeader
     #   data as a hash:
     #
@@ -6132,21 +6807,10 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # One query argument in a web request, identified by name, for example
     # *UserName* or *SalesRegion*. The name can be up to 30 characters long
     # and isn't case sensitive.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass SingleQueryArgument
     #   data as a hash:
     #
@@ -6166,13 +6830,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement that compares a number of bytes against the size of a
     # request component, using a comparison operator, such as greater than
     # (&gt;) or less than (&lt;). For example, you can use a size constraint
@@ -6188,10 +6845,6 @@ module Aws::WAFV2
     # the slash (/) in the URI counts as one character. For example, the URI
     # `/logo.jpg` is nine characters long.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass SizeConstraintStatement
     #   data as a hash:
     #
@@ -6213,6 +6866,15 @@ module Aws::WAFV2
     #           },
     #           method: {
     #           },
+    #           json_body: {
+    #             match_pattern: { # required
+    #               all: {
+    #               },
+    #               included_paths: ["JsonPointerPath"],
+    #             },
+    #             match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #             invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #           },
     #         },
     #         comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #         size: 1, # required
@@ -6258,13 +6920,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Attackers sometimes insert malicious SQL code into web requests in an
     # effort to extract data from your database. To allow or block web
     # requests that appear to contain malicious SQL code, create one or more
@@ -6274,10 +6929,6 @@ module Aws::WAFV2
     # you create a web ACL, you specify whether to allow or block requests
     # that appear to contain malicious SQL code.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass SqliMatchStatement
     #   data as a hash:
     #
@@ -6299,6 +6950,15 @@ module Aws::WAFV2
     #           },
     #           method: {
     #           },
+    #           json_body: {
+    #             match_pattern: { # required
+    #               all: {
+    #               },
+    #               included_paths: ["JsonPointerPath"],
+    #             },
+    #             match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #             invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #           },
     #         },
     #         text_transformations: [ # required
     #           {
@@ -6331,20 +6991,9 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The processing guidance for a Rule, used by AWS WAF to determine
     # whether a web request matches the rule.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass Statement
     #   data as a hash:
     #
@@ -6368,6 +7017,15 @@ module Aws::WAFV2
     #             },
     #             method: {
     #             },
+    #             json_body: {
+    #               match_pattern: { # required
+    #                 all: {
+    #                 },
+    #                 included_paths: ["JsonPointerPath"],
+    #               },
+    #               match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #               invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #             },
     #           },
     #           text_transformations: [ # required
     #             {
@@ -6395,6 +7053,15 @@ module Aws::WAFV2
     #             },
     #             method: {
     #             },
+    #             json_body: {
+    #               match_pattern: { # required
+    #                 all: {
+    #                 },
+    #                 included_paths: ["JsonPointerPath"],
+    #               },
+    #               match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #               invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #             },
     #           },
     #           text_transformations: [ # required
     #             {
@@ -6421,6 +7088,15 @@ module Aws::WAFV2
     #             },
     #             method: {
     #             },
+    #             json_body: {
+    #               match_pattern: { # required
+    #                 all: {
+    #                 },
+    #                 included_paths: ["JsonPointerPath"],
+    #               },
+    #               match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #               invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #             },
     #           },
     #           text_transformations: [ # required
     #             {
@@ -6447,6 +7123,15 @@ module Aws::WAFV2
     #             },
     #             method: {
     #             },
+    #             json_body: {
+    #               match_pattern: { # required
+    #                 all: {
+    #                 },
+    #                 included_paths: ["JsonPointerPath"],
+    #               },
+    #               match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #               invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #             },
     #           },
     #           comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #           size: 1, # required
@@ -6499,6 +7184,15 @@ module Aws::WAFV2
     #             },
     #             method: {
     #             },
+    #             json_body: {
+    #               match_pattern: { # required
+    #                 all: {
+    #                 },
+    #                 included_paths: ["JsonPointerPath"],
+    #               },
+    #               match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #               invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #             },
     #           },
     #           text_transformations: [ # required
     #             {
@@ -6530,6 +7224,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -6557,6 +7260,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -6583,6 +7295,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -6609,6 +7330,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #               size: 1, # required
@@ -6661,6 +7391,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -6728,6 +7467,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -6755,6 +7503,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -6781,6 +7538,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -6807,6 +7573,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #                 size: 1, # required
@@ -6859,6 +7634,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -6925,6 +7709,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -6952,6 +7745,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -6978,6 +7780,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -7004,6 +7815,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #                 size: 1, # required
@@ -7056,6 +7876,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -7121,6 +7950,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -7148,6 +7986,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -7174,6 +8021,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -7200,6 +8056,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #               size: 1, # required
@@ -7252,6 +8117,15 @@ module Aws::WAFV2
     #                 },
     #                 method: {
     #                 },
+    #                 json_body: {
+    #                   match_pattern: { # required
+    #                     all: {
+    #                     },
+    #                     included_paths: ["JsonPointerPath"],
+    #                   },
+    #                   match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                   invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                 },
     #               },
     #               text_transformations: [ # required
     #                 {
@@ -7486,13 +8360,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A tag associated with an AWS resource. Tags are key:value pairs that
     # you can use to categorize and manage your resources, for purposes like
     # billing or other management. Typically, the tag key represents a
@@ -7507,10 +8374,6 @@ module Aws::WAFV2
     # ACLs, rule groups, IP sets, and regex pattern sets. You can't manage
     # or view tags through the AWS WAF console.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass Tag
     #   data as a hash:
     #
@@ -7540,13 +8403,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The collection of tagging definitions for an AWS resource. Tags are
     # key:value pairs that you can use to categorize and manage your
     # resources, for purposes like billing or other management. Typically,
@@ -7561,10 +8417,6 @@ module Aws::WAFV2
     # ACLs, rule groups, IP sets, and regex pattern sets. You can't manage
     # or view tags through the AWS WAF console.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] resource_arn
     #   The Amazon Resource Name (ARN) of the resource.
     #   @return [String]
@@ -7616,20 +8468,9 @@ module Aws::WAFV2
     #
     class TagResourceResponse < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Text transformations eliminate some of the unusual formatting that
     # attackers use in web requests in an effort to bypass detection.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass TextTransformation
     #   data as a hash:
     #
@@ -7727,13 +8568,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # 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.
@@ -7752,10 +8586,6 @@ module Aws::WAFV2
     # 5,000th request. In that case, `EndTime` is the time that AWS WAF
     # received the 5,000th request.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass TimeWindow
     #   data as a hash:
     #
@@ -7860,15 +8690,14 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the IP set that helps with identification. You
-    #   cannot change the description of an IP set after you create it.
+    #   A description of the IP set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] addresses
     #   Contains an array of strings that specify one or more IP addresses
     #   or blocks of IP addresses in Classless Inter-Domain Routing (CIDR)
-    #   notation. AWS WAF supports all address ranges for IP versions IPv4
-    #   and IPv6.
+    #   notation. AWS WAF supports all IPv4 and IPv6 CIDR ranges except for
+    #   /0.
     #
     #   Examples:
     #
@@ -7981,8 +8810,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the set that helps with identification. You cannot
-    #   change the description of a set after you create it.
+    #   A description of the set that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] regular_expression_list
@@ -8059,6 +8887,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8086,6 +8923,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8112,6 +8958,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8138,6 +8993,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #                 size: 1, # required
@@ -8190,6 +9054,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8240,14 +9113,48 @@ module Aws::WAFV2
     #             },
     #             action: {
     #               block: {
+    #                 custom_response: {
+    #                   response_code: 1, # required
+    #                   custom_response_body_key: "EntityName",
+    #                   response_headers: [
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               allow: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #             },
     #             override_action: {
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               none: {
     #               },
@@ -8265,6 +9172,12 @@ module Aws::WAFV2
     #           metric_name: "MetricName", # required
     #         },
     #         lock_token: "LockToken", # required
+    #         custom_response_bodies: {
+    #           "EntityName" => {
+    #             content_type: "TEXT_PLAIN", # required, accepts TEXT_PLAIN, TEXT_HTML, APPLICATION_JSON
+    #             content: "ResponseContent", # required
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] name
@@ -8294,8 +9207,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the rule group that helps with identification. You
-    #   cannot change the description of a rule group after you create it.
+    #   A description of the rule group that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] rules
@@ -8322,6 +9234,27 @@ module Aws::WAFV2
     #   operation.
     #   @return [String]
     #
+    # @!attribute [rw] custom_response_bodies
+    #   A map of custom response keys and content bodies. When you create a
+    #   rule with a block action, you can send a custom response to the web
+    #   request. You define these for the rule group, and then use them in
+    #   the rules that you define in the rule group.
+    #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][3] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   [3]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   @return [Hash<String,Types::CustomResponseBody>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UpdateRuleGroupRequest AWS API Documentation
     #
     class UpdateRuleGroupRequest < Struct.new(
@@ -8331,7 +9264,8 @@ module Aws::WAFV2
       :description,
       :rules,
       :visibility_config,
-      :lock_token)
+      :lock_token,
+      :custom_response_bodies)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -8359,8 +9293,26 @@ module Aws::WAFV2
     #         id: "EntityId", # required
     #         default_action: { # required
     #           block: {
+    #             custom_response: {
+    #               response_code: 1, # required
+    #               custom_response_body_key: "EntityName",
+    #               response_headers: [
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #           allow: {
+    #             custom_request_handling: {
+    #               insert_headers: [ # required
+    #                 {
+    #                   name: "CustomHTTPHeaderName", # required
+    #                   value: "CustomHTTPHeaderValue", # required
+    #                 },
+    #               ],
+    #             },
     #           },
     #         },
     #         description: "EntityDescription",
@@ -8388,6 +9340,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8415,6 +9376,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8441,6 +9411,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8467,6 +9446,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 comparison_operator: "EQ", # required, accepts EQ, NE, LE, LT, GE, GT
     #                 size: 1, # required
@@ -8519,6 +9507,15 @@ module Aws::WAFV2
     #                   },
     #                   method: {
     #                   },
+    #                   json_body: {
+    #                     match_pattern: { # required
+    #                       all: {
+    #                       },
+    #                       included_paths: ["JsonPointerPath"],
+    #                     },
+    #                     match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #                     invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #                   },
     #                 },
     #                 text_transformations: [ # required
     #                   {
@@ -8569,14 +9566,48 @@ module Aws::WAFV2
     #             },
     #             action: {
     #               block: {
+    #                 custom_response: {
+    #                   response_code: 1, # required
+    #                   custom_response_body_key: "EntityName",
+    #                   response_headers: [
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               allow: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #             },
     #             override_action: {
     #               count: {
+    #                 custom_request_handling: {
+    #                   insert_headers: [ # required
+    #                     {
+    #                       name: "CustomHTTPHeaderName", # required
+    #                       value: "CustomHTTPHeaderValue", # required
+    #                     },
+    #                   ],
+    #                 },
     #               },
     #               none: {
     #               },
@@ -8594,6 +9625,12 @@ module Aws::WAFV2
     #           metric_name: "MetricName", # required
     #         },
     #         lock_token: "LockToken", # required
+    #         custom_response_bodies: {
+    #           "EntityName" => {
+    #             content_type: "TEXT_PLAIN", # required, accepts TEXT_PLAIN, TEXT_HTML, APPLICATION_JSON
+    #             content: "ResponseContent", # required
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] name
@@ -8628,8 +9665,7 @@ module Aws::WAFV2
     #   @return [Types::DefaultAction]
     #
     # @!attribute [rw] description
-    #   A description of the Web ACL that helps with identification. You
-    #   cannot change the description of a Web ACL after you create it.
+    #   A description of the Web ACL that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] rules
@@ -8656,6 +9692,27 @@ module Aws::WAFV2
     #   operation.
     #   @return [String]
     #
+    # @!attribute [rw] custom_response_bodies
+    #   A map of custom response keys and content bodies. When you create a
+    #   rule with a block action, you can send a custom response to the web
+    #   request. You define these for the web ACL, and then use them in the
+    #   rules and default actions that you define in the web ACL.
+    #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][3] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   [3]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   @return [Hash<String,Types::CustomResponseBody>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UpdateWebACLRequest AWS API Documentation
     #
     class UpdateWebACLRequest < Struct.new(
@@ -8666,7 +9723,8 @@ module Aws::WAFV2
       :description,
       :rules,
       :visibility_config,
-      :lock_token)
+      :lock_token,
+      :custom_response_bodies)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -8685,13 +9743,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # The path component of the URI of a web request. This is the part of a
     # web request that identifies a resource, for example,
     # `/images/daily-ad.jpg`.
@@ -8699,30 +9750,15 @@ module Aws::WAFV2
     # This is used only to indicate the web request component for AWS WAF to
     # inspect, in the FieldToMatch specification.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @api private
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/UriPath AWS API Documentation
     #
     class UriPath < Aws::EmptyStructure; end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # Defines and enables Amazon CloudWatch metrics and web request sample
     # collection.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass VisibilityConfig
     #   data as a hash:
     #
@@ -9031,13 +10067,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A Web ACL defines a collection of rules to use to inspect and control
     # web requests. Each rule has an action defined (allow, block, or count)
     # for requests that match the statement of the rule. In the Web ACL, you
@@ -9048,10 +10077,6 @@ module Aws::WAFV2
     # resources can be Amazon CloudFront, an Amazon API Gateway REST API, an
     # Application Load Balancer, or an AWS AppSync GraphQL API.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the Web ACL. You cannot change the name of a Web ACL
     #   after you create it.
@@ -9074,8 +10099,7 @@ module Aws::WAFV2
     #   @return [Types::DefaultAction]
     #
     # @!attribute [rw] description
-    #   A description of the Web ACL that helps with identification. You
-    #   cannot change the description of a Web ACL after you create it.
+    #   A description of the Web ACL that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] rules
@@ -9136,6 +10160,27 @@ module Aws::WAFV2
     #   any Firewall Manager rule groups in the web ACL.
     #   @return [Boolean]
     #
+    # @!attribute [rw] custom_response_bodies
+    #   A map of custom response keys and content bodies. When you create a
+    #   rule with a block action, you can send a custom response to the web
+    #   request. You define these for the web ACL, and then use them in the
+    #   rules and default actions that you define in the web ACL.
+    #
+    #   For information about customizing web requests and responses, see
+    #   [Customizing web requests and responses in AWS WAF][1] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #   For information about the limits on count and size for custom
+    #   request and response settings, see [AWS WAF quotas][3] in the [AWS
+    #   WAF Developer Guide][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-custom-request-response.html
+    #   [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #   [3]: https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
+    #   @return [Hash<String,Types::CustomResponseBody>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/WebACL AWS API Documentation
     #
     class WebACL < Struct.new(
@@ -9149,27 +10194,17 @@ module Aws::WAFV2
       :capacity,
       :pre_process_firewall_manager_rule_groups,
       :post_process_firewall_manager_rule_groups,
-      :managed_by_firewall_manager)
+      :managed_by_firewall_manager,
+      :custom_response_bodies)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # High-level information about a WebACL, returned by operations like
     # create and list. This provides information like the ID, that you can
     # use to retrieve and manage a `WebACL`, and the ARN, that you provide
     # to operations like AssociateWebACL.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @!attribute [rw] name
     #   The name of the Web ACL. You cannot change the name of a Web ACL
     #   after you create it.
@@ -9182,8 +10217,7 @@ module Aws::WAFV2
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A description of the Web ACL that helps with identification. You
-    #   cannot change the description of a Web ACL after you create it.
+    #   A description of the Web ACL that helps with identification.
     #   @return [String]
     #
     # @!attribute [rw] lock_token
@@ -9214,13 +10248,6 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
-    # <note markdown="1"> This is the latest version of **AWS WAF**, named AWS WAFV2, released
-    # in November, 2019. For information, including how to migrate your AWS
-    # WAF resources from the prior release, see the [AWS WAF Developer
-    # Guide][1].
-    #
-    #  </note>
-    #
     # A rule statement that defines a cross-site scripting (XSS) match
     # search for AWS WAF to apply to web requests. XSS attacks are those
     # where the attacker uses vulnerabilities in a benign website as a
@@ -9230,10 +10257,6 @@ module Aws::WAFV2
     # use on the search area before AWS WAF searches for character sequences
     # that are likely to be malicious strings.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
-    #
     # @note When making an API call, you may pass XssMatchStatement
     #   data as a hash:
     #
@@ -9255,6 +10278,15 @@ module Aws::WAFV2
     #           },
     #           method: {
     #           },
+    #           json_body: {
+    #             match_pattern: { # required
+    #               all: {
+    #               },
+    #               included_paths: ["JsonPointerPath"],
+    #             },
+    #             match_scope: "ALL", # required, accepts ALL, KEY, VALUE
+    #             invalid_fallback_behavior: "MATCH", # accepts MATCH, NO_MATCH, EVALUATE_AS_STRING
+    #           },
     #         },
     #         text_transformations: [ # required
     #           {