aws-sdk-ses 1.1.0 → 1.2.0

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

@@ -47,6 +47,8 @@ module Aws::SES
     CreateConfigurationSetEventDestinationResponse = Shapes::StructureShape.new(name: 'CreateConfigurationSetEventDestinationResponse')
     CreateConfigurationSetRequest = Shapes::StructureShape.new(name: 'CreateConfigurationSetRequest')
     CreateConfigurationSetResponse = Shapes::StructureShape.new(name: 'CreateConfigurationSetResponse')
+    CreateConfigurationSetTrackingOptionsRequest = Shapes::StructureShape.new(name: 'CreateConfigurationSetTrackingOptionsRequest')
+    CreateConfigurationSetTrackingOptionsResponse = Shapes::StructureShape.new(name: 'CreateConfigurationSetTrackingOptionsResponse')
     CreateReceiptFilterRequest = Shapes::StructureShape.new(name: 'CreateReceiptFilterRequest')
     CreateReceiptFilterResponse = Shapes::StructureShape.new(name: 'CreateReceiptFilterResponse')
     CreateReceiptRuleRequest = Shapes::StructureShape.new(name: 'CreateReceiptRuleRequest')
@@ -54,11 +56,14 @@ module Aws::SES
     CreateReceiptRuleSetRequest = Shapes::StructureShape.new(name: 'CreateReceiptRuleSetRequest')
     CreateReceiptRuleSetResponse = Shapes::StructureShape.new(name: 'CreateReceiptRuleSetResponse')
     CustomMailFromStatus = Shapes::StringShape.new(name: 'CustomMailFromStatus')
+    CustomRedirectDomain = Shapes::StringShape.new(name: 'CustomRedirectDomain')
     DefaultDimensionValue = Shapes::StringShape.new(name: 'DefaultDimensionValue')
     DeleteConfigurationSetEventDestinationRequest = Shapes::StructureShape.new(name: 'DeleteConfigurationSetEventDestinationRequest')
     DeleteConfigurationSetEventDestinationResponse = Shapes::StructureShape.new(name: 'DeleteConfigurationSetEventDestinationResponse')
     DeleteConfigurationSetRequest = Shapes::StructureShape.new(name: 'DeleteConfigurationSetRequest')
     DeleteConfigurationSetResponse = Shapes::StructureShape.new(name: 'DeleteConfigurationSetResponse')
+    DeleteConfigurationSetTrackingOptionsRequest = Shapes::StructureShape.new(name: 'DeleteConfigurationSetTrackingOptionsRequest')
+    DeleteConfigurationSetTrackingOptionsResponse = Shapes::StructureShape.new(name: 'DeleteConfigurationSetTrackingOptionsResponse')
     DeleteIdentityPolicyRequest = Shapes::StructureShape.new(name: 'DeleteIdentityPolicyRequest')
     DeleteIdentityPolicyResponse = Shapes::StructureShape.new(name: 'DeleteIdentityPolicyResponse')
     DeleteIdentityRequest = Shapes::StructureShape.new(name: 'DeleteIdentityRequest')
@@ -128,6 +133,7 @@ module Aws::SES
     InvalidS3ConfigurationException = Shapes::StructureShape.new(name: 'InvalidS3ConfigurationException')
     InvalidSNSDestinationException = Shapes::StructureShape.new(name: 'InvalidSNSDestinationException')
     InvalidSnsTopicException = Shapes::StructureShape.new(name: 'InvalidSnsTopicException')
+    InvalidTrackingOptionsException = Shapes::StructureShape.new(name: 'InvalidTrackingOptionsException')
     InvocationType = Shapes::StringShape.new(name: 'InvocationType')
     KinesisFirehoseDestination = Shapes::StructureShape.new(name: 'KinesisFirehoseDestination')
     LambdaAction = Shapes::StructureShape.new(name: 'LambdaAction')
@@ -228,8 +234,13 @@ module Aws::SES
     StopScope = Shapes::StringShape.new(name: 'StopScope')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
     TlsPolicy = Shapes::StringShape.new(name: 'TlsPolicy')
+    TrackingOptions = Shapes::StructureShape.new(name: 'TrackingOptions')
+    TrackingOptionsAlreadyExistsException = Shapes::StructureShape.new(name: 'TrackingOptionsAlreadyExistsException')
+    TrackingOptionsDoesNotExistException = Shapes::StructureShape.new(name: 'TrackingOptionsDoesNotExistException')
     UpdateConfigurationSetEventDestinationRequest = Shapes::StructureShape.new(name: 'UpdateConfigurationSetEventDestinationRequest')
     UpdateConfigurationSetEventDestinationResponse = Shapes::StructureShape.new(name: 'UpdateConfigurationSetEventDestinationResponse')
