aws-sdk-wafv2 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d0df9e080516330ba603b141d4b1e39ed89c6899502b9a28a3914ab49f626b
-  data.tar.gz: 7b5207686c843b655b455d5a2f7b25226c913f0a861e52b5c58233a6b743197b
+  metadata.gz: 6e9d6a8e2557b51c9c3e5a4d606747891a819a20ed856947580d54188deae0d5
+  data.tar.gz: d601b83b2448f1f6ec020e74af995b46c1703c948a9d129444298932e2513c01
 SHA512:
-  metadata.gz: 84ef701f5487386541c792ce0286b65de4eb8ab1084f30dcb391ecb5695aa3829d01d5f5949ed6502f14159c8eeddbe19e70c2e65e87a49fc1c182f1c3c3a483
-  data.tar.gz: c9b89c433346bfd803051241750e173f37034a7988841354f32784b194479cff2be4a1650870bca0305ae4520c2fdfd810aa8b216a0b715567107183cc24f84f
+  metadata.gz: 40c7b3dfd758e3fef63bcabe75a26d430c21bade9e906a805548968f462da0202307a58e1c57d27caca3d11ae552734c6d7e0ecfa90e076422b957a9d6742003
+  data.tar.gz: 2baeeac2c2a2197fc4eeccd341d7c0cb36b3c129c5be33a0710b9418019d9db902c2b50f09b75209f79abeda3853c3cc3263e1a9f16f225ff3efd69cce77091f

data/lib/aws-sdk-wafv2.rb

@@ -47,6 +47,6 @@ require_relative 'aws-sdk-wafv2/customizations'
 # @service
 module Aws::WAFV2
 
-  GEM_VERSION = '1.8.0'
+  GEM_VERSION = '1.9.0'
 
 end

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

@@ -543,6 +543,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -554,6 +558,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -584,10 +593,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -1045,6 +1058,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -1056,6 +1073,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -1086,10 +1108,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -1363,6 +1389,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -1374,6 +1404,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -1404,10 +1439,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -2338,10 +2377,15 @@ module Aws::WAFV2
     #   resp.rule_group.rules[0].statement.size_constraint_statement.text_transformations[0].type #=> String, one of "NONE", "COMPRESS_WHITE_SPACE", "HTML_ENTITY_DECODE", "LOWERCASE", "CMD_LINE", "URL_DECODE"
     #   resp.rule_group.rules[0].statement.geo_match_statement.country_codes #=> Array
     #   resp.rule_group.rules[0].statement.geo_match_statement.country_codes[0] #=> String, one of "AF", "AX", "AL", "DZ", "AS", "AD", "AO", "AI", "AQ", "AG", "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD", "BB", "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BQ", "BA", "BW", "BV", "BR", "IO", "BN", "BG", "BF", "BI", "KH", "CM", "CA", "CV", "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ", "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE", "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA", "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GD", "GP", "GU", "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK", "HU", "IS", "IN", "ID", "IR", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KP", "KR", "KW", "KG", "LA", "LV", "LB", "LS", "LR", "LY", "LI", "LT", "LU", "MO", "MK", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ", "MR", "MU", "YT", "MX", "FM", "MD", "MC", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NC", "NZ", "NI", "NE", "NG", "NU", "NF", "MP", "NO", "OM", "PK", "PW", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RE", "RO", "RU", "RW", "BL", "SH", "KN", "LC", "MF", "PM", "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SX", "SK", "SI", "SB", "SO", "ZA", "GS", "SS", "ES", "LK", "SD", "SR", "SJ", "SZ", "SE", "CH", "SY", "TW", "TJ", "TZ", "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC", "TV", "UG", "UA", "AE", "GB", "US", "UM", "UY", "UZ", "VU", "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW"
+    #   resp.rule_group.rules[0].statement.geo_match_statement.forwarded_ip_config.header_name #=> String
+    #   resp.rule_group.rules[0].statement.geo_match_statement.forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
     #   resp.rule_group.rules[0].statement.rule_group_reference_statement.arn #=> String
     #   resp.rule_group.rules[0].statement.rule_group_reference_statement.excluded_rules #=> Array
     #   resp.rule_group.rules[0].statement.rule_group_reference_statement.excluded_rules[0].name #=> String
     #   resp.rule_group.rules[0].statement.ip_set_reference_statement.arn #=> String
+    #   resp.rule_group.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.header_name #=> String
+    #   resp.rule_group.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
+    #   resp.rule_group.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.position #=> String, one of "FIRST", "LAST", "ANY"
     #   resp.rule_group.rules[0].statement.regex_pattern_set_reference_statement.arn #=> String
     #   resp.rule_group.rules[0].statement.regex_pattern_set_reference_statement.field_to_match.single_header.name #=> String
     #   resp.rule_group.rules[0].statement.regex_pattern_set_reference_statement.field_to_match.single_query_argument.name #=> String
@@ -2349,8 +2393,10 @@ module Aws::WAFV2
     #   resp.rule_group.rules[0].statement.regex_pattern_set_reference_statement.text_transformations[0].priority #=> Integer
     #   resp.rule_group.rules[0].statement.regex_pattern_set_reference_statement.text_transformations[0].type #=> String, one of "NONE", "COMPRESS_WHITE_SPACE", "HTML_ENTITY_DECODE", "LOWERCASE", "CMD_LINE", "URL_DECODE"
     #   resp.rule_group.rules[0].statement.rate_based_statement.limit #=> Integer
-    #   resp.rule_group.rules[0].statement.rate_based_statement.aggregate_key_type #=> String, one of "IP"
+    #   resp.rule_group.rules[0].statement.rate_based_statement.aggregate_key_type #=> String, one of "IP", "FORWARDED_IP"
     #   resp.rule_group.rules[0].statement.rate_based_statement.scope_down_statement #=> Types::Statement
