aws-sdk-waf 1.26.0 → 1.31.1

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

@@ -47,6 +47,8 @@ module Aws::WAF
     CreateSizeConstraintSetResponse = Shapes::StructureShape.new(name: 'CreateSizeConstraintSetResponse')
     CreateSqlInjectionMatchSetRequest = Shapes::StructureShape.new(name: 'CreateSqlInjectionMatchSetRequest')
     CreateSqlInjectionMatchSetResponse = Shapes::StructureShape.new(name: 'CreateSqlInjectionMatchSetResponse')
+    CreateWebACLMigrationStackRequest = Shapes::StructureShape.new(name: 'CreateWebACLMigrationStackRequest')
+    CreateWebACLMigrationStackResponse = Shapes::StructureShape.new(name: 'CreateWebACLMigrationStackResponse')
     CreateWebACLRequest = Shapes::StructureShape.new(name: 'CreateWebACLRequest')
     CreateWebACLResponse = Shapes::StructureShape.new(name: 'CreateWebACLResponse')
     CreateXssMatchSetRequest = Shapes::StructureShape.new(name: 'CreateXssMatchSetRequest')
@@ -79,6 +81,7 @@ module Aws::WAF
     DeleteWebACLResponse = Shapes::StructureShape.new(name: 'DeleteWebACLResponse')
     DeleteXssMatchSetRequest = Shapes::StructureShape.new(name: 'DeleteXssMatchSetRequest')
     DeleteXssMatchSetResponse = Shapes::StructureShape.new(name: 'DeleteXssMatchSetResponse')
+    ErrorReason = Shapes::StringShape.new(name: 'ErrorReason')
     ExcludedRule = Shapes::StructureShape.new(name: 'ExcludedRule')
     ExcludedRules = Shapes::ListShape.new(name: 'ExcludedRules')
     FieldToMatch = Shapes::StructureShape.new(name: 'FieldToMatch')
@@ -145,6 +148,7 @@ module Aws::WAF
     IPSetUpdate = Shapes::StructureShape.new(name: 'IPSetUpdate')
     IPSetUpdates = Shapes::ListShape.new(name: 'IPSetUpdates')
     IPString = Shapes::StringShape.new(name: 'IPString')
+    IgnoreUnsupportedType = Shapes::BooleanShape.new(name: 'IgnoreUnsupportedType')
     ListActivatedRulesInRuleGroupRequest = Shapes::StructureShape.new(name: 'ListActivatedRulesInRuleGroupRequest')
     ListActivatedRulesInRuleGroupResponse = Shapes::StructureShape.new(name: 'ListActivatedRulesInRuleGroupResponse')
     ListByteMatchSetsRequest = Shapes::StructureShape.new(name: 'ListByteMatchSetsRequest')
@@ -185,6 +189,7 @@ module Aws::WAF
     MatchFieldData = Shapes::StringShape.new(name: 'MatchFieldData')
     MatchFieldType = Shapes::StringShape.new(name: 'MatchFieldType')
     MetricName = Shapes::StringShape.new(name: 'MetricName')
+    MigrationErrorType = Shapes::StringShape.new(name: 'MigrationErrorType')
     Negated = Shapes::BooleanShape.new(name: 'Negated')
     NextMarker = Shapes::StringShape.new(name: 'NextMarker')
     PaginationLimit = Shapes::IntegerShape.new(name: 'PaginationLimit')
@@ -233,6 +238,8 @@ module Aws::WAF
     RuleSummary = Shapes::StructureShape.new(name: 'RuleSummary')
     RuleUpdate = Shapes::StructureShape.new(name: 'RuleUpdate')
     RuleUpdates = Shapes::ListShape.new(name: 'RuleUpdates')
+    S3BucketName = Shapes::StringShape.new(name: 'S3BucketName')
+    S3ObjectUrl = Shapes::StringShape.new(name: 'S3ObjectUrl')
     SampleWeight = Shapes::IntegerShape.new(name: 'SampleWeight')
     SampledHTTPRequest = Shapes::StructureShape.new(name: 'SampledHTTPRequest')
     SampledHTTPRequests = Shapes::ListShape.new(name: 'SampledHTTPRequests')
@@ -293,6 +300,7 @@ module Aws::WAF
     UpdateXssMatchSetResponse = Shapes::StructureShape.new(name: 'UpdateXssMatchSetResponse')
     WAFBadRequestException = Shapes::StructureShape.new(name: 'WAFBadRequestException')
     WAFDisallowedNameException = Shapes::StructureShape.new(name: 'WAFDisallowedNameException')
+    WAFEntityMigrationException = Shapes::StructureShape.new(name: 'WAFEntityMigrationException')
     WAFInternalErrorException = Shapes::StructureShape.new(name: 'WAFInternalErrorException')
     WAFInvalidAccountException = Shapes::StructureShape.new(name: 'WAFInvalidAccountException')
     WAFInvalidOperationException = Shapes::StructureShape.new(name: 'WAFInvalidOperationException')
@@ -451,6 +459,14 @@ module Aws::WAF
     CreateSqlInjectionMatchSetResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
     CreateSqlInjectionMatchSetResponse.struct_class = Types::CreateSqlInjectionMatchSetResponse
 