+    UpdateConfigurationSetTrackingOptionsRequest = Shapes::StructureShape.new(name: 'UpdateConfigurationSetTrackingOptionsRequest')
+    UpdateConfigurationSetTrackingOptionsResponse = Shapes::StructureShape.new(name: 'UpdateConfigurationSetTrackingOptionsResponse')
     UpdateReceiptRuleRequest = Shapes::StructureShape.new(name: 'UpdateReceiptRuleRequest')
     UpdateReceiptRuleResponse = Shapes::StructureShape.new(name: 'UpdateReceiptRuleResponse')
     VerificationAttributes = Shapes::MapShape.new(name: 'VerificationAttributes')
@@ -308,6 +319,12 @@ module Aws::SES
 
     CreateConfigurationSetResponse.struct_class = Types::CreateConfigurationSetResponse
 
+    CreateConfigurationSetTrackingOptionsRequest.add_member(:configuration_set_name, Shapes::ShapeRef.new(shape: ConfigurationSetName, required: true, location_name: "ConfigurationSetName"))
+    CreateConfigurationSetTrackingOptionsRequest.add_member(:tracking_options, Shapes::ShapeRef.new(shape: TrackingOptions, required: true, location_name: "TrackingOptions"))
+    CreateConfigurationSetTrackingOptionsRequest.struct_class = Types::CreateConfigurationSetTrackingOptionsRequest
+
+    CreateConfigurationSetTrackingOptionsResponse.struct_class = Types::CreateConfigurationSetTrackingOptionsResponse
+
     CreateReceiptFilterRequest.add_member(:filter, Shapes::ShapeRef.new(shape: ReceiptFilter, required: true, location_name: "Filter"))
     CreateReceiptFilterRequest.struct_class = Types::CreateReceiptFilterRequest
 
@@ -336,6 +353,11 @@ module Aws::SES
 
     DeleteConfigurationSetResponse.struct_class = Types::DeleteConfigurationSetResponse
 
+    DeleteConfigurationSetTrackingOptionsRequest.add_member(:configuration_set_name, Shapes::ShapeRef.new(shape: ConfigurationSetName, required: true, location_name: "ConfigurationSetName"))
+    DeleteConfigurationSetTrackingOptionsRequest.struct_class = Types::DeleteConfigurationSetTrackingOptionsRequest
+
+    DeleteConfigurationSetTrackingOptionsResponse.struct_class = Types::DeleteConfigurationSetTrackingOptionsResponse
+
     DeleteIdentityPolicyRequest.add_member(:identity, Shapes::ShapeRef.new(shape: Identity, required: true, location_name: "Identity"))
     DeleteIdentityPolicyRequest.add_member(:policy_name, Shapes::ShapeRef.new(shape: PolicyName, required: true, location_name: "PolicyName"))
     DeleteIdentityPolicyRequest.struct_class = Types::DeleteIdentityPolicyRequest
@@ -378,6 +400,7 @@ module Aws::SES
 
     DescribeConfigurationSetResponse.add_member(:configuration_set, Shapes::ShapeRef.new(shape: ConfigurationSet, location_name: "ConfigurationSet"))
     DescribeConfigurationSetResponse.add_member(:event_destinations, Shapes::ShapeRef.new(shape: EventDestinations, location_name: "EventDestinations"))
+    DescribeConfigurationSetResponse.add_member(:tracking_options, Shapes::ShapeRef.new(shape: TrackingOptions, location_name: "TrackingOptions"))
     DescribeConfigurationSetResponse.struct_class = Types::DescribeConfigurationSetResponse
 
     DescribeReceiptRuleRequest.add_member(:rule_set_name, Shapes::ShapeRef.new(shape: ReceiptRuleSetName, required: true, location_name: "RuleSetName"))
@@ -732,12 +755,21 @@ module Aws::SES
     StopAction.add_member(:topic_arn, Shapes::ShapeRef.new(shape: AmazonResourceName, location_name: "TopicArn"))
     StopAction.struct_class = Types::StopAction
 