+    #   resp.rule_group.rules[0].statement.rate_based_statement.forwarded_ip_config.header_name #=> String
+    #   resp.rule_group.rules[0].statement.rate_based_statement.forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
     #   resp.rule_group.rules[0].statement.and_statement.statements #=> Array
     #   resp.rule_group.rules[0].statement.and_statement.statements[0] #=> Types::Statement
     #   resp.rule_group.rules[0].statement.or_statement.statements #=> Array
@@ -2425,7 +2471,8 @@ module Aws::WAFV2
     # @option params [required, Types::TimeWindow] :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:
+    #   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.
     #
@@ -2566,10 +2613,15 @@ module Aws::WAFV2
     #   resp.web_acl.rules[0].statement.size_constraint_statement.text_transformations[0].type #=> String, one of "NONE", "COMPRESS_WHITE_SPACE", "HTML_ENTITY_DECODE", "LOWERCASE", "CMD_LINE", "URL_DECODE"
     #   resp.web_acl.rules[0].statement.geo_match_statement.country_codes #=> Array
     #   resp.web_acl.rules[0].statement.geo_match_statement.country_codes[0] #=> String, one of "AF", "AX", "AL", "DZ", "AS", "AD", "AO", "AI", "AQ", "AG", "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD", "BB", "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BQ", "BA", "BW", "BV", "BR", "IO", "BN", "BG", "BF", "BI", "KH", "CM", "CA", "CV", "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ", "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE", "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA", "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GD", "GP", "GU", "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK", "HU", "IS", "IN", "ID", "IR", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KP", "KR", "KW", "KG", "LA", "LV", "LB", "LS", "LR", "LY", "LI", "LT", "LU", "MO", "MK", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ", "MR", "MU", "YT", "MX", "FM", "MD", "MC", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NC", "NZ", "NI", "NE", "NG", "NU", "NF", "MP", "NO", "OM", "PK", "PW", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RE", "RO", "RU", "RW", "BL", "SH", "KN", "LC", "MF", "PM", "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SX", "SK", "SI", "SB", "SO", "ZA", "GS", "SS", "ES", "LK", "SD", "SR", "SJ", "SZ", "SE", "CH", "SY", "TW", "TJ", "TZ", "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC", "TV", "UG", "UA", "AE", "GB", "US", "UM", "UY", "UZ", "VU", "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW"
+    #   resp.web_acl.rules[0].statement.geo_match_statement.forwarded_ip_config.header_name #=> String
+    #   resp.web_acl.rules[0].statement.geo_match_statement.forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
     #   resp.web_acl.rules[0].statement.rule_group_reference_statement.arn #=> String
     #   resp.web_acl.rules[0].statement.rule_group_reference_statement.excluded_rules #=> Array
     #   resp.web_acl.rules[0].statement.rule_group_reference_statement.excluded_rules[0].name #=> String
     #   resp.web_acl.rules[0].statement.ip_set_reference_statement.arn #=> String
+    #   resp.web_acl.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.header_name #=> String
+    #   resp.web_acl.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
+    #   resp.web_acl.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.position #=> String, one of "FIRST", "LAST", "ANY"
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.arn #=> String
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.field_to_match.single_header.name #=> String
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.field_to_match.single_query_argument.name #=> String
@@ -2577,8 +2629,10 @@ module Aws::WAFV2
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.text_transformations[0].priority #=> Integer
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.text_transformations[0].type #=> String, one of "NONE", "COMPRESS_WHITE_SPACE", "HTML_ENTITY_DECODE", "LOWERCASE", "CMD_LINE", "URL_DECODE"
     #   resp.web_acl.rules[0].statement.rate_based_statement.limit #=> Integer
-    #   resp.web_acl.rules[0].statement.rate_based_statement.aggregate_key_type #=> String, one of "IP"
+    #   resp.web_acl.rules[0].statement.rate_based_statement.aggregate_key_type #=> String, one of "IP", "FORWARDED_IP"
     #   resp.web_acl.rules[0].statement.rate_based_statement.scope_down_statement #=> Types::Statement
+    #   resp.web_acl.rules[0].statement.rate_based_statement.forwarded_ip_config.header_name #=> String
+    #   resp.web_acl.rules[0].statement.rate_based_statement.forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
     #   resp.web_acl.rules[0].statement.and_statement.statements #=> Array
     #   resp.web_acl.rules[0].statement.and_statement.statements[0] #=> Types::Statement
     #   resp.web_acl.rules[0].statement.or_statement.statements #=> Array
@@ -2694,10 +2748,15 @@ module Aws::WAFV2
     #   resp.web_acl.rules[0].statement.size_constraint_statement.text_transformations[0].type #=> String, one of "NONE", "COMPRESS_WHITE_SPACE", "HTML_ENTITY_DECODE", "LOWERCASE", "CMD_LINE", "URL_DECODE"
     #   resp.web_acl.rules[0].statement.geo_match_statement.country_codes #=> Array
     #   resp.web_acl.rules[0].statement.geo_match_statement.country_codes[0] #=> String, one of "AF", "AX", "AL", "DZ", "AS", "AD", "AO", "AI", "AQ", "AG", "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD", "BB", "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BQ", "BA", "BW", "BV", "BR", "IO", "BN", "BG", "BF", "BI", "KH", "CM", "CA", "CV", "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ", "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE", "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA", "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GD", "GP", "GU", "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK", "HU", "IS", "IN", "ID", "IR", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KP", "KR", "KW", "KG", "LA", "LV", "LB", "LS", "LR", "LY", "LI", "LT", "LU", "MO", "MK", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ", "MR", "MU", "YT", "MX", "FM", "MD", "MC", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NC", "NZ", "NI", "NE", "NG", "NU", "NF", "MP", "NO", "OM", "PK", "PW", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RE", "RO", "RU", "RW", "BL", "SH", "KN", "LC", "MF", "PM", "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SX", "SK", "SI", "SB", "SO", "ZA", "GS", "SS", "ES", "LK", "SD", "SR", "SJ", "SZ", "SE", "CH", "SY", "TW", "TJ", "TZ", "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC", "TV", "UG", "UA", "AE", "GB", "US", "UM", "UY", "UZ", "VU", "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW"