+    CreateWebACLMigrationStackRequest.add_member(:web_acl_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "WebACLId"))
+    CreateWebACLMigrationStackRequest.add_member(:s3_bucket_name, Shapes::ShapeRef.new(shape: S3BucketName, required: true, location_name: "S3BucketName"))
+    CreateWebACLMigrationStackRequest.add_member(:ignore_unsupported_type, Shapes::ShapeRef.new(shape: IgnoreUnsupportedType, required: true, location_name: "IgnoreUnsupportedType"))
+    CreateWebACLMigrationStackRequest.struct_class = Types::CreateWebACLMigrationStackRequest
+
+    CreateWebACLMigrationStackResponse.add_member(:s3_object_url, Shapes::ShapeRef.new(shape: S3ObjectUrl, required: true, location_name: "S3ObjectUrl"))
+    CreateWebACLMigrationStackResponse.struct_class = Types::CreateWebACLMigrationStackResponse
+
     CreateWebACLRequest.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "Name"))
     CreateWebACLRequest.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
     CreateWebACLRequest.add_member(:default_action, Shapes::ShapeRef.new(shape: WafAction, required: true, location_name: "DefaultAction"))
@@ -1059,8 +1075,8 @@ module Aws::WAF
     SubscribedRuleGroupSummary.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
     SubscribedRuleGroupSummary.struct_class = Types::SubscribedRuleGroupSummary
 
-    Tag.add_member(:key, Shapes::ShapeRef.new(shape: TagKey, location_name: "Key"))
-    Tag.add_member(:value, Shapes::ShapeRef.new(shape: TagValue, location_name: "Value"))
+    Tag.add_member(:key, Shapes::ShapeRef.new(shape: TagKey, required: true, location_name: "Key"))
+    Tag.add_member(:value, Shapes::ShapeRef.new(shape: TagValue, required: true, location_name: "Value"))
     Tag.struct_class = Types::Tag
 
     TagInfoForResource.add_member(:resource_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ResourceARN"))
@@ -1191,9 +1207,16 @@ module Aws::WAF
     WAFDisallowedNameException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
     WAFDisallowedNameException.struct_class = Types::WAFDisallowedNameException
 
+    WAFEntityMigrationException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
+    WAFEntityMigrationException.add_member(:migration_error_type, Shapes::ShapeRef.new(shape: MigrationErrorType, location_name: "MigrationErrorType"))
+    WAFEntityMigrationException.add_member(:migration_error_reason, Shapes::ShapeRef.new(shape: ErrorReason, location_name: "MigrationErrorReason"))
+    WAFEntityMigrationException.struct_class = Types::WAFEntityMigrationException
+
     WAFInternalErrorException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
     WAFInternalErrorException.struct_class = Types::WAFInternalErrorException
 
+    WAFInvalidAccountException.struct_class = Types::WAFInvalidAccountException
+
     WAFInvalidOperationException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
     WAFInvalidOperationException.struct_class = Types::WAFInvalidOperationException
 
@@ -1464,6 +1487,19 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
       end)
 