+    TrackingOptions.add_member(:custom_redirect_domain, Shapes::ShapeRef.new(shape: CustomRedirectDomain, location_name: "CustomRedirectDomain"))
+    TrackingOptions.struct_class = Types::TrackingOptions
+
     UpdateConfigurationSetEventDestinationRequest.add_member(:configuration_set_name, Shapes::ShapeRef.new(shape: ConfigurationSetName, required: true, location_name: "ConfigurationSetName"))
     UpdateConfigurationSetEventDestinationRequest.add_member(:event_destination, Shapes::ShapeRef.new(shape: EventDestination, required: true, location_name: "EventDestination"))
     UpdateConfigurationSetEventDestinationRequest.struct_class = Types::UpdateConfigurationSetEventDestinationRequest
 
     UpdateConfigurationSetEventDestinationResponse.struct_class = Types::UpdateConfigurationSetEventDestinationResponse
 
+    UpdateConfigurationSetTrackingOptionsRequest.add_member(:configuration_set_name, Shapes::ShapeRef.new(shape: ConfigurationSetName, required: true, location_name: "ConfigurationSetName"))
+    UpdateConfigurationSetTrackingOptionsRequest.add_member(:tracking_options, Shapes::ShapeRef.new(shape: TrackingOptions, required: true, location_name: "TrackingOptions"))
+    UpdateConfigurationSetTrackingOptionsRequest.struct_class = Types::UpdateConfigurationSetTrackingOptionsRequest
+
+    UpdateConfigurationSetTrackingOptionsResponse.struct_class = Types::UpdateConfigurationSetTrackingOptionsResponse
+
     UpdateReceiptRuleRequest.add_member(:rule_set_name, Shapes::ShapeRef.new(shape: ReceiptRuleSetName, required: true, location_name: "RuleSetName"))
     UpdateReceiptRuleRequest.add_member(:rule, Shapes::ShapeRef.new(shape: ReceiptRule, required: true, location_name: "Rule"))
     UpdateReceiptRuleRequest.struct_class = Types::UpdateReceiptRuleRequest
@@ -824,6 +856,17 @@ module Aws::SES
         o.errors << Shapes::ShapeRef.new(shape: LimitExceededException)
       end)
 
+      api.add_operation(:create_configuration_set_tracking_options, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateConfigurationSetTrackingOptions"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateConfigurationSetTrackingOptionsRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateConfigurationSetTrackingOptionsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ConfigurationSetDoesNotExistException)
+        o.errors << Shapes::ShapeRef.new(shape: TrackingOptionsAlreadyExistsException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidTrackingOptionsException)
+      end)
+
       api.add_operation(:create_receipt_filter, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateReceiptFilter"
         o.http_method = "POST"
@@ -878,6 +921,16 @@ module Aws::SES
         o.errors << Shapes::ShapeRef.new(shape: EventDestinationDoesNotExistException)
       end)
 
+      api.add_operation(:delete_configuration_set_tracking_options, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteConfigurationSetTrackingOptions"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteConfigurationSetTrackingOptionsRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteConfigurationSetTrackingOptionsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ConfigurationSetDoesNotExistException)
+        o.errors << Shapes::ShapeRef.new(shape: TrackingOptionsDoesNotExistException)
+      end)
+
       api.add_operation(:delete_identity, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteIdentity"
         o.http_method = "POST"
@@ -1196,6 +1249,17 @@ module Aws::SES
         o.errors << Shapes::ShapeRef.new(shape: InvalidSNSDestinationException)
       end)
 
+      api.add_operation(:update_configuration_set_tracking_options, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UpdateConfigurationSetTrackingOptions"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: UpdateConfigurationSetTrackingOptionsRequest)
+        o.output = Shapes::ShapeRef.new(shape: UpdateConfigurationSetTrackingOptionsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ConfigurationSetDoesNotExistException)
+        o.errors << Shapes::ShapeRef.new(shape: TrackingOptionsDoesNotExistException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidTrackingOptionsException)
+      end)
+
       api.add_operation(:update_receipt_rule, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UpdateReceiptRule"
         o.http_method = "POST"

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

@@ -366,13 +366,16 @@ module Aws::SES
 
     # The name of the configuration set.
     #
-    # Configuration sets enable you to publish email sending events. For
-    # information about using configuration sets, see the [Amazon SES
-    # Developer Guide][1].
+    # Configuration sets let you create groups of rules that you can apply
+    # to the emails you send using Amazon SES. For more information about
+    # using configuration sets, see [Using Amazon SES Configuration Sets][1]
+    # in the <i> <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/">Amazon
+    # SES Developer Guide</a>.</i>
     #
     #
     #
-    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/monitor-sending-activity.html
+    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/using-configuration-sets.html
     #
     # @note When making an API call, you may pass ConfigurationSet
     #   data as a hash:
@@ -382,12 +385,13 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] name
-    #   The name of the configuration set. The name must:
+    #   The name of the configuration set. The name must meet the following
+    #   requirements:
     #