+    #   resp.web_acl.rules[0].statement.geo_match_statement.forwarded_ip_config.header_name #=> String
+    #   resp.web_acl.rules[0].statement.geo_match_statement.forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
     #   resp.web_acl.rules[0].statement.rule_group_reference_statement.arn #=> String
     #   resp.web_acl.rules[0].statement.rule_group_reference_statement.excluded_rules #=> Array
     #   resp.web_acl.rules[0].statement.rule_group_reference_statement.excluded_rules[0].name #=> String
     #   resp.web_acl.rules[0].statement.ip_set_reference_statement.arn #=> String
+    #   resp.web_acl.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.header_name #=> String
+    #   resp.web_acl.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
+    #   resp.web_acl.rules[0].statement.ip_set_reference_statement.ip_set_forwarded_ip_config.position #=> String, one of "FIRST", "LAST", "ANY"
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.arn #=> String
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.field_to_match.single_header.name #=> String
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.field_to_match.single_query_argument.name #=> String
@@ -2705,8 +2764,10 @@ module Aws::WAFV2
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.text_transformations[0].priority #=> Integer
     #   resp.web_acl.rules[0].statement.regex_pattern_set_reference_statement.text_transformations[0].type #=> String, one of "NONE", "COMPRESS_WHITE_SPACE", "HTML_ENTITY_DECODE", "LOWERCASE", "CMD_LINE", "URL_DECODE"
     #   resp.web_acl.rules[0].statement.rate_based_statement.limit #=> Integer
-    #   resp.web_acl.rules[0].statement.rate_based_statement.aggregate_key_type #=> String, one of "IP"
+    #   resp.web_acl.rules[0].statement.rate_based_statement.aggregate_key_type #=> String, one of "IP", "FORWARDED_IP"
     #   resp.web_acl.rules[0].statement.rate_based_statement.scope_down_statement #=> Types::Statement
+    #   resp.web_acl.rules[0].statement.rate_based_statement.forwarded_ip_config.header_name #=> String
+    #   resp.web_acl.rules[0].statement.rate_based_statement.forwarded_ip_config.fallback_behavior #=> String, one of "MATCH", "NO_MATCH"
     #   resp.web_acl.rules[0].statement.and_statement.statements #=> Array
     #   resp.web_acl.rules[0].statement.and_statement.statements[0] #=> Types::Statement
     #   resp.web_acl.rules[0].statement.or_statement.statements #=> Array
@@ -3175,7 +3236,16 @@ module Aws::WAFV2
     #
     #  </note>
     #
-    # Retrieves the TagInfoForResource for the specified resource.
+    # Retrieves the TagInfoForResource for the specified 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.
+    #
+    # You can tag the AWS resources that you manage through AWS WAF: web
+    # ACLs, rule groups, IP sets, and regex pattern sets. You can't manage
+    # or view tags through the AWS WAF console.
     #
     #
     #
@@ -3318,6 +3388,9 @@ module Aws::WAFV2
     #     you are operating. If you are capturing logs for Amazon
     #     CloudFront, always create the firehose in US East (N. Virginia).
     #
+    #     Give the data firehose a name that starts with the prefix
+    #     `aws-waf-logs-`. For example, `aws-waf-logs-us-east-2-analytics`.
+    #
     #     <note markdown="1"> Do not create the data firehose using a `Kinesis stream` as your
     #     source.
     #
@@ -3460,10 +3533,15 @@ module Aws::WAFV2
     #  </note>
     #
     # Associates tags with the specified AWS resource. Tags are key:value
-    # pairs that you can associate with AWS resources. For example, the tag
-    # key might be "customer" and the tag value might be "companyA." You
-    # can specify one or more tags to add to each container. You can add up
-    # to 50 tags to each AWS resource.
+    # 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.
+    #
+    # You can tag the AWS resources that you manage through AWS WAF: web
+    # ACLs, rule groups, IP sets, and regex pattern sets. You can't manage
+    # or view tags through the AWS WAF console.
     #
     #
     #
@@ -3923,6 +4001,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -3934,6 +4016,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -3964,10 +4051,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -4245,6 +4336,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -4256,6 +4351,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -4286,10 +4386,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -4375,7 +4479,7 @@ module Aws::WAFV2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-wafv2'
-      context[:gem_version] = '1.8.0'
+      context[:gem_version] = '1.9.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -66,11 +66,15 @@ module Aws::WAFV2
     ErrorReason = Shapes::StringShape.new(name: 'ErrorReason')
     ExcludedRule = Shapes::StructureShape.new(name: 'ExcludedRule')
     ExcludedRules = Shapes::ListShape.new(name: 'ExcludedRules')
+    FallbackBehavior = Shapes::StringShape.new(name: 'FallbackBehavior')
     FieldToMatch = Shapes::StructureShape.new(name: 'FieldToMatch')
     FieldToMatchData = Shapes::StringShape.new(name: 'FieldToMatchData')
     FirewallManagerRuleGroup = Shapes::StructureShape.new(name: 'FirewallManagerRuleGroup')
     FirewallManagerRuleGroups = Shapes::ListShape.new(name: 'FirewallManagerRuleGroups')
     FirewallManagerStatement = Shapes::StructureShape.new(name: 'FirewallManagerStatement')
+    ForwardedIPConfig = Shapes::StructureShape.new(name: 'ForwardedIPConfig')
+    ForwardedIPHeaderName = Shapes::StringShape.new(name: 'ForwardedIPHeaderName')
+    ForwardedIPPosition = Shapes::StringShape.new(name: 'ForwardedIPPosition')
     GeoMatchStatement = Shapes::StructureShape.new(name: 'GeoMatchStatement')
     GetIPSetRequest = Shapes::StructureShape.new(name: 'GetIPSetRequest')
     GetIPSetResponse = Shapes::StructureShape.new(name: 'GetIPSetResponse')
