aws-sdk-waf 1.22.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 963bdfe989e582bec7af9e202257964e8ee31438
-  data.tar.gz: fa37ee53e8c198c61f3b041afb372ac5ba580100
+  metadata.gz: f9f5d6e6f3602165d3e37b763114474fe788cf8e
+  data.tar.gz: b0389ffb0666279d16d3337d98320ce6d976d980
 SHA512:
-  metadata.gz: 736bb785600ea5464c0a0e7b9f15e39fa5cfeca545e051f01a81e136960ac13c60e0410fd74f5829e651eb0e405ad6dfcf849a416805155335ff4f8c88e2c95f
-  data.tar.gz: 60965ccca748584f3e18a35f80dcdc897c34e8d6cddc71baf4dc6d4d3dbbd2ffe5b001ef12936808badb24b6313f86e74860dd7c3972418ac38cfead9e02dea0
+  metadata.gz: 5f737658fbefdcd65c7b035c69d0520553f181a22a7eab917303922626761f3858c97827e0995c00c004b9921d7d14653b05c3ca130a156862d4cfd527c55cdf
+  data.tar.gz: 2701d751eb243bce16633db5e88cbf6ec47a1d178b1b4aae6522392b7b1bf8745f65b483c4f7a97834c4fb5a00f0d8df2890561d4927f308c515580a9d983c37

data/lib/aws-sdk-waf.rb

@@ -42,6 +42,6 @@ require_relative 'aws-sdk-waf/customizations'
 # @service
 module Aws::WAF
 
-  GEM_VERSION = '1.22.0'
+  GEM_VERSION = '1.23.0'
 
 end

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

@@ -588,6 +588,8 @@ module Aws::WAF
     #   request. You can also use this value to query the status of the
     #   request. For more information, see GetChangeTokenStatus.
     #
+    # @option params [Array<Types::Tag>] :tags
+    #
     # @return [Types::CreateRateBasedRuleResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::CreateRateBasedRuleResponse#rule #rule} => Types::RateBasedRule
@@ -601,6 +603,12 @@ module Aws::WAF
     #     rate_key: "IP", # required, accepts IP
     #     rate_limit: 1, # required
     #     change_token: "ChangeToken", # required
+    #     tags: [
+    #       {
+    #         key: "TagKey",
+    #         value: "TagValue",
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -814,6 +822,8 @@ module Aws::WAF
     # @option params [required, String] :change_token
     #   The value returned by the most recent call to GetChangeToken.
     #
+    # @option params [Array<Types::Tag>] :tags
+    #
     # @return [Types::CreateRuleResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::CreateRuleResponse#rule #rule} => Types::Rule
@@ -853,6 +863,12 @@ module Aws::WAF
     #     name: "ResourceName", # required
     #     metric_name: "MetricName", # required
     #     change_token: "ChangeToken", # required
+    #     tags: [
+    #       {
+    #         key: "TagKey",
+    #         value: "TagValue",
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -910,6 +926,8 @@ module Aws::WAF
     # @option params [required, String] :change_token
     #   The value returned by the most recent call to GetChangeToken.
     #
+    # @option params [Array<Types::Tag>] :tags
+    #
     # @return [Types::CreateRuleGroupResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::CreateRuleGroupResponse#rule_group #rule_group} => Types::RuleGroup
@@ -921,6 +939,12 @@ module Aws::WAF
     #     name: "ResourceName", # required
     #     metric_name: "MetricName", # required
     #     change_token: "ChangeToken", # required
+    #     tags: [
+    #       {
+    #         key: "TagKey",
+    #         value: "TagValue",
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -1191,6 +1215,8 @@ module Aws::WAF
     # @option params [required, String] :change_token
     #   The value returned by the most recent call to GetChangeToken.
     #
+    # @option params [Array<Types::Tag>] :tags
+    #
     # @return [Types::CreateWebACLResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::CreateWebACLResponse#web_acl #web_acl} => Types::WebACL