+      api.add_operation(:create_web_acl_migration_stack, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateWebACLMigrationStack"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateWebACLMigrationStackRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateWebACLMigrationStackResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFEntityMigrationException)
+      end)
+
       api.add_operation(:create_xss_match_set, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateXssMatchSet"
         o.http_method = "POST"

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

@@ -6,6 +6,47 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::WAF
+
+  # When WAF returns an error response, the Ruby SDK constructs and raises an error.
+  # These errors all extend Aws::WAF::Errors::ServiceError < {Aws::Errors::ServiceError}
+  #
+  # You can rescue all WAF errors using ServiceError:
+  #
+  #     begin
+  #       # do stuff
+  #     rescue Aws::WAF::Errors::ServiceError
+  #       # rescues all WAF API errors
+  #     end
+  #
+  #
+  # ## Request Context
+  # ServiceError objects have a {Aws::Errors::ServiceError#context #context} method that returns
+  # information about the request that generated the error.
+  # See {Seahorse::Client::RequestContext} for more information.
+  #
+  # ## Error Classes
+  # * {WAFBadRequestException}
+  # * {WAFDisallowedNameException}
+  # * {WAFEntityMigrationException}
+  # * {WAFInternalErrorException}
+  # * {WAFInvalidAccountException}
+  # * {WAFInvalidOperationException}
+  # * {WAFInvalidParameterException}
+  # * {WAFInvalidPermissionPolicyException}
+  # * {WAFInvalidRegexPatternException}
+  # * {WAFLimitsExceededException}
+  # * {WAFNonEmptyEntityException}
+  # * {WAFNonexistentContainerException}
+  # * {WAFNonexistentItemException}
+  # * {WAFReferencedItemException}
+  # * {WAFServiceLinkedRoleErrorException}
+  # * {WAFStaleDataException}
+  # * {WAFSubscriptionNotFoundException}
+  # * {WAFTagOperationException}
+  # * {WAFTagOperationInternalErrorException}
+  #
+  # Additionally, error classes are dynamically generated for service errors based on the error code
+  # if they are not defined above.
   module Errors
 
     extend Aws::Errors::DynamicErrors
@@ -23,7 +64,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFDisallowedNameException < ServiceError
@@ -39,7 +79,31 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
+    end
 
+    class WAFEntityMigrationException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::WAF::Types::WAFEntityMigrationException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
+
+      # @return [String]
+      def migration_error_type
+        @data[:migration_error_type]
+      end
+
+      # @return [String]
+      def migration_error_reason
+        @data[:migration_error_reason]
+      end
     end
 
     class WAFInternalErrorException < ServiceError
@@ -55,7 +119,16 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
+    end
 
+    class WAFInvalidAccountException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::WAF::Types::WAFInvalidAccountException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
     end
 
     class WAFInvalidOperationException < ServiceError
@@ -71,7 +144,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFInvalidParameterException < ServiceError
@@ -97,7 +169,6 @@ module Aws::WAF
       def reason
         @data[:reason]
       end
-
     end
 
     class WAFInvalidPermissionPolicyException < ServiceError
@@ -113,7 +184,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFInvalidRegexPatternException < ServiceError
@@ -129,7 +199,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFLimitsExceededException < ServiceError
@@ -145,7 +214,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFNonEmptyEntityException < ServiceError
@@ -161,7 +229,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFNonexistentContainerException < ServiceError
@@ -177,7 +244,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFNonexistentItemException < ServiceError
@@ -193,7 +259,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFReferencedItemException < ServiceError
@@ -209,7 +274,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFServiceLinkedRoleErrorException < ServiceError
@@ -225,7 +289,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFStaleDataException < ServiceError
@@ -241,7 +304,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFSubscriptionNotFoundException < ServiceError
@@ -257,7 +319,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFTagOperationException < ServiceError
@@ -273,7 +334,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
     class WAFTagOperationInternalErrorException < ServiceError
@@ -289,7 +349,6 @@ module Aws::WAF
       def message
         @message || @data[:message]
       end
-
     end
 
   end

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

@@ -6,6 +6,7 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::WAF
+
   class Resource
 
     # @param options ({})

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

@@ -8,6 +8,15 @@
 module Aws::WAF
   module Types
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The `ActivatedRule` object in an UpdateWebACL request specifies a
     # `Rule` that you want to insert or delete, the priority of the `Rule`
     # in the `WebACL`, and the action that you want AWS WAF to take when a
@@ -16,6 +25,11 @@ module Aws::WAF
     # To specify whether to insert or delete a `Rule`, use the `Action`
     # parameter in the WebACLUpdate data type.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass ActivatedRule
     #   data as a hash:
     #
@@ -161,6 +175,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # In a GetByteMatchSet request, `ByteMatchSet` is a complex type that
     # contains the `ByteMatchSetId` and `Name` of a `ByteMatchSet`, and the
     # values that you specified when you updated the `ByteMatchSet`.
@@ -172,6 +195,11 @@ module Aws::WAF
     # match the settings in only one `ByteMatchTuple` to be considered a
     # match.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] byte_match_set_id
     #   The `ByteMatchSetId` for a `ByteMatchSet`. You use `ByteMatchSetId`
     #   to get information about a `ByteMatchSet` (see GetByteMatchSet),
@@ -205,9 +233,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Returned by ListByteMatchSets. Each `ByteMatchSetSummary` object
     # includes the `Name` and `ByteMatchSetId` for one ByteMatchSet.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] byte_match_set_id
     #   The `ByteMatchSetId` for a `ByteMatchSet`. You use `ByteMatchSetId`
     #   to get information about a `ByteMatchSet`, update a `ByteMatchSet`,
@@ -231,10 +273,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # In an UpdateByteMatchSet request, `ByteMatchSetUpdate` specifies
     # whether to insert or delete a ByteMatchTuple and includes the settings
     # for the `ByteMatchTuple`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass ByteMatchSetUpdate
     #   data as a hash:
     #
@@ -271,10 +327,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The bytes (typically a string that corresponds with ASCII characters)
     # that you want AWS WAF to search for in web requests, the location in
     # requests that you want AWS WAF to search, and other settings.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass ByteMatchTuple
     #   data as a hash:
     #
@@ -361,7 +431,7 @@ module Aws::WAF
     #   Text transformations eliminate some of the unusual formatting that
     #   attackers use in web requests in an effort to bypass AWS WAF. If you
     #   specify a transformation, AWS WAF performs the transformation on
-    #   `TargetString` before inspecting a request for a match.
+    #   `FieldToMatch` before inspecting it for a match.
     #
     #   You can only specify a single type of TextTransformation.
     #
@@ -635,8 +705,8 @@ module Aws::WAF
     #         change_token: "ChangeToken", # required
     #         tags: [
     #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
     #           },
     #         ],
     #       }
@@ -807,8 +877,8 @@ module Aws::WAF
     #         change_token: "ChangeToken", # required
     #         tags: [
     #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
     #           },
     #         ],
     #       }
@@ -871,8 +941,8 @@ module Aws::WAF
     #         change_token: "ChangeToken", # required
     #         tags: [
     #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
     #           },
     #         ],
     #       }
@@ -1019,6 +1089,66 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateWebACLMigrationStackRequest
+    #   data as a hash:
+    #
+    #       {
+    #         web_acl_id: "ResourceId", # required
+    #         s3_bucket_name: "S3BucketName", # required
+    #         ignore_unsupported_type: false, # required
+    #       }
+    #
+    # @!attribute [rw] web_acl_id
+    #   The UUID of the WAF Classic web ACL that you want to migrate to WAF
+    #   v2.
+    #   @return [String]
+    #
+    # @!attribute [rw] s3_bucket_name
+    #   The name of the Amazon S3 bucket to store the CloudFormation
+    #   template in. The S3 bucket must be configured as follows for the
+    #   migration:
+    #
+    #   * The bucket name must start with `aws-waf-migration-`. For example,
+    #     `aws-waf-migration-my-web-acl`.
+    #
+    #   * The bucket must be in the Region where you are deploying the
+    #     template. For example, for a web ACL in us-west-2, you must use an
+    #     Amazon S3 bucket in us-west-2 and you must deploy the template
+    #     stack to us-west-2.
+    #
+    #   * The bucket policies must permit the migration process to write
+    #     data. For listings of the bucket policies, see the Examples
+    #     section.
+    #   @return [String]
+    #
+    # @!attribute [rw] ignore_unsupported_type
+    #   Indicates whether to exclude entities that can't be migrated or to
+    #   stop the migration. Set this to true to ignore unsupported entities
+    #   in the web ACL during the migration. Otherwise, if AWS WAF
+    #   encounters unsupported entities, it stops the process and throws an
+    #   exception.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateWebACLMigrationStackRequest AWS API Documentation
+    #
+    class CreateWebACLMigrationStackRequest < Struct.new(
+      :web_acl_id,
+      :s3_bucket_name,
+      :ignore_unsupported_type)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] s3_object_url
+    #   The URL of the template created in Amazon S3.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateWebACLMigrationStackResponse AWS API Documentation
+    #
+    class CreateWebACLMigrationStackResponse < Struct.new(
+      :s3_object_url)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateWebACLRequest
     #   data as a hash:
     #