@@ -101,6 +105,7 @@ module Aws::WAFV2
     IPAddressVersion = Shapes::StringShape.new(name: 'IPAddressVersion')
     IPAddresses = Shapes::ListShape.new(name: 'IPAddresses')
     IPSet = Shapes::StructureShape.new(name: 'IPSet')
+    IPSetForwardedIPConfig = Shapes::StructureShape.new(name: 'IPSetForwardedIPConfig')
     IPSetReferenceStatement = Shapes::StructureShape.new(name: 'IPSetReferenceStatement')
     IPSetSummaries = Shapes::ListShape.new(name: 'IPSetSummaries')
     IPSetSummary = Shapes::StructureShape.new(name: 'IPSetSummary')
@@ -405,7 +410,12 @@ module Aws::WAFV2
     FirewallManagerStatement.add_member(:rule_group_reference_statement, Shapes::ShapeRef.new(shape: RuleGroupReferenceStatement, location_name: "RuleGroupReferenceStatement"))
     FirewallManagerStatement.struct_class = Types::FirewallManagerStatement
 
+    ForwardedIPConfig.add_member(:header_name, Shapes::ShapeRef.new(shape: ForwardedIPHeaderName, required: true, location_name: "HeaderName"))
+    ForwardedIPConfig.add_member(:fallback_behavior, Shapes::ShapeRef.new(shape: FallbackBehavior, required: true, location_name: "FallbackBehavior"))
+    ForwardedIPConfig.struct_class = Types::ForwardedIPConfig
+
     GeoMatchStatement.add_member(:country_codes, Shapes::ShapeRef.new(shape: CountryCodes, location_name: "CountryCodes"))
+    GeoMatchStatement.add_member(:forwarded_ip_config, Shapes::ShapeRef.new(shape: ForwardedIPConfig, location_name: "ForwardedIPConfig"))
     GeoMatchStatement.struct_class = Types::GeoMatchStatement
 
     GetIPSetRequest.add_member(:name, Shapes::ShapeRef.new(shape: EntityName, required: true, location_name: "Name"))
@@ -508,7 +518,13 @@ module Aws::WAFV2
     IPSet.add_member(:addresses, Shapes::ShapeRef.new(shape: IPAddresses, required: true, location_name: "Addresses"))
     IPSet.struct_class = Types::IPSet
 
+    IPSetForwardedIPConfig.add_member(:header_name, Shapes::ShapeRef.new(shape: ForwardedIPHeaderName, required: true, location_name: "HeaderName"))
+    IPSetForwardedIPConfig.add_member(:fallback_behavior, Shapes::ShapeRef.new(shape: FallbackBehavior, required: true, location_name: "FallbackBehavior"))
+    IPSetForwardedIPConfig.add_member(:position, Shapes::ShapeRef.new(shape: ForwardedIPPosition, required: true, location_name: "Position"))
+    IPSetForwardedIPConfig.struct_class = Types::IPSetForwardedIPConfig
+
     IPSetReferenceStatement.add_member(:arn, Shapes::ShapeRef.new(shape: ResourceArn, required: true, location_name: "ARN"))
+    IPSetReferenceStatement.add_member(:ip_set_forwarded_ip_config, Shapes::ShapeRef.new(shape: IPSetForwardedIPConfig, location_name: "IPSetForwardedIPConfig"))
     IPSetReferenceStatement.struct_class = Types::IPSetReferenceStatement
 
     IPSetSummaries.member = Shapes::ShapeRef.new(shape: IPSetSummary)
@@ -642,6 +658,7 @@ module Aws::WAFV2
     RateBasedStatement.add_member(:limit, Shapes::ShapeRef.new(shape: RateLimit, required: true, location_name: "Limit"))
     RateBasedStatement.add_member(:aggregate_key_type, Shapes::ShapeRef.new(shape: RateBasedStatementAggregateKeyType, required: true, location_name: "AggregateKeyType"))
     RateBasedStatement.add_member(:scope_down_statement, Shapes::ShapeRef.new(shape: Statement, location_name: "ScopeDownStatement"))
+    RateBasedStatement.add_member(:forwarded_ip_config, Shapes::ShapeRef.new(shape: ForwardedIPConfig, location_name: "ForwardedIPConfig"))
     RateBasedStatement.struct_class = Types::RateBasedStatement
 
     RateBasedStatementManagedKeysIPSet.add_member(:ip_address_version, Shapes::ShapeRef.new(shape: IPAddressVersion, location_name: "IPAddressVersion"))