@@ -1241,6 +1267,12 @@ module Aws::WAF
     #       type: "BLOCK", # required, accepts BLOCK, ALLOW, COUNT
     #     },
     #     change_token: "ChangeToken", # required
+    #     tags: [
+    #       {
+    #         key: "TagKey",
+    #         value: "TagValue",
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -3714,6 +3746,42 @@ module Aws::WAF
       req.send_request(options)
     end
 
+    # @option params [String] :next_marker
+    #
+    # @option params [Integer] :limit
+    #
+    # @option params [required, String] :resource_arn
+    #
+    # @return [Types::ListTagsForResourceResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::ListTagsForResourceResponse#next_marker #next_marker} => String
+    #   * {Types::ListTagsForResourceResponse#tag_info_for_resource #tag_info_for_resource} => Types::TagInfoForResource
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.list_tags_for_resource({
+    #     next_marker: "NextMarker",
+    #     limit: 1,
+    #     resource_arn: "ResourceArn", # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.next_marker #=> String
+    #   resp.tag_info_for_resource.resource_arn #=> String
+    #   resp.tag_info_for_resource.tag_list #=> Array
+    #   resp.tag_info_for_resource.tag_list[0].key #=> String
+    #   resp.tag_info_for_resource.tag_list[0].value #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListTagsForResource AWS API Documentation
+    #
+    # @overload list_tags_for_resource(params = {})
+    # @param [Hash] params ({})
+    def list_tags_for_resource(params = {}, options = {})
+      req = build_request(:list_tags_for_resource, params)
+      req.send_request(options)
+    end
+
     # Returns an array of WebACLSummary objects in the response.
     #
     # @option params [String] :next_marker
@@ -3972,6 +4040,55 @@ module Aws::WAF
       req.send_request(options)
     end
 
+    # @option params [required, String] :resource_arn
+    #
+    # @option params [required, Array<Types::Tag>] :tags
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.tag_resource({
+    #     resource_arn: "ResourceArn", # required
+    #     tags: [ # required
+    #       {
+    #         key: "TagKey",
+    #         value: "TagValue",
+    #       },
+    #     ],
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/TagResource AWS API Documentation
+    #
+    # @overload tag_resource(params = {})
+    # @param [Hash] params ({})
+    def tag_resource(params = {}, options = {})
+      req = build_request(:tag_resource, params)
+      req.send_request(options)
+    end
+
+    # @option params [required, String] :resource_arn
+    #
+    # @option params [required, Array<String>] :tag_keys
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.untag_resource({
+    #     resource_arn: "ResourceArn", # required
+    #     tag_keys: ["TagKey"], # required
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/UntagResource AWS API Documentation
+    #
+    # @overload untag_resource(params = {})
+    # @param [Hash] params ({})
+    def untag_resource(params = {}, options = {})
+      req = build_request(:untag_resource, params)
+      req.send_request(options)
+    end
+
     # Inserts or deletes ByteMatchTuple objects (filters) in a ByteMatchSet.
     # For each `ByteMatchTuple` object, you specify the following values:
     #
@@ -5394,7 +5511,7 @@ module Aws::WAF
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-waf'
-      context[:gem_version] = '1.22.0'
+      context[:gem_version] = '1.23.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -171,6 +171,8 @@ module Aws::WAF
     ListSqlInjectionMatchSetsResponse = Shapes::StructureShape.new(name: 'ListSqlInjectionMatchSetsResponse')
     ListSubscribedRuleGroupsRequest = Shapes::StructureShape.new(name: 'ListSubscribedRuleGroupsRequest')
     ListSubscribedRuleGroupsResponse = Shapes::StructureShape.new(name: 'ListSubscribedRuleGroupsResponse')
+    ListTagsForResourceRequest = Shapes::StructureShape.new(name: 'ListTagsForResourceRequest')
+    ListTagsForResourceResponse = Shapes::StructureShape.new(name: 'ListTagsForResourceResponse')
     ListWebACLsRequest = Shapes::StructureShape.new(name: 'ListWebACLsRequest')
     ListWebACLsResponse = Shapes::StructureShape.new(name: 'ListWebACLsResponse')
     ListXssMatchSetsRequest = Shapes::StructureShape.new(name: 'ListXssMatchSetsRequest')
@@ -251,10 +253,20 @@ module Aws::WAF
     SqlInjectionMatchTuples = Shapes::ListShape.new(name: 'SqlInjectionMatchTuples')
     SubscribedRuleGroupSummaries = Shapes::ListShape.new(name: 'SubscribedRuleGroupSummaries')
     SubscribedRuleGroupSummary = Shapes::StructureShape.new(name: 'SubscribedRuleGroupSummary')
+    Tag = Shapes::StructureShape.new(name: 'Tag')
+    TagInfoForResource = Shapes::StructureShape.new(name: 'TagInfoForResource')
+    TagKey = Shapes::StringShape.new(name: 'TagKey')
+    TagKeyList = Shapes::ListShape.new(name: 'TagKeyList')
+    TagList = Shapes::ListShape.new(name: 'TagList')
+    TagResourceRequest = Shapes::StructureShape.new(name: 'TagResourceRequest')
+    TagResourceResponse = Shapes::StructureShape.new(name: 'TagResourceResponse')
+    TagValue = Shapes::StringShape.new(name: 'TagValue')
     TextTransformation = Shapes::StringShape.new(name: 'TextTransformation')
     TimeWindow = Shapes::StructureShape.new(name: 'TimeWindow')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
     URIString = Shapes::StringShape.new(name: 'URIString')
+    UntagResourceRequest = Shapes::StructureShape.new(name: 'UntagResourceRequest')
+    UntagResourceResponse = Shapes::StructureShape.new(name: 'UntagResourceResponse')
     UpdateByteMatchSetRequest = Shapes::StructureShape.new(name: 'UpdateByteMatchSetRequest')
     UpdateByteMatchSetResponse = Shapes::StructureShape.new(name: 'UpdateByteMatchSetResponse')
     UpdateGeoMatchSetRequest = Shapes::StructureShape.new(name: 'UpdateGeoMatchSetRequest')
@@ -279,6 +291,7 @@ module Aws::WAF
     UpdateWebACLResponse = Shapes::StructureShape.new(name: 'UpdateWebACLResponse')
     UpdateXssMatchSetRequest = Shapes::StructureShape.new(name: 'UpdateXssMatchSetRequest')
     UpdateXssMatchSetResponse = Shapes::StructureShape.new(name: 'UpdateXssMatchSetResponse')
+    WAFBadRequestException = Shapes::StructureShape.new(name: 'WAFBadRequestException')
     WAFDisallowedNameException = Shapes::StructureShape.new(name: 'WAFDisallowedNameException')
     WAFInternalErrorException = Shapes::StructureShape.new(name: 'WAFInternalErrorException')
     WAFInvalidAccountException = Shapes::StructureShape.new(name: 'WAFInvalidAccountException')
@@ -294,6 +307,8 @@ module Aws::WAF
     WAFServiceLinkedRoleErrorException = Shapes::StructureShape.new(name: 'WAFServiceLinkedRoleErrorException')
     WAFStaleDataException = Shapes::StructureShape.new(name: 'WAFStaleDataException')
     WAFSubscriptionNotFoundException = Shapes::StructureShape.new(name: 'WAFSubscriptionNotFoundException')
+    WAFTagOperationException = Shapes::StructureShape.new(name: 'WAFTagOperationException')
+    WAFTagOperationInternalErrorException = Shapes::StructureShape.new(name: 'WAFTagOperationInternalErrorException')
     WafAction = Shapes::StructureShape.new(name: 'WafAction')
     WafActionType = Shapes::StringShape.new(name: 'WafActionType')
     WafOverrideAction = Shapes::StructureShape.new(name: 'WafOverrideAction')
@@ -377,6 +392,7 @@ module Aws::WAF
     CreateRateBasedRuleRequest.add_member(:rate_key, Shapes::ShapeRef.new(shape: RateKey, required: true, location_name: "RateKey"))
     CreateRateBasedRuleRequest.add_member(:rate_limit, Shapes::ShapeRef.new(shape: RateLimit, required: true, location_name: "RateLimit"))
     CreateRateBasedRuleRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
+    CreateRateBasedRuleRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreateRateBasedRuleRequest.struct_class = Types::CreateRateBasedRuleRequest
 
     CreateRateBasedRuleResponse.add_member(:rule, Shapes::ShapeRef.new(shape: RateBasedRule, location_name: "Rule"))
@@ -402,6 +418,7 @@ module Aws::WAF
     CreateRuleGroupRequest.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "Name"))
     CreateRuleGroupRequest.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
     CreateRuleGroupRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
+    CreateRuleGroupRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreateRuleGroupRequest.struct_class = Types::CreateRuleGroupRequest
 
     CreateRuleGroupResponse.add_member(:rule_group, Shapes::ShapeRef.new(shape: RuleGroup, location_name: "RuleGroup"))
@@ -411,6 +428,7 @@ module Aws::WAF
     CreateRuleRequest.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "Name"))
     CreateRuleRequest.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
     CreateRuleRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
+    CreateRuleRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreateRuleRequest.struct_class = Types::CreateRuleRequest
 
     CreateRuleResponse.add_member(:rule, Shapes::ShapeRef.new(shape: Rule, location_name: "Rule"))
@@ -437,6 +455,7 @@ module Aws::WAF
     CreateWebACLRequest.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
     CreateWebACLRequest.add_member(:default_action, Shapes::ShapeRef.new(shape: WafAction, required: true, location_name: "DefaultAction"))
     CreateWebACLRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
+    CreateWebACLRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreateWebACLRequest.struct_class = Types::CreateWebACLRequest
 
     CreateWebACLResponse.add_member(:web_acl, Shapes::ShapeRef.new(shape: WebACL, location_name: "WebACL"))
@@ -833,6 +852,15 @@ module Aws::WAF
     ListSubscribedRuleGroupsResponse.add_member(:rule_groups, Shapes::ShapeRef.new(shape: SubscribedRuleGroupSummaries, location_name: "RuleGroups"))
     ListSubscribedRuleGroupsResponse.struct_class = Types::ListSubscribedRuleGroupsResponse
 
+    ListTagsForResourceRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListTagsForResourceRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
+    ListTagsForResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: ResourceArn, required: true, location_name: "ResourceARN"))
+    ListTagsForResourceRequest.struct_class = Types::ListTagsForResourceRequest
+
+    ListTagsForResourceResponse.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
+    ListTagsForResourceResponse.add_member(:tag_info_for_resource, Shapes::ShapeRef.new(shape: TagInfoForResource, location_name: "TagInfoForResource"))
+    ListTagsForResourceResponse.struct_class = Types::ListTagsForResourceResponse
+
     ListWebACLsRequest.add_member(:next_marker, Shapes::ShapeRef.new(shape: NextMarker, location_name: "NextMarker"))
     ListWebACLsRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PaginationLimit, location_name: "Limit"))
     ListWebACLsRequest.struct_class = Types::ListWebACLsRequest