@@ -1031,8 +1161,8 @@ module Aws::WAF
     #         change_token: "ChangeToken", # required
     #         tags: [
     #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
     #           },
     #         ],
     #       }
@@ -1664,10 +1794,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The rule to exclude from a rule group. This is applicable only when
     # the `ActivatedRule` refers to a `RuleGroup`. The rule must belong to
     # the `RuleGroup` that is specified by the `ActivatedRule`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: 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:
     #
@@ -1686,8 +1830,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies where in a web request to look for `TargetString`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: 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:
     #
@@ -1756,9 +1914,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The country from which web requests originate that you want AWS WAF to
     # search for.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass GeoMatchConstraint
     #   data as a hash:
     #
@@ -1784,8 +1956,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains one or more countries that AWS WAF will search for.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] geo_match_set_id
     #   The `GeoMatchSetId` for an `GeoMatchSet`. You use `GeoMatchSetId` to
     #   get information about a `GeoMatchSet` (see GeoMatchSet), update a
@@ -1816,8 +2002,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains the identifier and the name of the `GeoMatchSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] geo_match_set_id
     #   The `GeoMatchSetId` for an GeoMatchSet. You can use `GeoMatchSetId`
     #   in a GetGeoMatchSet request to get detailed information about an
@@ -1837,9 +2037,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the type of update to perform to an GeoMatchSet with
     # UpdateGeoMatchSet.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass GeoMatchSetUpdate
     #   data as a hash:
     #
@@ -2333,9 +2547,10 @@ module Aws::WAF
     # @!attribute [rw] time_window
     #   The start date and time and the end date and time of the range for
     #   which you want `GetSampledRequests` to return a sample of requests.
-    #   Specify the date and time in the following format:
-    #   `"2016-09-27T14:50Z"`. You can specify any time range in the
-    #   previous three hours.
+    #   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.
     #   @return [Types::TimeWindow]
     #
     # @!attribute [rw] max_items
@@ -2373,7 +2588,8 @@ module Aws::WAF
     #   `GetSampledRequests` request. However, if your AWS resource received
     #   more than 5,000 requests during the time range that you specified in
     #   the request, `GetSampledRequests` returns the time range for the
-    #   first 5,000 requests.
+    #   first 5,000 requests. Times are in Coordinated Universal Time (UTC)
+    #   format.
     #   @return [Types::TimeWindow]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/GetSampledRequestsResponse AWS API Documentation
@@ -2558,12 +2774,26 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The response from a GetSampledRequests request includes an
     # `HTTPHeader` 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 that were returned by
     # `GetSampledRequests`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] name
     #   The name of one of the headers in the sampled web request.
     #   @return [String]
@@ -2580,11 +2810,25 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The response from a GetSampledRequests request includes an
     # `HTTPRequest` complex type that appears as `Request` in the response
     # syntax. `HTTPRequest` contains information about one of the web
     # requests that were returned by `GetSampledRequests`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: 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 `WebACL` is
     #   associated with a CloudFront distribution, this is the value of one
@@ -2641,6 +2885,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains one or more IP addresses or blocks of IP addresses specified
     # in Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports
     # IPv4 address ranges: /8 and any range between /16 through /32. AWS WAF
@@ -2651,11 +2904,13 @@ module Aws::WAF
     # range of IP addresses, you can specify /8 or any range between /16
     # through /32 (for IPv4) or /24, /32, /48, /56, /64, or /128 (for IPv6).
     # For more information about CIDR notation, see the Wikipedia entry
-    # [Classless Inter-Domain Routing][1].
+    # [Classless Inter-Domain Routing][3].
     #
     #
     #
-    # [1]: https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    # [3]: https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
     #
     # @!attribute [rw] ip_set_id
     #   The `IPSetId` for an `IPSet`. You use `IPSetId` to get information
@@ -2689,9 +2944,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the IP address type (`IPV4` or `IPV6`) and the IP address
     # range (in CIDR format) that web requests originate from.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass IPSetDescriptor
     #   data as a hash:
     #
@@ -2744,8 +3013,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains the identifier and the name of the `IPSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] ip_set_id
     #   The `IPSetId` for an IPSet. You can use `IPSetId` in a GetIPSet
     #   request to get detailed information about an IPSet.