-    #   * Contain only ASCII letters (a-z, A-Z), numbers (0-9), underscores
-    #     (\_), or dashes (-).
+    #   * Contain only letters (a-z, A-Z), numbers (0-9), underscores (\_),
+    #     or dashes (-).
     #
-    #   * Contain less than 64 characters.
+    #   * Contain 64 characters or fewer.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/ConfigurationSet AWS API Documentation
@@ -468,14 +472,13 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] configuration_set_name
-    #   The name of the configuration set to which to apply the event
-    #   destination.
+    #   The name of the configuration set that the event destination should
+    #   be associated with.
     #   @return [String]
     #
     # @!attribute [rw] event_destination
-    #   An object that describes the AWS service to which Amazon SES will
-    #   publish the email sending events associated with the specified
-    #   configuration set.
+    #   An object that describes the AWS service that email sending event
+    #   information will be published to.
     #   @return [Types::EventDestination]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/CreateConfigurationSetEventDestinationRequest AWS API Documentation
@@ -526,6 +529,53 @@ module Aws::SES
     #
     class CreateConfigurationSetResponse < Aws::EmptyStructure; end
 
+    # Represents a request to create an open and click tracking option
+    # object in a configuration set.
+    #
+    # @note When making an API call, you may pass CreateConfigurationSetTrackingOptionsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         configuration_set_name: "ConfigurationSetName", # required
+    #         tracking_options: { # required
+    #           custom_redirect_domain: "CustomRedirectDomain",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] configuration_set_name
+    #   The name of the configuration set that the tracking options should
+    #   be associated with.
+    #   @return [String]
+    #
+    # @!attribute [rw] tracking_options
+    #   A domain that is used to redirect email recipients to an Amazon
+    #   SES-operated domain. This domain captures open and click events
+    #   generated by Amazon SES emails.
+    #
+    #   For more information, see [Configuring Custom Domains to Handle Open
+    #   and Click Tracking][1] in the <i> <a
+    #   href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html">Amazon
+    #   SES Developer Guide</a>.</i>
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/configure-custom-open-click-domains.html
+    #   @return [Types::TrackingOptions]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/CreateConfigurationSetTrackingOptionsRequest AWS API Documentation
+    #
+    class CreateConfigurationSetTrackingOptionsRequest < Struct.new(
+      :configuration_set_name,
+      :tracking_options)
+      include Aws::Structure
+    end
+
+    # An empty element returned on a successful request.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/CreateConfigurationSetTrackingOptionsResponse AWS API Documentation
+    #
+    class CreateConfigurationSetTrackingOptionsResponse < Aws::EmptyStructure; end
+
     # Represents a request to create a new IP address filter. You use IP
     # address filters when you receive email with Amazon SES. For more
     # information, see the [Amazon SES Developer Guide][1].
@@ -628,7 +678,7 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] rule_set_name
-    #   The name of the rule set to which to add the rule.
+    #   The name of the rule set that the receipt rule will be added to.
     #   @return [String]
     #
     # @!attribute [rw] after
@@ -769,6 +819,34 @@ module Aws::SES
     #
     class DeleteConfigurationSetResponse < Aws::EmptyStructure; end
 
+    # Represents a request to delete open and click tracking options in a
+    # configuration set.
+    #
+    # @note When making an API call, you may pass DeleteConfigurationSetTrackingOptionsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         configuration_set_name: "ConfigurationSetName", # required
+    #       }
+    #
+    # @!attribute [rw] configuration_set_name
+    #   The name of the configuration set from which you want to delete the
+    #   tracking options.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/DeleteConfigurationSetTrackingOptionsRequest AWS API Documentation
+    #
+    class DeleteConfigurationSetTrackingOptionsRequest < Struct.new(
+      :configuration_set_name)
+      include Aws::Structure
+    end
+
+    # An empty element returned on a successful request.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/DeleteConfigurationSetTrackingOptionsResponse AWS API Documentation
+    #
+    class DeleteConfigurationSetTrackingOptionsResponse < Aws::EmptyStructure; end
+
     # Represents a request to delete a sending authorization policy for an
     # identity. Sending authorization is an Amazon SES feature that enables
     # you to authorize other senders to use your identities. For
@@ -1017,7 +1095,7 @@ module Aws::SES
     #
     #       {
     #         configuration_set_name: "ConfigurationSetName", # required
-    #         configuration_set_attribute_names: ["eventDestinations"], # accepts eventDestinations
+    #         configuration_set_attribute_names: ["eventDestinations"], # accepts eventDestinations, trackingOptions
     #       }
     #
     # @!attribute [rw] configuration_set_name