@@ -1031,10 +1059,34 @@ module Aws::WAF
     SubscribedRuleGroupSummary.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
     SubscribedRuleGroupSummary.struct_class = Types::SubscribedRuleGroupSummary
 
+    Tag.add_member(:key, Shapes::ShapeRef.new(shape: TagKey, location_name: "Key"))
+    Tag.add_member(:value, Shapes::ShapeRef.new(shape: TagValue, location_name: "Value"))
+    Tag.struct_class = Types::Tag
+
+    TagInfoForResource.add_member(:resource_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ResourceARN"))
+    TagInfoForResource.add_member(:tag_list, Shapes::ShapeRef.new(shape: TagList, location_name: "TagList"))
+    TagInfoForResource.struct_class = Types::TagInfoForResource
+
+    TagKeyList.member = Shapes::ShapeRef.new(shape: TagKey)
+
+    TagList.member = Shapes::ShapeRef.new(shape: Tag)
+
+    TagResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: ResourceArn, required: true, location_name: "ResourceARN"))
+    TagResourceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, required: true, location_name: "Tags"))
+    TagResourceRequest.struct_class = Types::TagResourceRequest
+
+    TagResourceResponse.struct_class = Types::TagResourceResponse
+
     TimeWindow.add_member(:start_time, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "StartTime"))
     TimeWindow.add_member(:end_time, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "EndTime"))
     TimeWindow.struct_class = Types::TimeWindow
 