@@ -2764,8 +3047,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the type of update to perform to an IPSet with UpdateIPSet.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass IPSetUpdate
     #   data as a hash:
     #
@@ -3656,9 +3953,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The Amazon Kinesis Data Firehose, `RedactedFields` information, and
     # the web ACL Amazon Resource Name (ARN).
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: 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:
     #
@@ -3697,12 +4008,26 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the ByteMatchSet, IPSet, SqlInjectionMatchSet, XssMatchSet,
     # RegexMatchSet, GeoMatchSet, and SizeConstraintSet objects that you
     # want to add to a `Rule` and, for each object, indicates whether you
     # want to negate the settings, for example, requests that do NOT
     # originate from the IP address 192.0.2.44.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass Predicate
     #   data as a hash:
     #
@@ -3821,6 +4146,15 @@ module Aws::WAF
     #
     class PutPermissionPolicyResponse < Aws::EmptyStructure; end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # A `RateBasedRule` is identical to a regular Rule, with one addition: a
     # `RateBasedRule` counts the number of requests that arrive from a
     # specified IP address every five minutes. For example, based on recent
@@ -3831,12 +4165,17 @@ module Aws::WAF
     #
     # * They contain the value `BadBot` in the `User-Agent` header.
     #
-    # In the rule, you also define the rate limit as 15,000.
+    # In the rule, you also define the rate limit as 1,000.
     #
-    # Requests that meet both of these conditions and exceed 15,000 requests
+    # Requests that meet both of these conditions and exceed 1,000 requests
     # every five minutes trigger the rule's action (block or count), which
     # is defined in the web ACL.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] rule_id
     #   A unique identifier for a `RateBasedRule`. You use `RuleId` to get
     #   more information about a `RateBasedRule` (see GetRateBasedRule),
@@ -3894,6 +4233,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # In a GetRegexMatchSet request, `RegexMatchSet` is a complex type that
     # contains the `RegexMatchSetId` and `Name` of a `RegexMatchSet`, and
     # the values that you specified when you updated the `RegexMatchSet`.
@@ -3905,6 +4253,11 @@ module Aws::WAF
     # match the settings in only one `ByteMatchTuple` to be considered a
     # match.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] regex_match_set_id
     #   The `RegexMatchSetId` for a `RegexMatchSet`. You use
     #   `RegexMatchSetId` to get information about a `RegexMatchSet` (see
@@ -3946,9 +4299,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Returned by ListRegexMatchSets. Each `RegexMatchSetSummary` object
     # includes the `Name` and `RegexMatchSetId` for one RegexMatchSet.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] regex_match_set_id
     #   The `RegexMatchSetId` for a `RegexMatchSet`. You use
     #   `RegexMatchSetId` to get information about a `RegexMatchSet`, update
@@ -3972,10 +4339,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # In an UpdateRegexMatchSet request, `RegexMatchSetUpdate` specifies
     # whether to insert or delete a RegexMatchTuple and includes the
     # settings for the `RegexMatchTuple`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass RegexMatchSetUpdate
     #   data as a hash:
     #
@@ -4012,6 +4393,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The regular expression pattern that you want AWS WAF to search for in
     # web requests, the location in requests that you want AWS WAF to
     # search, and other settings. Each `RegexMatchTuple` object contains:
@@ -4026,6 +4416,11 @@ module Aws::WAF
     #   converting it to lowercase, before inspecting it for the specified
     #   string.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass RegexMatchTuple
     #   data as a hash:
     #
@@ -4142,10 +4537,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The `RegexPatternSet` specifies the regular expression (regex) pattern
     # that you want AWS WAF to search for, such as `B[a@]dB[o0]t`. You can
     # then configure AWS WAF to reject those requests.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] regex_pattern_set_id
     #   The identifier for the `RegexPatternSet`. You use
     #   `RegexPatternSetId` to get information about a `RegexPatternSet`,
@@ -4175,9 +4584,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Returned by ListRegexPatternSets. Each `RegexPatternSetSummary` object
     # includes the `Name` and `RegexPatternSetId` for one RegexPatternSet.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] regex_pattern_set_id
     #   The `RegexPatternSetId` for a `RegexPatternSet`. You use
     #   `RegexPatternSetId` to get information about a `RegexPatternSet`,