@@ -1053,11 +1131,17 @@ module Aws::SES
     #   A list of event destinations associated with the configuration set.
     #   @return [Array<Types::EventDestination>]
     #
+    # @!attribute [rw] tracking_options
+    #   The name of the custom open and click tracking domain associated
+    #   with the configuration set.
+    #   @return [Types::TrackingOptions]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/DescribeConfigurationSetResponse AWS API Documentation
     #
     class DescribeConfigurationSetResponse < Struct.new(
       :configuration_set,
-      :event_destinations)
+      :event_destinations,
+      :tracking_options)
       include Aws::Structure
     end
 
@@ -1078,7 +1162,7 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] rule_set_name
-    #   The name of the receipt rule set to which the receipt rule belongs.
+    #   The name of the receipt rule set that the receipt rule belongs to.
     #   @return [String]
     #
     # @!attribute [rw] rule_name
@@ -1165,7 +1249,7 @@ module Aws::SES
     #
     #
     #
-    # [1]: http://tools.ietf.org/html/rfc2047
+    # [1]: https://tools.ietf.org/html/rfc2047
     #
     # @note When making an API call, you may pass Destination
     #   data as a hash:
@@ -1197,8 +1281,8 @@ module Aws::SES
       include Aws::Structure
     end
 
-    # Contains information about the event destination to which the
-    # specified email sending events are published.
+    # Contains information about the event destination that the specified
+    # email sending events will be published to.
     #
     # <note markdown="1"> When you create or update an event destination, you must provide one,
     # and only one, destination. The destination can be Amazon CloudWatch,
@@ -1767,12 +1851,9 @@ module Aws::SES
     #
     # Event destinations, such as Amazon Kinesis Firehose, are associated
     # with configuration sets, which enable you to publish email sending
-    # events. For information about using configuration sets, see the
-    # [Amazon SES Developer Guide][1].
-    #
-    #
-    #
-    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/monitor-sending-activity.html
+    # events. For information about using configuration sets, see the <i> <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/monitor-sending-activity.html">Amazon
+    # SES Developer Guide</a>.</i>
     #
     # @note When making an API call, you may pass KinesisFirehoseDestination
     #   data as a hash:
@@ -1788,8 +1869,8 @@ module Aws::SES
     #   @return [String]
     #
     # @!attribute [rw] delivery_stream_arn
-    #   The ARN of the Amazon Kinesis Firehose stream to which to publish
-    #   email sending events.
+    #   The ARN of the Amazon Kinesis Firehose stream that email sending
+    #   events should be published to.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/KinesisFirehoseDestination AWS API Documentation
@@ -1807,15 +1888,14 @@ module Aws::SES
     # To enable Amazon SES to call your AWS Lambda function or to publish to
     # an Amazon SNS topic of another account, Amazon SES must have
     # permission to access those resources. For information about giving
-    # permissions, see the [Amazon SES Developer Guide][1].
+    # permissions, see the <i> <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-permissions.html">Amazon
+    # SES Developer Guide</a>.</i>
     #
     # For information about using AWS Lambda actions in receipt rules, see
-    # the [Amazon SES Developer Guide][2].
-    #
-    #
-    #
-    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-permissions.html
-    # [2]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-action-lambda.html
+    # the <i> <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-action-lambda.html">Amazon
+    # SES Developer Guide</a>.</i>
     #
     # @note When making an API call, you may pass LambdaAction
     #   data as a hash:
@@ -1830,24 +1910,18 @@ module Aws::SES
     #   The Amazon Resource Name (ARN) of the Amazon SNS topic to notify
     #   when the Lambda action is taken. An example of an Amazon SNS topic
     #   ARN is `arn:aws:sns:us-west-2:123456789012:MyTopic`. For more
-    #   information about Amazon SNS topics, see the [Amazon SNS Developer
-    #   Guide][1].
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/sns/latest/dg/CreateTopic.html
+    #   information about Amazon SNS topics, see the <i> <a
+    #   href="http://docs.aws.amazon.com/sns/latest/dg/CreateTopic.html">Amazon
+    #   SNS Developer Guide</a>.</i>
     #   @return [String]
     #
     # @!attribute [rw] function_arn
     #   The Amazon Resource Name (ARN) of the AWS Lambda function. An
     #   example of an AWS Lambda function ARN is
     #   `arn:aws:lambda:us-west-2:account-id:function:MyFunction`. For more