+    UntagResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: ResourceArn, required: true, location_name: "ResourceARN"))
+    UntagResourceRequest.add_member(:tag_keys, Shapes::ShapeRef.new(shape: TagKeyList, required: true, location_name: "TagKeys"))
+    UntagResourceRequest.struct_class = Types::UntagResourceRequest
+
+    UntagResourceResponse.struct_class = Types::UntagResourceResponse
+
     UpdateByteMatchSetRequest.add_member(:byte_match_set_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "ByteMatchSetId"))
     UpdateByteMatchSetRequest.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, required: true, location_name: "ChangeToken"))
     UpdateByteMatchSetRequest.add_member(:updates, Shapes::ShapeRef.new(shape: ByteMatchSetUpdates, required: true, location_name: "Updates"))
@@ -1133,6 +1185,9 @@ module Aws::WAF
     UpdateXssMatchSetResponse.add_member(:change_token, Shapes::ShapeRef.new(shape: ChangeToken, location_name: "ChangeToken"))
     UpdateXssMatchSetResponse.struct_class = Types::UpdateXssMatchSetResponse
 
+    WAFBadRequestException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
+    WAFBadRequestException.struct_class = Types::WAFBadRequestException
+
     WAFDisallowedNameException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
     WAFDisallowedNameException.struct_class = Types::WAFDisallowedNameException
 