@@ -4201,10 +4624,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # In an UpdateRegexPatternSet request, `RegexPatternSetUpdate` specifies
     # whether to insert or delete a `RegexPatternString` and includes the
     # settings for the `RegexPatternString`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass RegexPatternSetUpdate
     #   data as a hash:
     #
@@ -4230,6 +4667,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # A combination of ByteMatchSet, IPSet, and/or SqlInjectionMatchSet
     # objects that identify the web requests that you want to allow, block,
     # or count. For example, you might create a `Rule` that includes the
@@ -4245,6 +4691,11 @@ module Aws::WAF
     # `192.0.2.44` AND include a `User-Agent` header for which the value is
     # `BadBot`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] rule_id
     #   A unique identifier for a `Rule`. You use `RuleId` to get more
     #   information about a `Rule` (see GetRule), update a `Rule` (see
@@ -4285,6 +4736,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # A collection of predefined rules that you can add to a web ACL.
     #
     # Rule groups are subject to the following limits:
@@ -4296,6 +4756,11 @@ module Aws::WAF
     #
     # * Ten rules per rule group.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] rule_group_id
     #   A unique identifier for a `RuleGroup`. You use `RuleGroupId` to get
     #   more information about a `RuleGroup` (see GetRuleGroup), update a
@@ -4329,9 +4794,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains the identifier and the friendly name or description of the
     # `RuleGroup`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] rule_group_id
     #   A unique identifier for a `RuleGroup`. You use `RuleGroupId` to get
     #   more information about a `RuleGroup` (see GetRuleGroup), update a
@@ -4355,9 +4834,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies an `ActivatedRule` and indicates whether you want to add it
     # to a `RuleGroup` or delete it from a `RuleGroup`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass RuleGroupUpdate
     #   data as a hash:
     #
@@ -4401,9 +4894,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains the identifier and the friendly name or description of the
     # `Rule`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] rule_id
     #   A unique identifier for a `Rule`. You use `RuleId` to get more
     #   information about a `Rule` (see GetRule), update a `Rule` (see
@@ -4427,9 +4934,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies a `Predicate` (such as an `IPSet`) and indicates whether you
     # want to add it to a `Rule` or delete it from a `Rule`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass RuleUpdate
     #   data as a hash:
     #
@@ -4460,12 +4981,26 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The response from a GetSampledRequests request includes a
     # `SampledHTTPRequests` complex type that appears as `SampledRequests`
     # in the response syntax. `SampledHTTPRequests` contains one
     # `SampledHTTPRequest` object for each web request that is returned by
     # `GetSampledRequests`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: 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]
@@ -4505,12 +5040,26 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies a constraint on the size of a part of the web request. AWS
     # WAF uses the `Size`, `ComparisonOperator`, and `FieldToMatch` to build
     # an expression in the form of "`Size` `ComparisonOperator` size in
     # bytes of `FieldToMatch`". If that expression is true, the
     # `SizeConstraint` is considered to match.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass SizeConstraint
     #   data as a hash:
     #
@@ -4532,7 +5081,7 @@ module Aws::WAF
     #   Text transformations eliminate some of the unusual formatting that
     #   attackers use in web requests in an effort to bypass AWS WAF. If you
     #   specify a transformation, AWS WAF performs the transformation on
-    #   `FieldToMatch` before inspecting a request for a match.
+    #   `FieldToMatch` before inspecting it for a match.
     #
     #   You can only specify a single type of TextTransformation.
     #
@@ -4661,12 +5210,26 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # A complex type that contains `SizeConstraint` objects, which specify
     # the parts of web requests that you want AWS WAF to inspect the size
     # of. If a `SizeConstraintSet` contains more than one `SizeConstraint`
     # object, a request only needs to match one constraint to be considered
     # a match.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] size_constraint_set_id
     #   A unique identifier for a `SizeConstraintSet`. You use
     #   `SizeConstraintSetId` to get information about a `SizeConstraintSet`
@@ -4697,8 +5260,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The `Id` and `Name` of a `SizeConstraintSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] size_constraint_set_id
     #   A unique identifier for a `SizeConstraintSet`. You use
     #   `SizeConstraintSetId` to get information about a `SizeConstraintSet`
@@ -4723,10 +5300,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the part of a web request that you want to inspect the size
     # of and indicates whether you want to add the specification to a
     # SizeConstraintSet or delete it from a `SizeConstraintSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass SizeConstraintSetUpdate
     #   data as a hash:
     #
@@ -4765,6 +5356,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # A complex type that contains `SqlInjectionMatchTuple` objects, which
     # specify the parts of web requests that you want AWS WAF to inspect for
     # snippets of malicious SQL code and, if you want AWS WAF to inspect a
@@ -4773,6 +5373,11 @@ module Aws::WAF
     # include snippets of SQL code in only one of the specified parts of the
     # request to be considered a match.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] sql_injection_match_set_id
     #   A unique identifier for a `SqlInjectionMatchSet`. You use
     #   `SqlInjectionMatchSetId` to get information about a