-    #   information about AWS Lambda, see the [AWS Lambda Developer
-    #   Guide][1].
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/lambda/latest/dg/welcome.html
+    #   information about AWS Lambda, see the <i> <a
+    #   href="http://docs.aws.amazon.com/lambda/latest/dg/welcome.html">AWS
+    #   Lambda Developer Guide</a>.</i>
     #   @return [String]
     #
     # @!attribute [rw] invocation_type
@@ -1856,16 +1930,14 @@ module Aws::SES
     #   immediately result in a response, and a value of `Event` means that
     #   the function will be invoked asynchronously. The default value is
     #   `Event`. For information about AWS Lambda invocation types, see the
-    #   [AWS Lambda Developer Guide][1].
+    #   <i> <a
+    #   href="http://docs.aws.amazon.com/lambda/latest/dg/API_Invoke.html">AWS
+    #   Lambda Developer Guide</a>.</i>
     #
     #   There is a 30-second timeout on `RequestResponse` invocations. You
     #   should use `Event` invocation in most cases. Use `RequestResponse`
     #   only when you want to make a mail flow decision, such as whether to
     #   stop the receipt rule or the receipt rule set.
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/lambda/latest/dg/API_Invoke.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/LambdaAction AWS API Documentation
@@ -2181,12 +2253,10 @@ module Aws::SES
     # Notification (DSN) when an email that Amazon SES receives on your
     # behalf bounces.
     #
-    # For information about receiving email through Amazon SES, see the
-    # [Amazon SES Developer Guide][1].
-    #
-    #
-    #
-    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email.html
+    # For information about receiving email through Amazon SES, see the <i>
+    # <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email.html">Amazon
+    # SES Developer Guide</a>.</i>
     #
     # @note When making an API call, you may pass MessageDsn
     #   data as a hash:
@@ -2298,7 +2368,7 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] identity
-    #   The identity to which the policy will apply. You can specify an
+    #   The identity that the policy will apply to. You can specify an
     #   identity by using its name or by using its Amazon Resource Name
     #   (ARN). Examples: `user@example.com`, `example.com`,
     #   `arn:aws:ses:us-east-1:123456789012:identity/example.com`.
@@ -2576,8 +2646,8 @@ module Aws::SES
     # take when it receives mail on behalf of one or more email addresses or
     # domains that you own.
     #
-    # Each receipt rule defines a set of email addresses or domains to which
-    # it applies. If the email addresses or domains match at least one
+    # Each receipt rule defines a set of email addresses or domains that it
+    # applies to. If the email addresses or domains match at least one
     # recipient address of the message, Amazon SES executes all of the
     # receipt rule's actions on the message.
     #
@@ -2660,8 +2730,8 @@ module Aws::SES
     #   @return [String]
     #
     # @!attribute [rw] recipients
-    #   The recipient domains and email addresses to which the receipt rule
-    #   applies. If this field is not specified, this rule will match all
+    #   The recipient domains and email addresses that the receipt rule
+    #   applies to. If this field is not specified, this rule will match all
     #   recipients under all verified domains.
     #   @return [Array<String>]
     #
@@ -2672,7 +2742,7 @@ module Aws::SES
     #   @return [Array<Types::ReceiptAction>]
     #
     # @!attribute [rw] scan_enabled
-    #   If `true`, then messages to which this receipt rule applies are
+    #   If `true`, then messages that this receipt rule applies to are
     #   scanned for spam and viruses. The default value is `false`.
     #   @return [Boolean]
     #
@@ -2754,11 +2824,11 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] final_recipient
-    #   The email address to which the message was ultimately delivered.
-    #   This corresponds to the `Final-Recipient` in the DSN. If not
-    #   specified, `FinalRecipient` will be set to the `Recipient` specified
-    #   in the `BouncedRecipientInfo` structure. Either `FinalRecipient` or
-    #   the recipient in `BouncedRecipientInfo` must be a recipient of the
+    #   The email address that the message was ultimately delivered to. This
+    #   corresponds to the `Final-Recipient` in the DSN. If not specified,
+    #   `FinalRecipient` will be set to the `Recipient` specified in the
+    #   `BouncedRecipientInfo` structure. Either `FinalRecipient` or the
+    #   recipient in `BouncedRecipientInfo` must be a recipient of the
     #   original bounced message.
     #
     #   <note markdown="1"> Do not prepend the `FinalRecipient` email address with `rfc 822;`,
@@ -2923,8 +2993,8 @@ module Aws::SES
     #   @return [String]
     #
     # @!attribute [rw] bucket_name
-    #   The name of the Amazon S3 bucket to which to save the received
-    #   email.
+    #   The name of the Amazon S3 bucket that incoming email will be saved
+    #   to.
     #   @return [String]
     #
     # @!attribute [rw] object_key_prefix