@@ -1177,6 +1232,12 @@ module Aws::WAF
     WAFSubscriptionNotFoundException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
     WAFSubscriptionNotFoundException.struct_class = Types::WAFSubscriptionNotFoundException
 
+    WAFTagOperationException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
+    WAFTagOperationException.struct_class = Types::WAFTagOperationException
+
+    WAFTagOperationInternalErrorException.add_member(:message, Shapes::ShapeRef.new(shape: errorMessage, location_name: "message"))
+    WAFTagOperationInternalErrorException.struct_class = Types::WAFTagOperationInternalErrorException
+
     WafAction.add_member(:type, Shapes::ShapeRef.new(shape: WafActionType, required: true, location_name: "Type"))
     WafAction.struct_class = Types::WafAction
 
@@ -1298,6 +1359,9 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFDisallowedNameException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
       end)
 
       api.add_operation(:create_regex_match_set, Seahorse::Model::Operation.new.tap do |o|
@@ -1335,6 +1399,9 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFDisallowedNameException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
       end)
 
       api.add_operation(:create_rule_group, Seahorse::Model::Operation.new.tap do |o|
@@ -1347,6 +1414,9 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
         o.errors << Shapes::ShapeRef.new(shape: WAFDisallowedNameException)
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
       end)
 
       api.add_operation(:create_size_constraint_set, Seahorse::Model::Operation.new.tap do |o|
@@ -1389,6 +1459,9 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFDisallowedNameException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
         o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
       end)
 
       api.add_operation(:create_xss_match_set, Seahorse::Model::Operation.new.tap do |o|
@@ -1481,6 +1554,8 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFReferencedItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFNonEmptyEntityException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
       end)
 
       api.add_operation(:delete_regex_match_set, Seahorse::Model::Operation.new.tap do |o|
@@ -1523,6 +1598,8 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFReferencedItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFNonEmptyEntityException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
       end)
 
       api.add_operation(:delete_rule_group, Seahorse::Model::Operation.new.tap do |o|
@@ -1537,6 +1614,8 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFReferencedItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFNonEmptyEntityException)
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
       end)
 
       api.add_operation(:delete_size_constraint_set, Seahorse::Model::Operation.new.tap do |o|
@@ -1579,6 +1658,8 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFReferencedItemException)
         o.errors << Shapes::ShapeRef.new(shape: WAFNonEmptyEntityException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
       end)
 
       api.add_operation(:delete_xss_match_set, Seahorse::Model::Operation.new.tap do |o|
@@ -1918,6 +1999,20 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
       end)
 