@@ -4804,8 +5409,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The `Id` and `Name` of a `SqlInjectionMatchSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] sql_injection_match_set_id
     #   A unique identifier for a `SqlInjectionMatchSet`. You use
     #   `SqlInjectionMatchSetId` to get information about a
@@ -4831,11 +5450,25 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the part of a web request that you want to inspect for
     # snippets of malicious SQL code and indicates whether you want to add
     # the specification to a SqlInjectionMatchSet or delete it from a
     # `SqlInjectionMatchSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass SqlInjectionMatchSetUpdate
     #   data as a hash:
     #
@@ -4870,10 +5503,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the part of a web request that you want AWS WAF to inspect
     # for snippets of malicious SQL code and, if you want AWS WAF to inspect
     # a header, the name of the header.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass SqlInjectionMatchTuple
     #   data as a hash:
     #
@@ -4894,7 +5541,7 @@ module Aws::WAF
     #   Text transformations eliminate some of the unusual formatting that
     #   attackers use in web requests in an effort to bypass AWS WAF. If you
     #   specify a transformation, AWS WAF performs the transformation on
-    #   `FieldToMatch` before inspecting a request for a match.
+    #   `FieldToMatch` before inspecting it for a match.
     #
     #   You can only specify a single type of TextTransformation.
     #
@@ -4976,8 +5623,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # A summary of the rule groups you are subscribed to.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] rule_group_id
     #   A unique identifier for a `RuleGroup`.
     #   @return [String]
@@ -5005,12 +5666,37 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </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. For example, you might set the tag key to "customer" and
+    # the value to the customer name or ID. You can specify one or more tags
+    # to add to each AWS resource, up to 50 tags for a resource.
+    #
+    # Tagging is only available through the API, SDKs, and CLI. You can't
+    # manage or view tags through the AWS WAF Classic console. You can tag
+    # the AWS resources that you manage through AWS WAF Classic: web ACLs,
+    # rule groups, and rules.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: 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:
     #
     #       {
-    #         key: "TagKey",
-    #         value: "TagValue",
+    #         key: "TagKey", # required
+    #         value: "TagValue", # required
     #       }
     #
     # @!attribute [rw] key
@@ -5027,6 +5713,32 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
+    # Information for 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. For example, you might set the
+    # tag key to "customer" and the value to the customer name or ID. You
+    # can specify one or more tags to add to each AWS resource, up to 50
+    # tags for a resource.
+    #
+    # Tagging is only available through the API, SDKs, and CLI. You can't
+    # manage or view tags through the AWS WAF Classic console. You can tag
+    # the AWS resources that you manage through AWS WAF Classic: web ACLs,
+    # rule groups, and rules.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] resource_arn
     #   @return [String]
     #
@@ -5048,8 +5760,8 @@ module Aws::WAF
     #         resource_arn: "ResourceArn", # required
     #         tags: [ # required
     #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
     #           },
     #         ],
     #       }
@@ -5072,10 +5784,23 @@ module Aws::WAF
     #
     class TagResourceResponse < Aws::EmptyStructure; end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </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.
     #
+    # You must specify the times in Coordinated Universal Time (UTC) format.
+    # UTC format includes the special designator, `Z`. For example,
+    # `"2016-09-27T14:50Z"`.
+    #
     # In a GetSampledRequests response, the `StartTime` and `EndTime`
     # objects specify the time range for which AWS WAF actually returned a
     # sample of web requests. AWS WAF gets the specified number of requests
@@ -5085,6 +5810,11 @@ module Aws::WAF
     # 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/classic-waf-chapter.html
+    # [2]: 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:
     #
@@ -5096,17 +5826,19 @@ module Aws::WAF
     # @!attribute [rw] start_time
     #   The beginning of the time range from which you want
     #   `GetSampledRequests` to return a sample of the requests that your
-    #   AWS resource received. Specify the date and time in the following
-    #   format: `"2016-09-27T14:50Z"`. You can specify any time range in the
-    #   previous three hours.
+    #   AWS resource received. You must specify the date and time 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.
     #   @return [Time]
     #
     # @!attribute [rw] end_time
     #   The end of the time range from which you want `GetSampledRequests`
     #   to return a sample of the requests that your AWS resource received.
-    #   Specify the date and time in the following format:
-    #   `"2016-09-27T14:50Z"`. You can specify any time range in the
-    #   previous three hours.
+    #   You must specify the date and time 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.
     #   @return [Time]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/TimeWindow AWS API Documentation
@@ -5961,6 +6693,46 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # The operation failed due to a problem with the migration. The failure
+    # cause is provided in the exception, in the `MigrationErrorType`\:
+    #
+    # * `ENTITY_NOT_SUPPORTED` - The web ACL has an unsupported entity but
+    #   the `IgnoreUnsupportedType` is not set to true.
+    #
+    # * `ENTITY_NOT_FOUND` - The web ACL doesn't exist.
+    #
+    # * `S3_BUCKET_NO_PERMISSION` - You don't have permission to perform
+    #   the `PutObject` action to the specified Amazon S3 bucket.
+    #
+    # * `S3_BUCKET_NOT_ACCESSIBLE` - The bucket policy doesn't allow AWS
+    #   WAF to perform the `PutObject` action in the bucket.
+    #
+    # * `S3_BUCKET_NOT_FOUND` - The S3 bucket doesn't exist.
+    #
+    # * `S3_BUCKET_INVALID_REGION` - The S3 bucket is not in the same Region
+    #   as the web ACL.
+    #
+    # * `S3_INTERNAL_ERROR` - AWS WAF failed to create the template in the
+    #   S3 bucket for another reason.
+    #
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @!attribute [rw] migration_error_type
+    #   @return [String]
+    #
+    # @!attribute [rw] migration_error_reason
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/WAFEntityMigrationException AWS API Documentation
+    #
+    class WAFEntityMigrationException < Struct.new(
+      :message,
+      :migration_error_type,
+      :migration_error_reason)
+      include Aws::Structure
+    end
+
     # The operation failed because of a system problem, even though the
     # request was valid. Retry your request.
     #