@@ -1380,6 +1397,7 @@ module Aws::WAFV2
         o.errors << Shapes::ShapeRef.new(shape: WAFServiceLinkedRoleErrorException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
       end)
 
       api.add_operation(:put_permission_policy, Seahorse::Model::Operation.new.tap do |o|

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

@@ -185,6 +185,10 @@ module Aws::WAFV2
     #             },
     #             geo_match_statement: {
     #               country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #               forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               },
     #             },
     #             rule_group_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -196,6 +200,11 @@ module Aws::WAFV2
     #             },
     #             ip_set_reference_statement: {
     #               arn: "ResourceArn", # required
+    #               ip_set_forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #               },
     #             },
     #             regex_pattern_set_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -226,10 +235,14 @@ module Aws::WAFV2
     #             },
     #             rate_based_statement: {
     #               limit: 1, # required
-    #               aggregate_key_type: "IP", # required, accepts IP
+    #               aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #               scope_down_statement: {
     #                 # recursive Statement
     #               },
+    #               forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               },
     #             },
     #             and_statement: {
     #               statements: { # required
@@ -629,6 +642,10 @@ module Aws::WAFV2
     #               },
     #               geo_match_statement: {
     #                 country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               rule_group_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -640,6 +657,11 @@ module Aws::WAFV2
     #               },
     #               ip_set_reference_statement: {
     #                 arn: "ResourceArn", # required
+    #                 ip_set_forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                   position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #                 },
     #               },
     #               regex_pattern_set_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -670,10 +692,14 @@ module Aws::WAFV2
     #               },
     #               rate_based_statement: {
     #                 limit: 1, # required
-    #                 aggregate_key_type: "IP", # required, accepts IP
+    #                 aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #                 scope_down_statement: {
     #                   # recursive Statement
     #                 },
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               and_statement: {
     #                 statements: [ # required
@@ -1104,6 +1130,10 @@ module Aws::WAFV2
     #               },
     #               geo_match_statement: {
     #                 country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               rule_group_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -1115,6 +1145,11 @@ module Aws::WAFV2
     #               },
     #               ip_set_reference_statement: {
     #                 arn: "ResourceArn", # required
+    #                 ip_set_forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                   position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #                 },
     #               },
     #               regex_pattern_set_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -1145,10 +1180,14 @@ module Aws::WAFV2
     #               },
     #               rate_based_statement: {
     #                 limit: 1, # required
-    #                 aggregate_key_type: "IP", # required, accepts IP
+    #                 aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #                 scope_down_statement: {
     #                   # recursive Statement
     #                 },
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               and_statement: {
     #                 statements: [ # required
@@ -1429,6 +1468,10 @@ module Aws::WAFV2
     #               },
     #               geo_match_statement: {
     #                 country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               rule_group_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -1440,6 +1483,11 @@ module Aws::WAFV2
     #               },
     #               ip_set_reference_statement: {
     #                 arn: "ResourceArn", # required
+    #                 ip_set_forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                   position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #                 },
     #               },
     #               regex_pattern_set_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -1470,10 +1518,14 @@ module Aws::WAFV2
     #               },
     #               rate_based_statement: {
     #                 limit: 1, # required
-    #                 aggregate_key_type: "IP", # required, accepts IP
+    #                 aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #                 scope_down_statement: {
     #                   # recursive Statement
     #                 },
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               and_statement: {
     #                 statements: [ # required
@@ -2367,6 +2419,69 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
+    # The configuration for inspecting IP addresses in an HTTP header that
+    # you specify, instead of using the IP address that's reported by the
+    # web request origin. Commonly, this is the X-Forwarded-For (XFF)
+    # header, but you can specify any header name.
+    #
+    # <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    # doesn't apply the rule to the web request at all.
+    #
+    #  </note>
+    #
+    # This configuration is used for GeoMatchStatement and
+    # RateBasedStatement. For IPSetReferenceStatement, use
+    # IPSetForwardedIPConfig instead.
+    #
+    # AWS WAF only evaluates the first IP address found in the specified
+    # HTTP header.
+    #
+    # @note When making an API call, you may pass ForwardedIPConfig
+    #   data as a hash:
+    #
+    #       {
+    #         header_name: "ForwardedIPHeaderName", # required
+    #         fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #       }
+    #
+    # @!attribute [rw] header_name
+    #   The name of the HTTP header to use for the IP address. For example,
+    #   to use the X-Forwarded-For (XFF) header, set this to
+    #   `X-Forwarded-For`.
+    #
+    #   <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    #   doesn't apply the rule to the web request at all.
+    #
+    #    </note>
+    #   @return [String]
+    #
+    # @!attribute [rw] fallback_behavior
+    #   The match status to assign to the web request if the request
+    #   doesn't have a valid IP address in the specified position.
+    #
+    #   <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    #   doesn't apply the rule to the web request at all.
+    #
+    #    </note>
+    #
+    #   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.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/ForwardedIPConfig AWS API Documentation
+    #
+    class ForwardedIPConfig < Struct.new(
+      :header_name,
+      :fallback_behavior)
+      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
@@ -2386,6 +2501,10 @@ module Aws::WAFV2
     #
     #       {
     #         country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #         forwarded_ip_config: {
+    #           header_name: "ForwardedIPHeaderName", # required
+    #           fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #         },
     #       }
     #
     # @!attribute [rw] country_codes
@@ -2394,10 +2513,23 @@ module Aws::WAFV2
     #   standard.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] forwarded_ip_config
+    #   The configuration for inspecting IP addresses in an HTTP header that
+    #   you specify, instead of using the IP address that's reported by the
+    #   web request origin. Commonly, this is the X-Forwarded-For (XFF)
+    #   header, but you can specify any header name.
+    #
+    #   <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    #   doesn't apply the rule to the web request at all.
+    #
+    #    </note>
+    #   @return [Types::ForwardedIPConfig]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/GeoMatchStatement AWS API Documentation
     #
     class GeoMatchStatement < Struct.new(
-      :country_codes)
+      :country_codes,
+      :forwarded_ip_config)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -2778,9 +2910,10 @@ module Aws::WAFV2
     # @!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
@@ -2820,7 +2953,8 @@ module Aws::WAFV2
     #   `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/wafv2-2019-07-29/GetSampledRequestsResponse AWS API Documentation
@@ -3130,6 +3264,88 @@ module Aws::WAFV2
       include Aws::Structure
     end
 
+    # The configuration for inspecting IP addresses in an HTTP header that
+    # you specify, instead of using the IP address that's reported by the
+    # web request origin. Commonly, this is the X-Forwarded-For (XFF)
+    # header, but you can specify any header name.
+    #
+    # <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    # doesn't apply the rule to the web request at all.
+    #
+    #  </note>
+    #
+    # This configuration is used only for IPSetReferenceStatement. For
+    # GeoMatchStatement and RateBasedStatement, use ForwardedIPConfig
+    # instead.
+    #
+    # @note When making an API call, you may pass IPSetForwardedIPConfig
+    #   data as a hash:
+    #
+    #       {
+    #         header_name: "ForwardedIPHeaderName", # required
+    #         fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #         position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #       }
+    #
+    # @!attribute [rw] header_name
+    #   The name of the HTTP header to use for the IP address. For example,
+    #   to use the X-Forwarded-For (XFF) header, set this to
+    #   `X-Forwarded-For`.
+    #
+    #   <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    #   doesn't apply the rule to the web request at all.
+    #
+    #    </note>
+    #   @return [String]
+    #
+    # @!attribute [rw] fallback_behavior
+    #   The match status to assign to the web request if the request
+    #   doesn't have a valid IP address in the specified position.
+    #
+    #   <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    #   doesn't apply the rule to the web request at all.
+    #
+    #    </note>
+    #
+    #   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.
+    #   @return [String]
+    #
+    # @!attribute [rw] position
+    #   The position in the header to search for the IP address. The header
+    #   can contain IP addresses of the original client and also of proxies.
+    #   For example, the header value could be `10.1.1.1, 127.0.0.0,
+    #   10.10.10.10` where the first IP address identifies the original
+    #   client and the rest identify proxies that the request went through.
+    #
+    #   The options for this setting are the following:
+    #
+    #   * FIRST - Inspect the first IP address in the list of IP addresses
+    #     in the header. This is usually the client's original IP.
+    #
+    #   * LAST - Inspect the last IP address in the list of IP addresses in
+    #     the header.
+    #
+    #   * ANY - Inspect all IP addresses in the header for a match. If the
+    #     header contains more than 10 IP addresses, AWS WAF inspects the
+    #     last 10.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/IPSetForwardedIPConfig AWS API Documentation
+    #
+    class IPSetForwardedIPConfig < Struct.new(
+      :header_name,
+      :fallback_behavior,
+      :position)
+      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
@@ -3156,6 +3372,11 @@ module Aws::WAFV2
     #
     #       {
     #         arn: "ResourceArn", # required
+    #         ip_set_forwarded_ip_config: {
+    #           header_name: "ForwardedIPHeaderName", # required
+    #           fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #           position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #         },
     #       }
     #
     # @!attribute [rw] arn
@@ -3163,10 +3384,23 @@ module Aws::WAFV2
     #   references.
     #   @return [String]
     #
+    # @!attribute [rw] ip_set_forwarded_ip_config
+    #   The configuration for inspecting IP addresses in an HTTP header that
+    #   you specify, instead of using the IP address that's reported by the
+    #   web request origin. Commonly, this is the X-Forwarded-For (XFF)
+    #   header, but you can specify any header name.
+    #
+    #   <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    #   doesn't apply the rule to the web request at all.
+    #
+    #    </note>
+    #   @return [Types::IPSetForwardedIPConfig]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/IPSetReferenceStatement AWS API Documentation
     #
     class IPSetReferenceStatement < Struct.new(
-      :arn)
+      :arn,
+      :ip_set_forwarded_ip_config)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4089,6 +4323,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -4100,6 +4338,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -4130,10 +4373,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -4309,6 +4556,10 @@ module Aws::WAFV2
     #             },
     #             geo_match_statement: {
     #               country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #               forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               },
     #             },
     #             rule_group_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -4320,6 +4571,11 @@ module Aws::WAFV2
     #             },
     #             ip_set_reference_statement: {
     #               arn: "ResourceArn", # required
+    #               ip_set_forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #               },
     #             },
     #             regex_pattern_set_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -4350,10 +4606,14 @@ module Aws::WAFV2
     #             },
     #             rate_based_statement: {
     #               limit: 1, # required
-    #               aggregate_key_type: "IP", # required, accepts IP
+    #               aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #               scope_down_statement: {
     #                 # recursive Statement
     #               },
+    #               forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               },
     #             },
     #             and_statement: {
     #               statements: { # required
@@ -4616,7 +4876,7 @@ module Aws::WAFV2
     #
     #       {
     #         limit: 1, # required
-    #         aggregate_key_type: "IP", # required, accepts IP
+    #         aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #         scope_down_statement: {
     #           byte_match_statement: {
     #             search_string: "data", # required
@@ -4728,6 +4988,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -4739,6 +5003,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -4769,10 +5038,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -4803,18 +5076,28 @@ module Aws::WAFV2
     #             ],
     #           },
     #         },
+    #         forwarded_ip_config: {
+    #           header_name: "ForwardedIPHeaderName", # required
+    #           fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #         },
     #       }
     #
     # @!attribute [rw] limit
     #   The limit on requests per 5-minute period for a single originating
-    #   IP address. If the statement includes a `ScopDownStatement`, this
+    #   IP address. If the statement includes a `ScopeDownStatement`, this
     #   limit is applied only to the requests that match the statement.
     #   @return [Integer]
     #
     # @!attribute [rw] aggregate_key_type
-    #   Setting that indicates how to aggregate the request counts.
-    #   Currently, you must set this to `IP`. The request counts are
-    #   aggregated on IP addresses.
+    #   Setting that indicates how to aggregate the request counts. The
+    #   options are the following:
+    #
+    #   * IP - Aggregate the request counts on the IP address from the web
+    #     request origin.
+    #
+    #   * FORWARDED\_IP - Aggregate the request counts on the first IP
+    #     address in an HTTP header. If you use this, configure the
+    #     `ForwardedIPConfig`, to specify the header to use.
     #   @return [String]
     #
     # @!attribute [rw] scope_down_statement
@@ -4824,12 +5107,27 @@ module Aws::WAFV2
     #   this scope-down statement.
     #   @return [Types::Statement]
     #
+    # @!attribute [rw] forwarded_ip_config
+    #   The configuration for inspecting IP addresses in an HTTP header that
+    #   you specify, instead of using the IP address that's reported by the
+    #   web request origin. Commonly, this is the X-Forwarded-For (XFF)
+    #   header, but you can specify any header name.
+    #
+    #   <note markdown="1"> If the specified header isn't present in the request, AWS WAF
+    #   doesn't apply the rule to the web request at all.
+    #
+    #    </note>
+    #
+    #   This is required if `AggregateKeyType` is set to `FORWARDED_IP`.
+    #   @return [Types::ForwardedIPConfig]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/RateBasedStatement AWS API Documentation
     #
     class RateBasedStatement < Struct.new(
       :limit,
       :aggregate_key_type,
-      :scope_down_statement)
+      :scope_down_statement,
+      :forwarded_ip_config)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -5228,6 +5526,10 @@ module Aws::WAFV2
     #           },
     #           geo_match_statement: {
     #             country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           rule_group_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -5239,6 +5541,11 @@ module Aws::WAFV2
     #           },
     #           ip_set_reference_statement: {
     #             arn: "ResourceArn", # required
+    #             ip_set_forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #             },
     #           },
     #           regex_pattern_set_reference_statement: {
     #             arn: "ResourceArn", # required
@@ -5269,10 +5576,14 @@ module Aws::WAFV2
     #           },
     #           rate_based_statement: {
     #             limit: 1, # required
-    #             aggregate_key_type: "IP", # required, accepts IP
+    #             aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #             scope_down_statement: {
     #               # recursive Statement
     #             },
+    #             forwarded_ip_config: {
+    #               header_name: "ForwardedIPHeaderName", # required
+    #               fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             },
     #           },
     #           and_statement: {
     #             statements: [ # required
@@ -6106,6 +6417,10 @@ module Aws::WAFV2
     #         },
     #         geo_match_statement: {
     #           country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #           forwarded_ip_config: {
+    #             header_name: "ForwardedIPHeaderName", # required
+    #             fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #           },
     #         },
     #         rule_group_reference_statement: {
     #           arn: "ResourceArn", # required
@@ -6117,6 +6432,11 @@ module Aws::WAFV2
     #         },
     #         ip_set_reference_statement: {
     #           arn: "ResourceArn", # required
+    #           ip_set_forwarded_ip_config: {
+    #             header_name: "ForwardedIPHeaderName", # required
+    #             fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #             position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #           },
     #         },
     #         regex_pattern_set_reference_statement: {
     #           arn: "ResourceArn", # required
@@ -6147,7 +6467,7 @@ module Aws::WAFV2
     #         },
     #         rate_based_statement: {
     #           limit: 1, # required
-    #           aggregate_key_type: "IP", # required, accepts IP
+    #           aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #           scope_down_statement: {
     #             byte_match_statement: {
     #               search_string: "data", # required
@@ -6259,6 +6579,10 @@ module Aws::WAFV2
     #             },
     #             geo_match_statement: {
     #               country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #               forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               },
     #             },
     #             rule_group_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -6270,6 +6594,11 @@ module Aws::WAFV2
     #             },
     #             ip_set_reference_statement: {
     #               arn: "ResourceArn", # required
+    #               ip_set_forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #               },
     #             },
     #             regex_pattern_set_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -6330,6 +6659,10 @@ module Aws::WAFV2
     #               ],
     #             },
     #           },
+    #           forwarded_ip_config: {
+    #             header_name: "ForwardedIPHeaderName", # required
+    #             fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #           },
     #         },
     #         and_statement: {
     #           statements: [ # required
@@ -6444,6 +6777,10 @@ module Aws::WAFV2
     #               },
     #               geo_match_statement: {
     #                 country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               rule_group_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -6455,6 +6792,11 @@ module Aws::WAFV2
     #               },
     #               ip_set_reference_statement: {
     #                 arn: "ResourceArn", # required
+    #                 ip_set_forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                   position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #                 },
     #               },
     #               regex_pattern_set_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -6485,10 +6827,14 @@ module Aws::WAFV2
     #               },
     #               rate_based_statement: {
     #                 limit: 1, # required
-    #                 aggregate_key_type: "IP", # required, accepts IP
+    #                 aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #                 scope_down_statement: {
     #                   # recursive Statement
     #                 },
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               and_statement: {
     #                 # recursive AndStatement
@@ -6628,6 +6974,10 @@ module Aws::WAFV2
     #               },
     #               geo_match_statement: {
     #                 country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               rule_group_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -6639,6 +6989,11 @@ module Aws::WAFV2
     #               },
     #               ip_set_reference_statement: {
     #                 arn: "ResourceArn", # required
+    #                 ip_set_forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                   position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #                 },
     #               },
     #               regex_pattern_set_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -6669,10 +7024,14 @@ module Aws::WAFV2
     #               },
     #               rate_based_statement: {
     #                 limit: 1, # required
-    #                 aggregate_key_type: "IP", # required, accepts IP
+    #                 aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #                 scope_down_statement: {
     #                   # recursive Statement
     #                 },
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               and_statement: {
     #                 statements: { # required
@@ -6811,6 +7170,10 @@ module Aws::WAFV2
     #             },
     #             geo_match_statement: {
     #               country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #               forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               },
     #             },
     #             rule_group_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -6822,6 +7185,11 @@ module Aws::WAFV2
     #             },
     #             ip_set_reference_statement: {
     #               arn: "ResourceArn", # required
+    #               ip_set_forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #               },
     #             },
     #             regex_pattern_set_reference_statement: {
     #               arn: "ResourceArn", # required
@@ -6852,10 +7220,14 @@ module Aws::WAFV2
     #             },
     #             rate_based_statement: {
     #               limit: 1, # required
-    #               aggregate_key_type: "IP", # required, accepts IP
+    #               aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #               scope_down_statement: {
     #                 # recursive Statement
     #               },
+    #               forwarded_ip_config: {
+    #                 header_name: "ForwardedIPHeaderName", # required
+    #                 fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #               },
     #             },
     #             and_statement: {
     #               statements: [ # required
@@ -7079,12 +7451,19 @@ module Aws::WAFV2
     #
     #  </note>
     #
-    # A collection of key:value pairs associated with an AWS resource. The
-    # key:value pair can be anything you define. Typically, the tag key
-    # represents a category (such as "environment") and the tag value
-    # represents a specific value within that category (such as "test,"
-    # "development," or "production"). You can add up to 50 tags to each
-    # AWS resource.
+    # 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
+    # category, such as "environment", and the tag value represents a
+    # specific value within that category, such as "test,"
+    # "development," or "production". Or 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.
+    #
+    # You can tag the AWS resources that you manage through AWS WAF: web
+    # ACLs, rule groups, IP sets, and regex pattern sets. You can't manage
+    # or view tags through the AWS WAF console.
     #
     #
     #
@@ -7126,7 +7505,19 @@ module Aws::WAFV2
     #
     #  </note>
     #
-    # The collection of tagging definitions for an AWS resource.
+    # 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,
+    # the tag key represents a category, such as "environment", and the
+    # tag value represents a specific value within that category, such as
+    # "test," "development," or "production". Or 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.
+    #
+    # You can tag the AWS resources that you manage through AWS WAF: web
+    # ACLs, rule groups, IP sets, and regex pattern sets. You can't manage
+    # or view tags through the AWS WAF console.
     #
     #
     #
@@ -7305,6 +7696,11 @@ module Aws::WAFV2
     # 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"`. You can specify any time range in the previous
+    # three hours.
+    #
     # 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
@@ -7329,17 +7725,19 @@ module Aws::WAFV2
     # @!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 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 [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 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 [Time]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/TimeWindow AWS API Documentation
@@ -7708,6 +8106,10 @@ module Aws::WAFV2
     #               },
     #               geo_match_statement: {
     #                 country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               rule_group_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -7719,6 +8121,11 @@ module Aws::WAFV2
     #               },
     #               ip_set_reference_statement: {
     #                 arn: "ResourceArn", # required
+    #                 ip_set_forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                   position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #                 },
     #               },
     #               regex_pattern_set_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -7749,10 +8156,14 @@ module Aws::WAFV2
     #               },
     #               rate_based_statement: {
     #                 limit: 1, # required
-    #                 aggregate_key_type: "IP", # required, accepts IP
+    #                 aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #                 scope_down_statement: {
     #                   # recursive Statement
     #                 },
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               and_statement: {
     #                 statements: [ # required
@@ -8023,6 +8434,10 @@ module Aws::WAFV2
     #               },
     #               geo_match_statement: {
     #                 country_codes: ["AF"], # accepts AF, AX, AL, DZ, AS, AD, AO, AI, AQ, AG, AR, AM, AW, AU, AT, AZ, BS, BH, BD, BB, BY, BE, BZ, BJ, BM, BT, BO, BQ, BA, BW, BV, BR, IO, BN, BG, BF, BI, KH, CM, CA, CV, KY, CF, TD, CL, CN, CX, CC, CO, KM, CG, CD, CK, CR, CI, HR, CU, CW, CY, CZ, DK, DJ, DM, DO, EC, EG, SV, GQ, ER, EE, ET, FK, FO, FJ, FI, FR, GF, PF, TF, GA, GM, GE, DE, GH, GI, GR, GL, GD, GP, GU, GT, GG, GN, GW, GY, HT, HM, VA, HN, HK, HU, IS, IN, ID, IR, IQ, IE, IM, IL, IT, JM, JP, JE, JO, KZ, KE, KI, KP, KR, KW, KG, LA, LV, LB, LS, LR, LY, LI, LT, LU, MO, MK, MG, MW, MY, MV, ML, MT, MH, MQ, MR, MU, YT, MX, FM, MD, MC, MN, ME, MS, MA, MZ, MM, NA, NR, NP, NL, NC, NZ, NI, NE, NG, NU, NF, MP, NO, OM, PK, PW, PS, PA, PG, PY, PE, PH, PN, PL, PT, PR, QA, RE, RO, RU, RW, BL, SH, KN, LC, MF, PM, VC, WS, SM, ST, SA, SN, RS, SC, SL, SG, SX, SK, SI, SB, SO, ZA, GS, SS, ES, LK, SD, SR, SJ, SZ, SE, CH, SY, TW, TJ, TZ, TH, TL, TG, TK, TO, TT, TN, TR, TM, TC, TV, UG, UA, AE, GB, US, UM, UY, UZ, VU, VE, VN, VG, VI, WF, EH, YE, ZM, ZW
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               rule_group_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -8034,6 +8449,11 @@ module Aws::WAFV2
     #               },
     #               ip_set_reference_statement: {
     #                 arn: "ResourceArn", # required
+    #                 ip_set_forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                   position: "FIRST", # required, accepts FIRST, LAST, ANY
+    #                 },
     #               },
     #               regex_pattern_set_reference_statement: {
     #                 arn: "ResourceArn", # required
@@ -8064,10 +8484,14 @@ module Aws::WAFV2
     #               },
     #               rate_based_statement: {
     #                 limit: 1, # required
-    #                 aggregate_key_type: "IP", # required, accepts IP
+    #                 aggregate_key_type: "IP", # required, accepts IP, FORWARDED_IP
     #                 scope_down_statement: {
     #                   # recursive Statement
     #                 },
+    #                 forwarded_ip_config: {
+    #                   header_name: "ForwardedIPHeaderName", # required
+    #                   fallback_behavior: "MATCH", # required, accepts MATCH, NO_MATCH
+    #                 },
     #               },
     #               and_statement: {
     #                 statements: [ # required
@@ -8279,11 +8703,12 @@ module Aws::WAFV2
     #   @return [Boolean]
     #
     # @!attribute [rw] metric_name
-    #   A name of the CloudWatch metric. The name can contain only
-    #   alphanumeric characters (A-Z, a-z, 0-9), with length from one to 128
-    #   characters. It can't contain whitespace or metric names reserved
-    #   for AWS WAF, for example "All" and "Default\_Action." You can't
-    #   change a `MetricName` after you create a `VisibilityConfig`.
+    #   A name of the CloudWatch metric. The name can contain only the
+    #   characters: A-Z, a-z, 0-9, - (hyphen), and \_ (underscore). The name
+    #   can be from one to 128 characters long. It can't contain whitespace
+    #   or metric names reserved for AWS WAF, for example "All" and
+    #   "Default\_Action." You can't change a `MetricName` after you
+    #   create a `VisibilityConfig`.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/VisibilityConfig AWS API Documentation