+      api.add_operation(:list_tags_for_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListTagsForResource"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListTagsForResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListTagsForResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
+      end)
+
       api.add_operation(:list_web_acls, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListWebACLs"
         o.http_method = "POST"
@@ -1962,6 +2057,35 @@ module Aws::WAF
         o.errors << Shapes::ShapeRef.new(shape: WAFInvalidPermissionPolicyException)
       end)
 
+      api.add_operation(:tag_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "TagResource"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: TagResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: TagResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFLimitsExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
+      end)
+
+      api.add_operation(:untag_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UntagResource"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: UntagResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: UntagResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInternalErrorException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFInvalidParameterException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFNonexistentItemException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFBadRequestException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationException)
+        o.errors << Shapes::ShapeRef.new(shape: WAFTagOperationInternalErrorException)
+      end)
+
       api.add_operation(:update_byte_match_set, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UpdateByteMatchSet"
         o.http_method = "POST"

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

@@ -10,6 +10,22 @@ module Aws::WAF
 
     extend Aws::Errors::DynamicErrors
 
+    class WAFBadRequestException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::WAF::Types::WAFBadRequestException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
+
+    end
+
     class WAFDisallowedNameException < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -244,5 +260,37 @@ module Aws::WAF
 
     end
 
+    class WAFTagOperationException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::WAF::Types::WAFTagOperationException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
+
+    end
+
+    class WAFTagOperationInternalErrorException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::WAF::Types::WAFTagOperationInternalErrorException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
+
+    end
+
   end
 end

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

@@ -633,6 +633,12 @@ module Aws::WAF
     #         rate_key: "IP", # required, accepts IP
     #         rate_limit: 1, # required
     #         change_token: "ChangeToken", # required
+    #         tags: [
+    #           {
+    #             key: "TagKey",
+    #             value: "TagValue",
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -671,6 +677,9 @@ module Aws::WAF
     #   request. For more information, see GetChangeTokenStatus.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateRateBasedRuleRequest AWS API Documentation
     #
     class CreateRateBasedRuleRequest < Struct.new(
@@ -678,7 +687,8 @@ module Aws::WAF
       :metric_name,
       :rate_key,
       :rate_limit,
-      :change_token)
+      :change_token,
+      :tags)
       include Aws::Structure
     end
 
@@ -795,6 +805,12 @@ module Aws::WAF
     #         name: "ResourceName", # required
     #         metric_name: "MetricName", # required
     #         change_token: "ChangeToken", # required
+    #         tags: [
+    #           {
+    #             key: "TagKey",
+    #             value: "TagValue",
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -815,12 +831,16 @@ module Aws::WAF
     #   The value returned by the most recent call to GetChangeToken.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateRuleGroupRequest AWS API Documentation
     #
     class CreateRuleGroupRequest < Struct.new(
       :name,
       :metric_name,
-      :change_token)
+      :change_token,
+      :tags)
       include Aws::Structure
     end
 
@@ -849,6 +869,12 @@ module Aws::WAF
     #         name: "ResourceName", # required
     #         metric_name: "MetricName", # required
     #         change_token: "ChangeToken", # required
+    #         tags: [
+    #           {
+    #             key: "TagKey",
+    #             value: "TagValue",
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -869,12 +895,16 @@ module Aws::WAF
     #   The value returned by the most recent call to GetChangeToken.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateRuleRequest AWS API Documentation
     #
     class CreateRuleRequest < Struct.new(
       :name,
       :metric_name,
-      :change_token)
+      :change_token,
+      :tags)
       include Aws::Structure
     end
 
@@ -999,6 +1029,12 @@ module Aws::WAF
     #           type: "BLOCK", # required, accepts BLOCK, ALLOW, COUNT
     #         },
     #         change_token: "ChangeToken", # required