@@ -5974,6 +6746,13 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # The operation failed because you tried to create, update, or delete an
+    # object by using an invalid account identifier.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/WAFInvalidAccountException AWS API Documentation
+    #
+    class WAFInvalidAccountException < Aws::EmptyStructure; end
+
     # The operation failed because there was nothing to do. For example:
     #
     # * You tried to remove a `Rule` from a `WebACL`, but the `Rule` isn't
@@ -6259,6 +7038,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # For the action that is associated with a rule in a `WebACL`, specifies
     # the action that you want AWS WAF to perform when a web request matches
     # all of the conditions in a rule. For the default action in a `WebACL`,
@@ -6266,6 +7054,11 @@ module Aws::WAF
     # doesn't match all of the conditions in any of the rules in a
     # `WebACL`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass WafAction
     #   data as a hash:
     #
@@ -6295,9 +7088,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The action to take if any rule within the `RuleGroup` matches a
     # request.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass WafOverrideAction
     #   data as a hash:
     #
@@ -6318,6 +7125,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains the `Rules` that identify the requests that you want to
     # allow, block, or count. In a `WebACL`, you also specify a default
     # action (`ALLOW` or `BLOCK`), and the action for each `Rule` that you
@@ -6329,6 +7145,11 @@ module Aws::WAF
     # specifications to be allowed, blocked, or counted. For more
     # information, see UpdateWebACL.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] web_acl_id
     #   A unique identifier for a `WebACL`. You use `WebACLId` to get
     #   information about a `WebACL` (see GetWebACL), update a `WebACL` (see
@@ -6378,8 +7199,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Contains the identifier and the name or description of the WebACL.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] web_acl_id
     #   A unique identifier for a `WebACL`. You use `WebACLId` to get
     #   information about a `WebACL` (see GetWebACL), update a `WebACL` (see
@@ -6402,9 +7237,23 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies whether to insert a `Rule` into or delete a `Rule` from a
     # `WebACL`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass WebACLUpdate
     #   data as a hash:
     #
@@ -6448,6 +7297,15 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # A complex type that contains `XssMatchTuple` objects, which specify
     # the parts of web requests that you want AWS WAF to inspect for
     # cross-site scripting attacks and, if you want AWS WAF to inspect a
@@ -6456,6 +7314,11 @@ module Aws::WAF
     # scripting attacks in only one of the specified parts of the request to
     # be considered a match.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] xss_match_set_id
     #   A unique identifier for an `XssMatchSet`. You use `XssMatchSetId` to
     #   get information about an `XssMatchSet` (see GetXssMatchSet), update
@@ -6485,8 +7348,22 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # The `Id` and `Name` of an `XssMatchSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @!attribute [rw] xss_match_set_id
     #   A unique identifier for an `XssMatchSet`. You use `XssMatchSetId` to
     #   get information about a `XssMatchSet` (see GetXssMatchSet), update
@@ -6510,10 +7387,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the part of a web request that you want to inspect for
     # cross-site scripting attacks and indicates whether you want to add the
     # specification to an XssMatchSet or delete it from an `XssMatchSet`.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass XssMatchSetUpdate
     #   data as a hash:
     #
@@ -6547,10 +7438,24 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # <note markdown="1"> This is **AWS WAF Classic** documentation. For more information, see
+    # [AWS WAF Classic][1] in the developer guide.
+    #
+    #  **For the latest version of AWS WAF**, use the AWS WAFV2 API and see
+    # the [AWS WAF Developer Guide][2]. With the latest version, AWS WAF has
+    # a single set of endpoints for regional and global use.
+    #
+    #  </note>
+    #
     # Specifies the part of a web request that you want AWS WAF to inspect
     # for cross-site scripting attacks and, if you want AWS WAF to inspect a
     # header, the name of the header.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/waf/latest/developerguide/classic-waf-chapter.html
+    # [2]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html
+    #
     # @note When making an API call, you may pass XssMatchTuple
     #   data as a hash:
     #
@@ -6571,7 +7476,7 @@ module Aws::WAF
     #   Text transformations eliminate some of the unusual formatting that
     #   attackers use in web requests in an effort to bypass AWS WAF. If you
     #   specify a transformation, AWS WAF performs the transformation on
-    #   `FieldToMatch` before inspecting a request for a match.
+    #   `FieldToMatch` before inspecting it for a match.
     #
     #   You can only specify a single type of TextTransformation.
     #