@@ -2966,7 +3036,8 @@ module Aws::SES
     #   access to use your AWS KMS keys for decryption. This encryption
     #   client is currently available with the [AWS Java SDK][3] and [AWS
     #   Ruby SDK][4] only. For more information about client-side encryption
-    #   using AWS KMS master keys, see the [Amazon S3 Developer Guide][5].
+    #   using AWS KMS master keys, see the [Amazon S3 Developer
+    #   Guide](AmazonS3/latest/dev/UsingClientSideEncryption.html).
     #
     #
     #
@@ -2974,7 +3045,6 @@ module Aws::SES
     #   [2]: http://docs.aws.amazon.com/kms/latest/developerguide/concepts.html
     #   [3]: http://aws.amazon.com/sdk-for-java/
     #   [4]: http://aws.amazon.com/sdk-for-ruby/
-    #   [5]: http://alpha-docs-aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/S3Action AWS API Documentation
@@ -3052,12 +3122,9 @@ module Aws::SES
     #
     # Event destinations, such as Amazon SNS, are associated with
     # configuration sets, which enable you to publish email sending events.
-    # For information about using configuration sets, see the [Amazon SES
-    # Developer Guide][1].
-    #
-    #
-    #
-    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/monitor-sending-activity.html
+    # For information about using configuration sets, see the <i> <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/monitor-sending-activity.html">Amazon
+    # SES Developer Guide</a>.</i>
     #
     # @note When making an API call, you may pass SNSDestination
     #   data as a hash:
@@ -3067,15 +3134,12 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] topic_arn
-    #   The ARN of the Amazon SNS topic to which you want to publish email
-    #   sending events. An example of an Amazon SNS topic ARN is
-    #   arn:aws:sns:us-west-2:123456789012:MyTopic. For more information
-    #   about Amazon SNS topics, see the [ *Amazon SNS Developer Guide*
-    #   ][1].
-    #
-    #
-    #
-    #   [1]: http://docs.aws.amazon.com/http:/alpha-docs-aws.amazon.com/sns/latest/dg/CreateTopic.html
+    #   The ARN of the Amazon SNS topic that email sending events will be
+    #   published to. An example of an Amazon SNS topic ARN is
+    #   `arn:aws:sns:us-west-2:123456789012:MyTopic`. For more information
+    #   about Amazon SNS topics, see the <i> <a
+    #   href="http://docs.aws.amazon.com/sns/latest/dg/CreateTopic.html">Amazon
+    #   SNS Developer Guide</a>.</i>
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/SNSDestination AWS API Documentation
@@ -3295,7 +3359,7 @@ module Aws::SES
     #
     #   [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/verify-addresses-and-domains.html
     #   [2]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/sending-authorization.html
-    #   [3]: http://tools.ietf.org/html/rfc2047
+    #   [3]: https://tools.ietf.org/html/rfc2047
     #   @return [String]
     #
     # @!attribute [rw] destination
@@ -3314,14 +3378,14 @@ module Aws::SES
     #   @return [Array<String>]
     #
     # @!attribute [rw] return_path
-    #   The email address to which bounces and complaints are to be
-    #   forwarded when feedback forwarding is enabled. If the message cannot
-    #   be delivered to the recipient, then an error message will be
-    #   returned from the recipient's ISP; this message will then be
-    #   forwarded to the email address specified by the `ReturnPath`
-    #   parameter. The `ReturnPath` parameter is never overwritten. This
-    #   email address must be either individually verified with Amazon SES,
-    #   or from a domain that has been verified with Amazon SES.
+    #   The email address that bounces and complaints will be forwarded to
+    #   when feedback forwarding is enabled. If the message cannot be
+    #   delivered to the recipient, then an error message will be returned
+    #   from the recipient's ISP; this message will then be forwarded to
+    #   the email address specified by the `ReturnPath` parameter. The
+    #   `ReturnPath` parameter is never overwritten. This email address must
+    #   be either individually verified with Amazon SES, or from a domain
+    #   that has been verified with Amazon SES.
     #   @return [String]
     #
     # @!attribute [rw] source_arn
@@ -3447,14 +3511,14 @@ module Aws::SES
     #
     #   <note markdown="1"> If you specify the `Source` parameter and have feedback forwarding
     #   enabled, then bounces and complaints will be sent to this email
-    #   address. This takes precedence over any *Return-Path* header that
-    #   you might include in the raw text of the message.
+    #   address. This takes precedence over any Return-Path header that you
+    #   might include in the raw text of the message.
     #
     #    </note>
     #
     #
     #