+    #         tags: [
+    #           {
+    #             key: "TagKey",
+    #             value: "TagValue",
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -1025,13 +1061,17 @@ module Aws::WAF
     #   The value returned by the most recent call to GetChangeToken.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/CreateWebACLRequest AWS API Documentation
     #
     class CreateWebACLRequest < Struct.new(
       :name,
       :metric_name,
       :default_action,
-      :change_token)
+      :change_token,
+      :tags)
       include Aws::Structure
     end
 
@@ -3466,6 +3506,47 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ListTagsForResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         next_marker: "NextMarker",
+    #         limit: 1,
+    #         resource_arn: "ResourceArn", # required
+    #       }
+    #
+    # @!attribute [rw] next_marker
+    #   @return [String]
+    #
+    # @!attribute [rw] limit
+    #   @return [Integer]
+    #
+    # @!attribute [rw] resource_arn
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListTagsForResourceRequest AWS API Documentation
+    #
+    class ListTagsForResourceRequest < Struct.new(
+      :next_marker,
+      :limit,
+      :resource_arn)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_marker
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_info_for_resource
+    #   @return [Types::TagInfoForResource]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/ListTagsForResourceResponse AWS API Documentation
+    #
+    class ListTagsForResourceResponse < Struct.new(
+      :next_marker,
+      :tag_info_for_resource)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListWebACLsRequest
     #   data as a hash:
     #
@@ -4922,6 +5003,73 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass Tag
+    #   data as a hash:
+    #
+    #       {
+    #         key: "TagKey",
+    #         value: "TagValue",
+    #       }
+    #
+    # @!attribute [rw] key
+    #   @return [String]
+    #
+    # @!attribute [rw] value
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/Tag AWS API Documentation
+    #
+    class Tag < Struct.new(
+      :key,
+      :value)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] resource_arn
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_list
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/TagInfoForResource AWS API Documentation
+    #
+    class TagInfoForResource < Struct.new(
+      :resource_arn,
+      :tag_list)
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass TagResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "ResourceArn", # required
+    #         tags: [ # required
+    #           {
+    #             key: "TagKey",
+    #             value: "TagValue",
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/TagResourceRequest AWS API Documentation
+    #
+    class TagResourceRequest < Struct.new(
+      :resource_arn,
+      :tags)
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/TagResourceResponse AWS API Documentation
+    #
+    class TagResourceResponse < Aws::EmptyStructure; end
+
     # In a GetSampledRequests request, the `StartTime` and `EndTime` objects
     # specify the time range for which you want AWS WAF to return a sample
     # of web requests.
@@ -4967,6 +5115,32 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass UntagResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "ResourceArn", # required
+    #         tag_keys: ["TagKey"], # required
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_keys
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/UntagResourceRequest AWS API Documentation
+    #
+    class UntagResourceRequest < Struct.new(
+      :resource_arn,
+      :tag_keys)
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/UntagResourceResponse AWS API Documentation
+    #
+    class UntagResourceResponse < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass UpdateByteMatchSetRequest
     #   data as a hash:
     #
@@ -5763,6 +5937,16 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/WAFBadRequestException AWS API Documentation
+    #
+    class WAFBadRequestException < Struct.new(
+      :message)
+      include Aws::Structure
+    end
+
     # The name specified is invalid.
     #
     # @!attribute [rw] message
@@ -6053,6 +6237,26 @@ module Aws::WAF
       include Aws::Structure
     end
 
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/WAFTagOperationException AWS API Documentation
+    #
+    class WAFTagOperationException < Struct.new(
+      :message)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/waf-2015-08-24/WAFTagOperationInternalErrorException AWS API Documentation
+    #
+    class WAFTagOperationInternalErrorException < Struct.new(
+      :message)
+      include Aws::Structure
+    end
+
     # For the action that is associated with a rule in a `WebACL`, specifies
     # the action that you want AWS WAF to perform when a web request matches
     # all of the conditions in a rule. For the default action in a `WebACL`,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-waf
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core