-    #   [1]: http://tools.ietf.org/html/rfc2047
+    #   [1]: https://tools.ietf.org/html/rfc2047
     #   @return [String]
     #
     # @!attribute [rw] destinations
@@ -3947,11 +4011,9 @@ module Aws::SES
     # Amazon Simple Notification Service (Amazon SNS).
     #
     # For information about setting a stop action in a receipt rule, see the
-    # [Amazon SES Developer Guide][1].
-    #
-    #
-    #
-    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-action-stop.html
+    # <i> <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-action-stop.html">Amazon
+    # SES Developer Guide</a>.</i>
     #
     # @note When making an API call, you may pass StopAction
     #   data as a hash:
@@ -3962,8 +4024,7 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] scope
-    #   The scope to which the Stop action applies. That is, what is being
-    #   stopped.
+    #   The name of the RuleSet that is being stopped.
     #   @return [String]
     #
     # @!attribute [rw] topic_arn
@@ -3986,6 +4047,38 @@ module Aws::SES
       include Aws::Structure
     end
 
+    # A domain that is used to redirect email recipients to an Amazon
+    # SES-operated domain. This domain captures open and click events
+    # generated by Amazon SES emails.
+    #
+    # For more information, see [Configuring Custom Domains to Handle Open
+    # and Click Tracking][1] in the <i> <a
+    # href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html">Amazon
+    # SES Developer Guide</a>.</i>
+    #
+    #
+    #
+    # [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/configure-custom-open-click-domains.html
+    #
+    # @note When making an API call, you may pass TrackingOptions
+    #   data as a hash:
+    #
+    #       {
+    #         custom_redirect_domain: "CustomRedirectDomain",
+    #       }
+    #
+    # @!attribute [rw] custom_redirect_domain
+    #   The custom subdomain that will be used to redirect email recipients
+    #   to the Amazon SES event tracking domain.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/TrackingOptions AWS API Documentation
+    #
+    class TrackingOptions < Struct.new(
+      :custom_redirect_domain)
+      include Aws::Structure
+    end
+
     # Represents a request to update the event destination of a
     # configuration set. Configuration sets enable you to publish email
     # sending events. For information about using configuration sets, see
@@ -4024,7 +4117,8 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] configuration_set_name
-    #   The name of the configuration set that you want to update.
+    #   The name of the configuration set that contains the event
+    #   destination that you want to update.
     #   @return [String]
     #
     # @!attribute [rw] event_destination
@@ -4046,6 +4140,53 @@ module Aws::SES
     #
     class UpdateConfigurationSetEventDestinationResponse < Aws::EmptyStructure; end
 
+    # Represents a request to update the tracking options for a
+    # configuration set.
+    #
+    # @note When making an API call, you may pass UpdateConfigurationSetTrackingOptionsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         configuration_set_name: "ConfigurationSetName", # required
+    #         tracking_options: { # required
+    #           custom_redirect_domain: "CustomRedirectDomain",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] configuration_set_name
+    #   The name of the configuration set for which you want to update the
+    #   custom tracking domain.
+    #   @return [String]
+    #
+    # @!attribute [rw] tracking_options
+    #   A domain that is used to redirect email recipients to an Amazon
+    #   SES-operated domain. This domain captures open and click events
+    #   generated by Amazon SES emails.
+    #
+    #   For more information, see [Configuring Custom Domains to Handle Open
+    #   and Click Tracking][1] in the <i> <a
+    #   href="http://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html">Amazon
+    #   SES Developer Guide</a>.</i>
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/configure-custom-open-click-domains.html
+    #   @return [Types::TrackingOptions]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/UpdateConfigurationSetTrackingOptionsRequest AWS API Documentation
+    #
+    class UpdateConfigurationSetTrackingOptionsRequest < Struct.new(
+      :configuration_set_name,
+      :tracking_options)
+      include Aws::Structure
+    end
+
+    # An empty element returned on a successful request.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/email-2010-12-01/UpdateConfigurationSetTrackingOptionsResponse AWS API Documentation
+    #
+    class UpdateConfigurationSetTrackingOptionsResponse < Aws::EmptyStructure; end
+
     # Represents a request to update a receipt rule. You use receipt rules
     # to receive email with Amazon SES. For more information, see the
     # [Amazon SES Developer Guide][1].
@@ -4107,7 +4248,7 @@ module Aws::SES
     #       }
     #
     # @!attribute [rw] rule_set_name
-    #   The name of the receipt rule set to which the receipt rule belongs.
+    #   The name of the receipt rule set that the receipt rule belongs to.
     #   @return [String]
     #
     # @!attribute [rw] rule