aws-sdk-pinpoint 1.37.0 → 1.42.1

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

@@ -42,6 +42,7 @@ module Aws::Pinpoint
     BaiduChannelResponse = Shapes::StructureShape.new(name: 'BaiduChannelResponse')
     BaiduMessage = Shapes::StructureShape.new(name: 'BaiduMessage')
     BaseKpiResult = Shapes::StructureShape.new(name: 'BaseKpiResult')
+    CampaignCustomMessage = Shapes::StructureShape.new(name: 'CampaignCustomMessage')
     CampaignDateRangeKpiResponse = Shapes::StructureShape.new(name: 'CampaignDateRangeKpiResponse')
     CampaignEmailMessage = Shapes::StructureShape.new(name: 'CampaignEmailMessage')
     CampaignEventFilter = Shapes::StructureShape.new(name: 'CampaignEventFilter')
@@ -82,6 +83,8 @@ module Aws::Pinpoint
     CreateTemplateMessageBody = Shapes::StructureShape.new(name: 'CreateTemplateMessageBody')
     CreateVoiceTemplateRequest = Shapes::StructureShape.new(name: 'CreateVoiceTemplateRequest')
     CreateVoiceTemplateResponse = Shapes::StructureShape.new(name: 'CreateVoiceTemplateResponse')
+    CustomDeliveryConfiguration = Shapes::StructureShape.new(name: 'CustomDeliveryConfiguration')
+    CustomMessageActivity = Shapes::StructureShape.new(name: 'CustomMessageActivity')
     DefaultMessage = Shapes::StructureShape.new(name: 'DefaultMessage')
     DefaultPushNotificationMessage = Shapes::StructureShape.new(name: 'DefaultPushNotificationMessage')
     DefaultPushNotificationTemplate = Shapes::StructureShape.new(name: 'DefaultPushNotificationTemplate')
@@ -268,12 +271,15 @@ module Aws::Pinpoint
     InternalServerErrorException = Shapes::StructureShape.new(name: 'InternalServerErrorException')
     ItemResponse = Shapes::StructureShape.new(name: 'ItemResponse')
     JobStatus = Shapes::StringShape.new(name: 'JobStatus')
+    JourneyCustomMessage = Shapes::StructureShape.new(name: 'JourneyCustomMessage')
     JourneyDateRangeKpiResponse = Shapes::StructureShape.new(name: 'JourneyDateRangeKpiResponse')
     JourneyEmailMessage = Shapes::StructureShape.new(name: 'JourneyEmailMessage')
     JourneyExecutionActivityMetricsResponse = Shapes::StructureShape.new(name: 'JourneyExecutionActivityMetricsResponse')
     JourneyExecutionMetricsResponse = Shapes::StructureShape.new(name: 'JourneyExecutionMetricsResponse')
     JourneyLimits = Shapes::StructureShape.new(name: 'JourneyLimits')
+    JourneyPushMessage = Shapes::StructureShape.new(name: 'JourneyPushMessage')
     JourneyResponse = Shapes::StructureShape.new(name: 'JourneyResponse')
+    JourneySMSMessage = Shapes::StructureShape.new(name: 'JourneySMSMessage')
     JourneySchedule = Shapes::StructureShape.new(name: 'JourneySchedule')
     JourneyStateRequest = Shapes::StructureShape.new(name: 'JourneyStateRequest')
     JourneysResponse = Shapes::StructureShape.new(name: 'JourneysResponse')
@@ -301,6 +307,7 @@ module Aws::Pinpoint
     ListOfTemplateVersionResponse = Shapes::ListShape.new(name: 'ListOfTemplateVersionResponse')
     ListOfTreatmentResource = Shapes::ListShape.new(name: 'ListOfTreatmentResource')
     ListOfWriteTreatmentResource = Shapes::ListShape.new(name: 'ListOfWriteTreatmentResource')
+    ListOf__EndpointTypesElement = Shapes::ListShape.new(name: 'ListOf__EndpointTypesElement')
     ListOf__string = Shapes::ListShape.new(name: 'ListOf__string')
     ListRecommenderConfigurationsResponse = Shapes::StructureShape.new(name: 'ListRecommenderConfigurationsResponse')
     ListTagsForResourceRequest = Shapes::StructureShape.new(name: 'ListTagsForResourceRequest')
@@ -346,6 +353,7 @@ module Aws::Pinpoint
     PhoneNumberValidateRequest = Shapes::StructureShape.new(name: 'PhoneNumberValidateRequest')
     PhoneNumberValidateResponse = Shapes::StructureShape.new(name: 'PhoneNumberValidateResponse')
     PublicEndpoint = Shapes::StructureShape.new(name: 'PublicEndpoint')
+    PushMessageActivity = Shapes::StructureShape.new(name: 'PushMessageActivity')
     PushNotificationTemplateRequest = Shapes::StructureShape.new(name: 'PushNotificationTemplateRequest')
     PushNotificationTemplateResponse = Shapes::StructureShape.new(name: 'PushNotificationTemplateResponse')
     PutEventStreamRequest = Shapes::StructureShape.new(name: 'PutEventStreamRequest')
@@ -366,6 +374,7 @@ module Aws::Pinpoint
     SMSChannelRequest = Shapes::StructureShape.new(name: 'SMSChannelRequest')
     SMSChannelResponse = Shapes::StructureShape.new(name: 'SMSChannelResponse')
     SMSMessage = Shapes::StructureShape.new(name: 'SMSMessage')
+    SMSMessageActivity = Shapes::StructureShape.new(name: 'SMSMessageActivity')
     SMSTemplateRequest = Shapes::StructureShape.new(name: 'SMSTemplateRequest')
     SMSTemplateResponse = Shapes::StructureShape.new(name: 'SMSTemplateResponse')
     Schedule = Shapes::StructureShape.new(name: 'Schedule')
@@ -470,6 +479,7 @@ module Aws::Pinpoint
     WriteJourneyRequest = Shapes::StructureShape.new(name: 'WriteJourneyRequest')
     WriteSegmentRequest = Shapes::StructureShape.new(name: 'WriteSegmentRequest')
     WriteTreatmentResource = Shapes::StructureShape.new(name: 'WriteTreatmentResource')
+    __EndpointTypesElement = Shapes::StringShape.new(name: '__EndpointTypesElement')
     __blob = Shapes::BlobShape.new(name: '__blob')
     __boolean = Shapes::BooleanShape.new(name: '__boolean')
     __double = Shapes::FloatShape.new(name: '__double')
@@ -643,12 +653,15 @@ module Aws::Pinpoint
     ActivitiesResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "NextToken"))
     ActivitiesResponse.struct_class = Types::ActivitiesResponse
 
+    Activity.add_member(:custom, Shapes::ShapeRef.new(shape: CustomMessageActivity, location_name: "CUSTOM"))
     Activity.add_member(:conditional_split, Shapes::ShapeRef.new(shape: ConditionalSplitActivity, location_name: "ConditionalSplit"))
     Activity.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "Description"))
     Activity.add_member(:email, Shapes::ShapeRef.new(shape: EmailMessageActivity, location_name: "EMAIL"))
     Activity.add_member(:holdout, Shapes::ShapeRef.new(shape: HoldoutActivity, location_name: "Holdout"))
     Activity.add_member(:multi_condition, Shapes::ShapeRef.new(shape: MultiConditionalSplitActivity, location_name: "MultiCondition"))
+    Activity.add_member(:push, Shapes::ShapeRef.new(shape: PushMessageActivity, location_name: "PUSH"))
     Activity.add_member(:random_split, Shapes::ShapeRef.new(shape: RandomSplitActivity, location_name: "RandomSplit"))
+    Activity.add_member(:sms, Shapes::ShapeRef.new(shape: SMSMessageActivity, location_name: "SMS"))
     Activity.add_member(:wait, Shapes::ShapeRef.new(shape: WaitActivity, location_name: "Wait"))
     Activity.struct_class = Types::Activity
 
@@ -761,6 +774,9 @@ module Aws::Pinpoint
     BaseKpiResult.add_member(:rows, Shapes::ShapeRef.new(shape: ListOfResultRow, required: true, location_name: "Rows"))
     BaseKpiResult.struct_class = Types::BaseKpiResult
 
+    CampaignCustomMessage.add_member(:data, Shapes::ShapeRef.new(shape: __string, location_name: "Data"))
+    CampaignCustomMessage.struct_class = Types::CampaignCustomMessage
+
     CampaignDateRangeKpiResponse.add_member(:application_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "ApplicationId"))
     CampaignDateRangeKpiResponse.add_member(:campaign_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "CampaignId"))
     CampaignDateRangeKpiResponse.add_member(:end_time, Shapes::ShapeRef.new(shape: __timestampIso8601, required: true, location_name: "EndTime"))
@@ -795,6 +811,7 @@ module Aws::Pinpoint
     CampaignResponse.add_member(:application_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "ApplicationId"))
     CampaignResponse.add_member(:arn, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "Arn"))
     CampaignResponse.add_member(:creation_date, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "CreationDate"))
+    CampaignResponse.add_member(:custom_delivery_configuration, Shapes::ShapeRef.new(shape: CustomDeliveryConfiguration, location_name: "CustomDeliveryConfiguration"))
     CampaignResponse.add_member(:default_state, Shapes::ShapeRef.new(shape: CampaignState, location_name: "DefaultState"))
     CampaignResponse.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "Description"))
     CampaignResponse.add_member(:holdout_percent, Shapes::ShapeRef.new(shape: __integer, location_name: "HoldoutPercent"))
@@ -991,6 +1008,18 @@ module Aws::Pinpoint
     CreateVoiceTemplateResponse[:payload] = :create_template_message_body
     CreateVoiceTemplateResponse[:payload_member] = CreateVoiceTemplateResponse.member(:create_template_message_body)
 
+    CustomDeliveryConfiguration.add_member(:delivery_uri, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "DeliveryUri"))
+    CustomDeliveryConfiguration.add_member(:endpoint_types, Shapes::ShapeRef.new(shape: ListOf__EndpointTypesElement, location_name: "EndpointTypes"))
+    CustomDeliveryConfiguration.struct_class = Types::CustomDeliveryConfiguration
+
+    CustomMessageActivity.add_member(:delivery_uri, Shapes::ShapeRef.new(shape: __string, location_name: "DeliveryUri"))
+    CustomMessageActivity.add_member(:endpoint_types, Shapes::ShapeRef.new(shape: ListOf__EndpointTypesElement, location_name: "EndpointTypes"))
+    CustomMessageActivity.add_member(:message_config, Shapes::ShapeRef.new(shape: JourneyCustomMessage, location_name: "MessageConfig"))
+    CustomMessageActivity.add_member(:next_activity, Shapes::ShapeRef.new(shape: __string, location_name: "NextActivity"))
+    CustomMessageActivity.add_member(:template_name, Shapes::ShapeRef.new(shape: __string, location_name: "TemplateName"))
+    CustomMessageActivity.add_member(:template_version, Shapes::ShapeRef.new(shape: __string, location_name: "TemplateVersion"))
+    CustomMessageActivity.struct_class = Types::CustomMessageActivity
+
     DefaultMessage.add_member(:body, Shapes::ShapeRef.new(shape: __string, location_name: "Body"))
     DefaultMessage.add_member(:substitutions, Shapes::ShapeRef.new(shape: MapOfListOf__string, location_name: "Substitutions"))
     DefaultMessage.struct_class = Types::DefaultMessage
@@ -1950,6 +1979,9 @@ module Aws::Pinpoint
     ItemResponse.add_member(:events_item_response, Shapes::ShapeRef.new(shape: MapOfEventItemResponse, location_name: "EventsItemResponse"))
     ItemResponse.struct_class = Types::ItemResponse
 
+    JourneyCustomMessage.add_member(:data, Shapes::ShapeRef.new(shape: __string, location_name: "Data"))
+    JourneyCustomMessage.struct_class = Types::JourneyCustomMessage
+
     JourneyDateRangeKpiResponse.add_member(:application_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "ApplicationId"))
     JourneyDateRangeKpiResponse.add_member(:end_time, Shapes::ShapeRef.new(shape: __timestampIso8601, required: true, location_name: "EndTime"))
     JourneyDateRangeKpiResponse.add_member(:journey_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "JourneyId"))
@@ -1981,6 +2013,9 @@ module Aws::Pinpoint
     JourneyLimits.add_member(:messages_per_second, Shapes::ShapeRef.new(shape: __integer, location_name: "MessagesPerSecond"))
     JourneyLimits.struct_class = Types::JourneyLimits
 
+    JourneyPushMessage.add_member(:time_to_live, Shapes::ShapeRef.new(shape: __string, location_name: "TimeToLive"))
+    JourneyPushMessage.struct_class = Types::JourneyPushMessage
+
     JourneyResponse.add_member(:activities, Shapes::ShapeRef.new(shape: MapOfActivity, location_name: "Activities"))
     JourneyResponse.add_member(:application_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "ApplicationId"))
     JourneyResponse.add_member(:creation_date, Shapes::ShapeRef.new(shape: __string, location_name: "CreationDate"))
@@ -1998,6 +2033,10 @@ module Aws::Pinpoint
     JourneyResponse.add_member(:tags, Shapes::ShapeRef.new(shape: MapOf__string, location_name: "tags"))
     JourneyResponse.struct_class = Types::JourneyResponse
 
+    JourneySMSMessage.add_member(:message_type, Shapes::ShapeRef.new(shape: MessageType, location_name: "MessageType"))
+    JourneySMSMessage.add_member(:sender_id, Shapes::ShapeRef.new(shape: __string, location_name: "SenderId"))
+    JourneySMSMessage.struct_class = Types::JourneySMSMessage
+
     JourneySchedule.add_member(:end_time, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "EndTime"))
     JourneySchedule.add_member(:start_time, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "StartTime"))
     JourneySchedule.add_member(:timezone, Shapes::ShapeRef.new(shape: __string, location_name: "Timezone"))
@@ -2064,6 +2103,8 @@ module Aws::Pinpoint
 
     ListOfWriteTreatmentResource.member = Shapes::ShapeRef.new(shape: WriteTreatmentResource)
 
+    ListOf__EndpointTypesElement.member = Shapes::ShapeRef.new(shape: __EndpointTypesElement)
+
     ListOf__string.member = Shapes::ShapeRef.new(shape: __string)
 
     ListRecommenderConfigurationsResponse.add_member(:item, Shapes::ShapeRef.new(shape: ListOfRecommenderConfigurationResponse, required: true, location_name: "Item"))
@@ -2172,6 +2213,7 @@ module Aws::Pinpoint
     MessageConfiguration.add_member(:adm_message, Shapes::ShapeRef.new(shape: Message, location_name: "ADMMessage"))
     MessageConfiguration.add_member(:apns_message, Shapes::ShapeRef.new(shape: Message, location_name: "APNSMessage"))
     MessageConfiguration.add_member(:baidu_message, Shapes::ShapeRef.new(shape: Message, location_name: "BaiduMessage"))
+    MessageConfiguration.add_member(:custom_message, Shapes::ShapeRef.new(shape: CampaignCustomMessage, location_name: "CustomMessage"))
     MessageConfiguration.add_member(:default_message, Shapes::ShapeRef.new(shape: Message, location_name: "DefaultMessage"))
     MessageConfiguration.add_member(:email_message, Shapes::ShapeRef.new(shape: CampaignEmailMessage, location_name: "EmailMessage"))
     MessageConfiguration.add_member(:gcm_message, Shapes::ShapeRef.new(shape: Message, location_name: "GCMMessage"))
@@ -2267,6 +2309,12 @@ module Aws::Pinpoint
     PublicEndpoint.add_member(:user, Shapes::ShapeRef.new(shape: EndpointUser, location_name: "User"))
     PublicEndpoint.struct_class = Types::PublicEndpoint
 
+    PushMessageActivity.add_member(:message_config, Shapes::ShapeRef.new(shape: JourneyPushMessage, location_name: "MessageConfig"))
+    PushMessageActivity.add_member(:next_activity, Shapes::ShapeRef.new(shape: __string, location_name: "NextActivity"))
+    PushMessageActivity.add_member(:template_name, Shapes::ShapeRef.new(shape: __string, location_name: "TemplateName"))
+    PushMessageActivity.add_member(:template_version, Shapes::ShapeRef.new(shape: __string, location_name: "TemplateVersion"))
+    PushMessageActivity.struct_class = Types::PushMessageActivity
+
     PushNotificationTemplateRequest.add_member(:adm, Shapes::ShapeRef.new(shape: AndroidPushNotificationTemplate, location_name: "ADM"))
     PushNotificationTemplateRequest.add_member(:apns, Shapes::ShapeRef.new(shape: APNSPushNotificationTemplate, location_name: "APNS"))
     PushNotificationTemplateRequest.add_member(:baidu, Shapes::ShapeRef.new(shape: AndroidPushNotificationTemplate, location_name: "Baidu"))
@@ -2400,6 +2448,12 @@ module Aws::Pinpoint
     SMSMessage.add_member(:substitutions, Shapes::ShapeRef.new(shape: MapOfListOf__string, location_name: "Substitutions"))
     SMSMessage.struct_class = Types::SMSMessage
 
+    SMSMessageActivity.add_member(:message_config, Shapes::ShapeRef.new(shape: JourneySMSMessage, location_name: "MessageConfig"))
+    SMSMessageActivity.add_member(:next_activity, Shapes::ShapeRef.new(shape: __string, location_name: "NextActivity"))
+    SMSMessageActivity.add_member(:template_name, Shapes::ShapeRef.new(shape: __string, location_name: "TemplateName"))
+    SMSMessageActivity.add_member(:template_version, Shapes::ShapeRef.new(shape: __string, location_name: "TemplateVersion"))
+    SMSMessageActivity.struct_class = Types::SMSMessageActivity
+
     SMSTemplateRequest.add_member(:body, Shapes::ShapeRef.new(shape: __string, location_name: "Body"))
     SMSTemplateRequest.add_member(:default_substitutions, Shapes::ShapeRef.new(shape: __string, location_name: "DefaultSubstitutions"))
     SMSTemplateRequest.add_member(:recommender_id, Shapes::ShapeRef.new(shape: __string, location_name: "RecommenderId"))
@@ -2613,6 +2667,7 @@ module Aws::Pinpoint
     TooManyRequestsException.add_member(:request_id, Shapes::ShapeRef.new(shape: __string, location_name: "RequestID"))
     TooManyRequestsException.struct_class = Types::TooManyRequestsException
 
+    TreatmentResource.add_member(:custom_delivery_configuration, Shapes::ShapeRef.new(shape: CustomDeliveryConfiguration, location_name: "CustomDeliveryConfiguration"))
     TreatmentResource.add_member(:id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "Id"))
     TreatmentResource.add_member(:message_configuration, Shapes::ShapeRef.new(shape: MessageConfiguration, location_name: "MessageConfiguration"))
     TreatmentResource.add_member(:schedule, Shapes::ShapeRef.new(shape: Schedule, location_name: "Schedule"))
@@ -2967,6 +3022,7 @@ module Aws::Pinpoint
     WriteApplicationSettingsRequest.struct_class = Types::WriteApplicationSettingsRequest
 
     WriteCampaignRequest.add_member(:additional_treatments, Shapes::ShapeRef.new(shape: ListOfWriteTreatmentResource, location_name: "AdditionalTreatments"))
+    WriteCampaignRequest.add_member(:custom_delivery_configuration, Shapes::ShapeRef.new(shape: CustomDeliveryConfiguration, location_name: "CustomDeliveryConfiguration"))
     WriteCampaignRequest.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "Description"))
     WriteCampaignRequest.add_member(:holdout_percent, Shapes::ShapeRef.new(shape: __integer, location_name: "HoldoutPercent"))
     WriteCampaignRequest.add_member(:hook, Shapes::ShapeRef.new(shape: CampaignHook, location_name: "Hook"))
@@ -3007,6 +3063,7 @@ module Aws::Pinpoint
     WriteSegmentRequest.add_member(:tags, Shapes::ShapeRef.new(shape: MapOf__string, location_name: "tags"))
     WriteSegmentRequest.struct_class = Types::WriteSegmentRequest
 
+    WriteTreatmentResource.add_member(:custom_delivery_configuration, Shapes::ShapeRef.new(shape: CustomDeliveryConfiguration, location_name: "CustomDeliveryConfiguration"))
     WriteTreatmentResource.add_member(:message_configuration, Shapes::ShapeRef.new(shape: MessageConfiguration, location_name: "MessageConfiguration"))
     WriteTreatmentResource.add_member(:schedule, Shapes::ShapeRef.new(shape: Schedule, location_name: "Schedule"))
     WriteTreatmentResource.add_member(:size_percent, Shapes::ShapeRef.new(shape: __integer, required: true, location_name: "SizePercent"))

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

@@ -1234,6 +1234,16 @@ module Aws::Pinpoint
     #   data as a hash:
     #
     #       {
+    #         custom: {
+    #           delivery_uri: "__string",
+    #           endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #           message_config: {
+    #             data: "__string",
+    #           },
+    #           next_activity: "__string",
+    #           template_name: "__string",
+    #           template_version: "__string",
+    #         },
     #         conditional_split: {
     #           condition: {
     #             conditions: [
@@ -1454,6 +1464,14 @@ module Aws::Pinpoint
     #             wait_until: "__string",
     #           },
     #         },
+    #         push: {
+    #           message_config: {
+    #             time_to_live: "__string",
+    #           },
+    #           next_activity: "__string",
+    #           template_name: "__string",
+    #           template_version: "__string",
+    #         },
     #         random_split: {
     #           branches: [
     #             {
@@ -1462,6 +1480,15 @@ module Aws::Pinpoint
     #             },
     #           ],
     #         },
+    #         sms: {
+    #           message_config: {
+    #             message_type: "TRANSACTIONAL", # accepts TRANSACTIONAL, PROMOTIONAL
+    #             sender_id: "__string",
+    #           },
+    #           next_activity: "__string",
+    #           template_name: "__string",
+    #           template_version: "__string",
+    #         },
     #         wait: {
     #           next_activity: "__string",
     #           wait_time: {
@@ -1471,6 +1498,12 @@ module Aws::Pinpoint
     #         },
     #       }
     #
+    # @!attribute [rw] custom
+    #   The settings for a custom message activity. This type of activity
+    #   calls an AWS Lambda function or web hook that sends messages to
+    #   participants.
+    #   @return [Types::CustomMessageActivity]
+    #
     # @!attribute [rw] conditional_split
     #   The settings for a yes/no split activity. This type of activity
     #   sends participants down one of two paths in a journey, based on
@@ -1498,6 +1531,11 @@ module Aws::Pinpoint
     #   that you specify.
     #   @return [Types::MultiConditionalSplitActivity]
     #
+    # @!attribute [rw] push
+    #   The settings for a push notification activity. This type of activity
+    #   sends a push notification to participants.
+    #   @return [Types::PushMessageActivity]
+    #
     # @!attribute [rw] random_split
     #   The settings for a random split activity. This type of activity
     #   randomly sends specified percentages of participants down one of as
@@ -1505,6 +1543,11 @@ module Aws::Pinpoint
     #   specify.
     #   @return [Types::RandomSplitActivity]
     #
+    # @!attribute [rw] sms
+    #   The settings for an SMS activity. This type of activity sends a text
+    #   message to participants.
+    #   @return [Types::SMSMessageActivity]
+    #
     # @!attribute [rw] wait
     #   The settings for a wait activity. This type of activity waits for a
     #   certain amount of time or until a specific date and time before
@@ -1514,12 +1557,15 @@ module Aws::Pinpoint
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/Activity AWS API Documentation
     #
     class Activity < Struct.new(
+      :custom,
       :conditional_split,
       :description,
       :email,
       :holdout,
       :multi_condition,
+      :push,
       :random_split,
+      :sms,
       :wait)
       include Aws::Structure
     end
@@ -1615,7 +1661,7 @@ module Aws::Pinpoint
     #
     #       {
     #         body_override: "__string",
-    #         channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #         context: {
     #           "__string" => "__string",
     #         },
@@ -1795,7 +1841,7 @@ module Aws::Pinpoint
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html
+    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html
     #   @return [String]
     #
     # @!attribute [rw] kpi_result
@@ -1870,8 +1916,9 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] campaign_hook
-    #   The settings for the AWS Lambda function to use by default as a code
-    #   hook for campaigns in the application.
+    #   The settings for the AWS Lambda function to invoke by default as a
+    #   code hook for campaigns in the application. You can use this hook to
+    #   customize segments that are used by campaigns in the application.
     #   @return [Types::CampaignHook]
     #
     # @!attribute [rw] last_modified_date
@@ -1880,7 +1927,8 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] limits
-    #   The default sending limits for campaigns in the application.
+    #   The default sending limits for campaigns and journeys in the
+    #   application.
     #   @return [Types::CampaignLimits]
     #
     # @!attribute [rw] quiet_time
@@ -2276,6 +2324,28 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
+    # Specifies the contents of a message that's sent through a custom
+    # channel to recipients of a campaign.
+    #
+    # @note When making an API call, you may pass CampaignCustomMessage
+    #   data as a hash:
+    #
+    #       {
+    #         data: "__string",
+    #       }
+    #
+    # @!attribute [rw] data
+    #   The raw, JSON-formatted string to use as the payload for the
+    #   message. The maximum size is 5 KB.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/CampaignCustomMessage AWS API Documentation
+    #
+    class CampaignCustomMessage < Struct.new(
+      :data)
+      include Aws::Structure
+    end
+
     # Provides the results of a query that retrieved the data for a standard
     # metric that applies to a campaign, and provides information about that
     # query.
@@ -2305,7 +2375,7 @@ module Aws::Pinpoint
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html
+    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html
     #   @return [String]
     #
     # @!attribute [rw] kpi_result
@@ -2431,8 +2501,8 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
-    # Specifies the AWS Lambda function to use as a code hook for a
-    # campaign.
+    # Specifies settings for invoking an AWS Lambda function that customizes
+    # a segment for a campaign.
     #
     # @note When making an API call, you may pass CampaignHook
     #   data as a hash:
@@ -2445,12 +2515,21 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] lambda_function_name
     #   The name or Amazon Resource Name (ARN) of the AWS Lambda function
-    #   that Amazon Pinpoint invokes to send messages for a campaign.
+    #   that Amazon Pinpoint invokes to customize a segment for a campaign.
     #   @return [String]
     #
     # @!attribute [rw] mode
-    #   Specifies which Lambda mode to use when invoking the AWS Lambda
-    #   function.
+    #   The mode that Amazon Pinpoint uses to invoke the AWS Lambda
+    #   function. Possible values are:
+    #
+    #   * FILTER - Invoke the function to customize the segment that's used
+    #     by a campaign.
+    #
+    #   * DELIVERY - (Deprecated) Previously, invoked the function to send a
+    #     campaign through a custom channel. This functionality is not
+    #     supported anymore. To send a campaign through a custom channel,
+    #     use the CustomDeliveryConfiguration and CampaignCustomMessage
+    #     objects of the campaign.
     #   @return [String]
     #
     # @!attribute [rw] web_url
@@ -2467,7 +2546,9 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
-    # Specifies limits on the messages that a campaign can send.
+    # For a campaign, specifies limits on the messages that the campaign can
+    # send. For an application, specifies the default limits for messages
+    # that campaigns and journeys in the application can send.
     #
     # @note When making an API call, you may pass CampaignLimits
     #   data as a hash:
@@ -2481,7 +2562,10 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] daily
     #   The maximum number of messages that a campaign can send to a single
-    #   endpoint during a 24-hour period. The maximum value is 100.
+    #   endpoint during a 24-hour period. For an application, this value
+    #   specifies the default limit for the number of messages that
+    #   campaigns and journeys can send to a single endpoint during a
+    #   24-hour period. The maximum value is 100.
     #   @return [Integer]
     #
     # @!attribute [rw] maximum_duration
@@ -2492,13 +2576,16 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] messages_per_second
     #   The maximum number of messages that a campaign can send each second.
+    #   For an application, this value specifies the default limit for the
+    #   number of messages that campaigns and journeys can send each second.
     #   The minimum value is 50. The maximum value is 20,000.
     #   @return [Integer]
     #
     # @!attribute [rw] total
     #   The maximum number of messages that a campaign can send to a single
-    #   endpoint during the course of the campaign. The maximum value is
-    #   100.
+    #   endpoint during the course of the campaign. If a campaign recurs,
+    #   this setting applies to all runs of the campaign. The maximum value
+    #   is 100.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/CampaignLimits AWS API Documentation
@@ -2532,10 +2619,14 @@ module Aws::Pinpoint
     #   The date, in ISO 8601 format, when the campaign was created.
     #   @return [String]
     #
+    # @!attribute [rw] custom_delivery_configuration
+    #   The delivery configuration settings for sending the campaign through
+    #   a custom channel.
+    #   @return [Types::CustomDeliveryConfiguration]
+    #
     # @!attribute [rw] default_state
     #   The current status of the campaign's default treatment. This value
-    #   exists only for campaigns that have more than one treatment, to
-    #   support A/B testing.
+    #   exists only for campaigns that have more than one treatment.
     #   @return [Types::CampaignState]
     #
     # @!attribute [rw] description
@@ -2549,7 +2640,8 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] hook
     #   The settings for the AWS Lambda function to use as a code hook for
-    #   the campaign.
+    #   the campaign. You can use this hook to customize the segment that's
+    #   used by the campaign.
     #   @return [Types::CampaignHook]
     #
     # @!attribute [rw] id
@@ -2606,13 +2698,13 @@ module Aws::Pinpoint
     #   @return [Types::TemplateConfiguration]
     #
     # @!attribute [rw] treatment_description
-    #   The custom description of a variation of the campaign that's used
-    #   for A/B testing.
+    #   The custom description of the default treatment for the campaign.
     #   @return [String]
     #
     # @!attribute [rw] treatment_name
-    #   The custom name of a variation of the campaign that's used for A/B
-    #   testing.
+    #   The custom name of the default treatment for the campaign, if the
+    #   campaign has multiple treatments. A *treatment* is a variation of a
+    #   campaign that's used for A/B testing.
     #   @return [String]
     #
     # @!attribute [rw] version
@@ -2626,6 +2718,7 @@ module Aws::Pinpoint
       :application_id,
       :arn,
       :creation_date,
+      :custom_delivery_configuration,
       :default_state,
       :description,
       :holdout_percent,
@@ -2665,10 +2758,10 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] message_type
-    #   The type of SMS message. Valid values are: TRANSACTIONAL, the
-    #   message is critical or time-sensitive, such as a one-time password
-    #   that supports a customer transaction; and, PROMOTIONAL, the message
-    #   isn't critical or time-sensitive, such as a marketing message.
+    #   The SMS message type. Valid values are TRANSACTIONAL (for messages
+    #   that are critical or time-sensitive, such as a one-time passwords)
+    #   and PROMOTIONAL (for messsages that aren't critical or
+    #   time-sensitive, such as marketing messages).
     #   @return [String]
     #
     # @!attribute [rw] sender_id
@@ -2689,9 +2782,12 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] campaign_status
     #   The current status of the campaign, or the current status of a
-    #   treatment that belongs to an A/B test campaign. If a campaign uses
-    #   A/B testing, the campaign has a status of COMPLETED only if all
-    #   campaign treatments have a status of COMPLETED.
+    #   treatment that belongs to an A/B test campaign.
+    #
+    #   If a campaign uses A/B testing, the campaign has a status of
+    #   COMPLETED only if all campaign treatments have a status of
+    #   COMPLETED. If you delete the segment that's associated with a
+    #   campaign, the campaign fails and has a status of DELETED.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/CampaignState AWS API Documentation
@@ -3137,6 +3233,10 @@ module Aws::Pinpoint
     #         write_campaign_request: { # required
     #           additional_treatments: [
     #             {
+    #               custom_delivery_configuration: {
+    #                 delivery_uri: "__string", # required
+    #                 endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #               },
     #               message_configuration: {
     #                 adm_message: {
     #                   action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
@@ -3180,6 +3280,9 @@ module Aws::Pinpoint
     #                   title: "__string",
     #                   url: "__string",
     #                 },
+    #                 custom_message: {
+    #                   data: "__string",
+    #                 },
     #                 default_message: {
     #                   action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #                   body: "__string",
@@ -3275,6 +3378,10 @@ module Aws::Pinpoint
     #               treatment_name: "__string",
     #             },
     #           ],
+    #           custom_delivery_configuration: {
+    #             delivery_uri: "__string", # required
+    #             endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #           },
     #           description: "__string",
     #           holdout_percent: 1,
     #           hook: {
@@ -3332,6 +3439,9 @@ module Aws::Pinpoint
     #               title: "__string",
     #               url: "__string",
     #             },
+    #             custom_message: {
+    #               data: "__string",
+    #             },
     #             default_message: {
     #               action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #               body: "__string",
@@ -3605,6 +3715,16 @@ module Aws::Pinpoint
     #         write_journey_request: { # required
     #           activities: {
     #             "__string" => {
+    #               custom: {
+    #                 delivery_uri: "__string",
+    #                 endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #                 message_config: {
+    #                   data: "__string",
+    #                 },
+    #                 next_activity: "__string",
+    #                 template_name: "__string",
+    #                 template_version: "__string",
+    #               },
     #               conditional_split: {
     #                 condition: {
     #                   conditions: [
@@ -3825,6 +3945,14 @@ module Aws::Pinpoint
     #                   wait_until: "__string",
     #                 },
     #               },
+    #               push: {
+    #                 message_config: {
+    #                   time_to_live: "__string",
+    #                 },
+    #                 next_activity: "__string",
+    #                 template_name: "__string",
+    #                 template_version: "__string",
+    #               },
     #               random_split: {
     #                 branches: [
     #                   {
@@ -3833,6 +3961,15 @@ module Aws::Pinpoint
     #                   },
     #                 ],
     #               },
+    #               sms: {
+    #                 message_config: {
+    #                   message_type: "TRANSACTIONAL", # accepts TRANSACTIONAL, PROMOTIONAL
+    #                   sender_id: "__string",
+    #                 },
+    #                 next_activity: "__string",
+    #                 template_name: "__string",
+    #                 template_version: "__string",
+    #               },
     #               wait: {
     #                 next_activity: "__string",
     #                 wait_time: {
@@ -4013,17 +4150,18 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] attributes
     #   A map of key-value pairs that defines 1-10 custom endpoint or user
-    #   attributes, depending on the value for the RecommenderUserIdType
-    #   property. Each of these attributes temporarily stores a recommended
-    #   item that's retrieved from the recommender model and sent to an AWS
-    #   Lambda function for additional processing. Each attribute can be
-    #   used as a message variable in a message template.
+    #   attributes, depending on the value for the
+    #   RecommendationProviderIdType property. Each of these attributes
+    #   temporarily stores a recommended item that's retrieved from the
+    #   recommender model and sent to an AWS Lambda function for additional
+    #   processing. Each attribute can be used as a message variable in a
+    #   message template.
     #
     #   In the map, the key is the name of a custom attribute and the value
     #   is a custom display name for that attribute. The display name
-    #   appears in the **Attribute finder** pane of the template editor on
-    #   the Amazon Pinpoint console. The following restrictions apply to
-    #   these names:
+    #   appears in the **Attribute finder** of the template editor on the
+    #   Amazon Pinpoint console. The following restrictions apply to these
+    #   names:
     #
     #   * An attribute name must start with a letter or number and it can
     #     contain up to 50 characters. The characters can be letters,
@@ -4035,13 +4173,14 @@ module Aws::Pinpoint
     #     numbers, spaces, underscores (\_), or hyphens (-).
     #
     #   This object is required if the configuration invokes an AWS Lambda
-    #   function (LambdaFunctionArn) to process recommendation data.
-    #   Otherwise, don't include this object in your request.
+    #   function (RecommendationTransformerUri) to process recommendation
+    #   data. Otherwise, don't include this object in your request.
     #   @return [Hash<String,String>]
     #
     # @!attribute [rw] description
     #   A custom description of the configuration for the recommender model.
-    #   The description can contain up to 128 characters.
+    #   The description can contain up to 128 characters. The characters can
+    #   be letters, numbers, spaces, or the following symbols: \_ ; () , ‐.
     #   @return [String]
     #
     # @!attribute [rw] name
@@ -4066,7 +4205,7 @@ module Aws::Pinpoint
     #     particular user and endpoint in Amazon Pinpoint. The data is
     #     correlated based on user IDs in Amazon Pinpoint. If you specify
     #     this value, an endpoint definition in Amazon Pinpoint has to
-    #     specify a both a user ID (UserId) and an endpoint ID. Otherwise,
+    #     specify both a user ID (UserId) and an endpoint ID. Otherwise,
     #     messages won’t be sent to the user's endpoint.
     #   @return [String]
     #
@@ -4090,15 +4229,15 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] recommendations_display_name
     #   A custom display name for the standard endpoint or user attribute
-    #   (RecommendationItems) that temporarily stores a recommended item for
+    #   (RecommendationItems) that temporarily stores recommended items for
     #   each endpoint or user, depending on the value for the
-    #   RecommenderUserIdType property. This value is required if the
+    #   RecommendationProviderIdType property. This value is required if the
     #   configuration doesn't invoke an AWS Lambda function
-    #   (LambdaFunctionArn) to perform additional processing of
+    #   (RecommendationTransformerUri) to perform additional processing of
     #   recommendation data.
     #
-    #   This name appears in the **Attribute finder** pane of the template
-    #   editor on the Amazon Pinpoint console. The name can contain up to 25
+    #   This name appears in the **Attribute finder** of the template editor
+    #   on the Amazon Pinpoint console. The name can contain up to 25
     #   characters. The characters can be letters, numbers, spaces,
     #   underscores (\_), or hyphens (-). These restrictions don't apply to
     #   attribute values.
@@ -4107,14 +4246,14 @@ module Aws::Pinpoint
     # @!attribute [rw] recommendations_per_message
     #   The number of recommended items to retrieve from the model for each
     #   endpoint or user, depending on the value for the
-    #   RecommenderUserIdType property. This number determines how many
-    #   recommended attributes are available for use as message variables in
-    #   message templates. The minimum value is 1. The maximum value is 5.
-    #   The default value is 5.
+    #   RecommendationProviderIdType property. This number determines how
+    #   many recommended items are available for use in message variables.
+    #   The minimum value is 1. The maximum value is 5. The default value is
+    #   5.
     #
     #   To use multiple recommended items and custom attributes with message
     #   variables, you have to use an AWS Lambda function
-    #   (LambdaFunctionArn) to perform additional processing of
+    #   (RecommendationTransformerUri) to perform additional processing of
     #   recommendation data.
     #   @return [Integer]
     #
@@ -4478,6 +4617,125 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
+    # Specifies the delivery configuration settings for sending a campaign
+    # or campaign treatment through a custom channel. This object is
+    # required if you use the CampaignCustomMessage object to define the
+    # message to send for the campaign or campaign treatment.
+    #
+    # @note When making an API call, you may pass CustomDeliveryConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         delivery_uri: "__string", # required
+    #         endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #       }
+    #
+    # @!attribute [rw] delivery_uri
+    #   The destination to send the campaign or treatment to. This value can
+    #   be one of the following:
+    #
+    #   * The name or Amazon Resource Name (ARN) of an AWS Lambda function
+    #     to invoke to handle delivery of the campaign or treatment.
+    #
+    #   * The URL for a web application or service that supports HTTPS and
+    #     can receive the message. The URL has to be a full URL, including
+    #     the HTTPS protocol.
+    #   @return [String]
+    #
+    # @!attribute [rw] endpoint_types
+    #   The types of endpoints to send the campaign or treatment to. Each
+    #   valid value maps to a type of channel that you can associate with an
+    #   endpoint by using the ChannelType property of an endpoint.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/CustomDeliveryConfiguration AWS API Documentation
+    #
+    class CustomDeliveryConfiguration < Struct.new(
+      :delivery_uri,
+      :endpoint_types)
+      include Aws::Structure
+    end
+
+    # The settings for a custom message activity. This type of activity
+    # calls an AWS Lambda function or web hook that sends messages to
+    # participants.
+    #
+    # @note When making an API call, you may pass CustomMessageActivity
+    #   data as a hash:
+    #
+    #       {
+    #         delivery_uri: "__string",
+    #         endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         message_config: {
+    #           data: "__string",
+    #         },
+    #         next_activity: "__string",
+    #         template_name: "__string",
+    #         template_version: "__string",
+    #       }
+    #
+    # @!attribute [rw] delivery_uri
+    #   The destination to send the custom message to. This value can be one
+    #   of the following:
+    #
+    #   * The name or Amazon Resource Name (ARN) of an AWS Lambda function
+    #     to invoke to handle delivery of the custom message.
+    #
+    #   * The URL for a web application or service that supports HTTPS and
+    #     can receive the message. The URL has to be a full URL, including
+    #     the HTTPS protocol.
+    #   @return [String]
+    #
+    # @!attribute [rw] endpoint_types
+    #   The types of endpoints to send the custom message to. Each valid
+    #   value maps to a type of channel that you can associate with an
+    #   endpoint by using the ChannelType property of an endpoint.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] message_config
+    #   Specifies the message data included in a custom channel message
+    #   that's sent to participants in a journey.
+    #   @return [Types::JourneyCustomMessage]
+    #
+    # @!attribute [rw] next_activity
+    #   The unique identifier for the next activity to perform, after Amazon
+    #   Pinpoint calls the AWS Lambda function or web hook.
+    #   @return [String]
+    #
+    # @!attribute [rw] template_name
+    #   The name of the custom message template to use for the message. If
+    #   specified, this value must match the name of an existing message
+    #   template.
+    #   @return [String]
+    #
+    # @!attribute [rw] template_version
+    #   The unique identifier for the version of the message template to use
+    #   for the message. If specified, this value must match the identifier
+    #   for an existing template version. To retrieve a list of versions and
+    #   version identifiers for a template, use the <link
+    #   linkend="templates-template-name-template-type-versions" />
+    #
+    #   Template Versions</link> resource.
+    #
+    #   If you don't specify a value for this property, Amazon Pinpoint
+    #   uses the *active version* of the template. The *active version* is
+    #   typically the version of a template that's been most recently
+    #   reviewed and approved for use, depending on your workflow. It isn't
+    #   necessarily the latest version of a template.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/CustomMessageActivity AWS API Documentation
+    #
+    class CustomMessageActivity < Struct.new(
+      :delivery_uri,
+      :endpoint_types,
+      :message_config,
+      :next_activity,
+      :template_name,
+      :template_version)
+      include Aws::Structure
+    end
+
     # Specifies the default message for all channels.
     #
     # @note When making an API call, you may pass DefaultMessage
@@ -5587,9 +5845,12 @@ module Aws::Pinpoint
     #       }
     #
     # @!attribute [rw] configuration_set
-    #   The configuration set that you want to apply to email that you send
-    #   through the channel by using the [Amazon Pinpoint Email
-    #   API](emailAPIreference.html).
+    #   The [Amazon SES configuration set][1] that you want to apply to
+    #   messages that you send through the channel.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/ses/latest/APIReference/API_ConfigurationSet.html
     #   @return [String]
     #
     # @!attribute [rw] enabled
@@ -5633,9 +5894,12 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] configuration_set
-    #   The configuration set that's applied to email that's sent through
-    #   the channel by using the [Amazon Pinpoint Email
-    #   API](emailAPIreference.html).
+    #   The [Amazon SES configuration set][1] that's applied to messages
+    #   that are sent through the channel.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/ses/latest/APIReference/API_ConfigurationSet.html
     #   @return [String]
     #
     # @!attribute [rw] creation_date
@@ -5648,7 +5912,7 @@ module Aws::Pinpoint
     #   @return [Boolean]
     #
     # @!attribute [rw] from_address
-    #   The verified email address that you send email from when you send
+    #   The verified email address that email is sent from when you send
     #   email through the channel.
     #   @return [String]
     #
@@ -5664,7 +5928,7 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] identity
     #   The Amazon Resource Name (ARN) of the identity, verified with Amazon
-    #   Simple Email Service (Amazon SES), that you use when you send email
+    #   Simple Email Service (Amazon SES), that's used when you send email
     #   through the channel.
     #   @return [String]
     #
@@ -5682,7 +5946,7 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] messages_per_second
-    #   The maximum number of emails that you can send through the channel
+    #   The maximum number of emails that can be sent through the channel
     #   each second.
     #   @return [Integer]
     #
@@ -5817,7 +6081,8 @@ module Aws::Pinpoint
     #       }
     #
     # @!attribute [rw] message_config
-    #   The "From" address to use for the message.
+    #   Specifies the sender address for an email message that's sent to
+    #   participants in the journey.
     #   @return [Types::JourneyEmailMessage]
     #
     # @!attribute [rw] next_activity
@@ -5826,7 +6091,9 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] template_name
-    #   The name of the email template to use for the message.
+    #   The name of the email message template to use for the message. If
+    #   specified, this value must match the name of an existing message
+    #   template.
     #   @return [String]
     #
     # @!attribute [rw] template_version
@@ -6034,7 +6301,7 @@ module Aws::Pinpoint
     #         attributes: {
     #           "__string" => ["__string"],
     #         },
-    #         channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #         demographic: {
     #           app_version: "__string",
     #           locale: "__string",
@@ -6151,7 +6418,7 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] user
-    #   One or more custom user attributes that describe the user who's
+    #   One or more custom attributes that describe the user who's
     #   associated with the endpoint.
     #   @return [Types::EndpointUser]
     #
@@ -6186,7 +6453,7 @@ module Aws::Pinpoint
     #             attributes: {
     #               "__string" => ["__string"],
     #             },
-    #             channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #             channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #             demographic: {
     #               app_version: "__string",
     #               locale: "__string",
@@ -6455,7 +6722,7 @@ module Aws::Pinpoint
     #         attributes: {
     #           "__string" => ["__string"],
     #         },
-    #         channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #         demographic: {
     #           app_version: "__string",
     #           locale: "__string",
@@ -6566,7 +6833,7 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] user
-    #   One or more custom user attributes that describe the user who's
+    #   One or more custom attributes that describe the user who's
     #   associated with the endpoint.
     #   @return [Types::EndpointUser]
     #
@@ -7102,7 +7369,7 @@ module Aws::Pinpoint
     #           attributes: {
     #             "__string" => ["__string"],
     #           },
-    #           channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #           channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #           demographic: {
     #             app_version: "__string",
     #             locale: "__string",
@@ -7190,7 +7457,7 @@ module Aws::Pinpoint
     #               attributes: {
     #                 "__string" => ["__string"],
     #               },
-    #               channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #               channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #               demographic: {
     #                 app_version: "__string",
     #                 locale: "__string",
@@ -9806,6 +10073,28 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
+    # Specifies the message content for a custom channel message that's
+    # sent to participants in a journey.
+    #
+    # @note When making an API call, you may pass JourneyCustomMessage
+    #   data as a hash:
+    #
+    #       {
+    #         data: "__string",
+    #       }
+    #
+    # @!attribute [rw] data
+    #   The message content that's passed to an AWS Lambda function or to a
+    #   web hook.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/JourneyCustomMessage AWS API Documentation
+    #
+    class JourneyCustomMessage < Struct.new(
+      :data)
+      include Aws::Structure
+    end
+
     # Provides the results of a query that retrieved the data for a standard
     # engagement metric that applies to a journey, and provides information
     # about that query.
@@ -9835,7 +10124,7 @@ module Aws::Pinpoint
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html
+    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html
     #   @return [String]
     #
     # @!attribute [rw] kpi_result
@@ -9951,7 +10240,7 @@ module Aws::Pinpoint
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html
+    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html
     #   @return [Hash<String,String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/JourneyExecutionActivityMetricsResponse AWS API Documentation
@@ -9991,7 +10280,7 @@ module Aws::Pinpoint
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html
+    #   [1]: https://docs.aws.amazon.com/pinpoint/latest/developerguide/analytics-standard-metrics.html
     #   @return [Hash<String,String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/JourneyExecutionMetricsResponse AWS API Documentation
@@ -10041,6 +10330,35 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
+    # Specifies the message configuration for a push notification that's
+    # sent to participants in a journey.
+    #
+    # @note When making an API call, you may pass JourneyPushMessage
+    #   data as a hash:
+    #
+    #       {
+    #         time_to_live: "__string",
+    #       }
+    #
+    # @!attribute [rw] time_to_live
+    #   The number of seconds that the push notification service should keep
+    #   the message, if the service is unable to deliver the notification
+    #   the first time. This value is converted to an expiration value when
+    #   it's sent to a push-notification service. If this value is 0, the
+    #   service treats the notification as if it expires immediately and the
+    #   service doesn't store or try to deliver the notification again.
+    #
+    #   This value doesn't apply to messages that are sent through the
+    #   Amazon Device Messaging (ADM) service.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/JourneyPushMessage AWS API Documentation
+    #
+    class JourneyPushMessage < Struct.new(
+      :time_to_live)
+      include Aws::Structure
+    end
+
     # Provides information about the status, configuration, and other
     # settings for a journey.
     #
@@ -10176,6 +10494,43 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
+    # Specifies the sender ID and message type for an SMS message that's
+    # sent to participants in a journey.
+    #
+    # @note When making an API call, you may pass JourneySMSMessage
+    #   data as a hash:
+    #
+    #       {
+    #         message_type: "TRANSACTIONAL", # accepts TRANSACTIONAL, PROMOTIONAL
+    #         sender_id: "__string",
+    #       }
+    #
+    # @!attribute [rw] message_type
+    #   The SMS message type. Valid values are TRANSACTIONAL (for messages
+    #   that are critical or time-sensitive, such as a one-time passwords)
+    #   and PROMOTIONAL (for messsages that aren't critical or
+    #   time-sensitive, such as marketing messages).
+    #   @return [String]
+    #
+    # @!attribute [rw] sender_id
+    #   The sender ID to display as the sender of the message on a
+    #   recipient's device. Support for sender IDs varies by country or
+    #   region. For more information, see [Supported Countries and
+    #   Regions][1] in the Amazon Pinpoint User Guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com.amazon.com/pinpoint/latest/userguide/channels-sms-countries.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/JourneySMSMessage AWS API Documentation
+    #
+    class JourneySMSMessage < Struct.new(
+      :message_type,
+      :sender_id)
+      include Aws::Structure
+    end
+
     # Specifies the schedule settings for a journey.
     #
     # @note When making an API call, you may pass JourneySchedule
@@ -10635,6 +10990,9 @@ module Aws::Pinpoint
     #           title: "__string",
     #           url: "__string",
     #         },
+    #         custom_message: {
+    #           data: "__string",
+    #         },
     #         default_message: {
     #           action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #           body: "__string",
@@ -10678,38 +11036,50 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] adm_message
     #   The message that the campaign sends through the ADM (Amazon Device
-    #   Messaging) channel. This message overrides the default message.
+    #   Messaging) channel. If specified, this message overrides the default
+    #   message.
     #   @return [Types::Message]
     #
     # @!attribute [rw] apns_message
     #   The message that the campaign sends through the APNs (Apple Push
-    #   Notification service) channel. This message overrides the default
-    #   message.
+    #   Notification service) channel. If specified, this message overrides
+    #   the default message.
     #   @return [Types::Message]
     #
     # @!attribute [rw] baidu_message
     #   The message that the campaign sends through the Baidu (Baidu Cloud
-    #   Push) channel. This message overrides the default message.
+    #   Push) channel. If specified, this message overrides the default
+    #   message.
     #   @return [Types::Message]
     #
+    # @!attribute [rw] custom_message
+    #   The message that the campaign sends through a custom channel, as
+    #   specified by the delivery configuration
+    #   (CustomDeliveryConfiguration) settings for the campaign. If
+    #   specified, this message overrides the default message.
+    #   @return [Types::CampaignCustomMessage]
+    #
     # @!attribute [rw] default_message
     #   The default message that the campaign sends through all the channels
     #   that are configured for the campaign.
     #   @return [Types::Message]
     #
     # @!attribute [rw] email_message
-    #   The message that the campaign sends through the email channel.
+    #   The message that the campaign sends through the email channel. If
+    #   specified, this message overrides the default message.
     #   @return [Types::CampaignEmailMessage]
     #
     # @!attribute [rw] gcm_message
     #   The message that the campaign sends through the GCM channel, which
     #   enables Amazon Pinpoint to send push notifications through the
     #   Firebase Cloud Messaging (FCM), formerly Google Cloud Messaging
-    #   (GCM), service. This message overrides the default message.
+    #   (GCM), service. If specified, this message overrides the default
+    #   message.
     #   @return [Types::Message]
     #
     # @!attribute [rw] sms_message
-    #   The message that the campaign sends through the SMS channel.
+    #   The message that the campaign sends through the SMS channel. If
+    #   specified, this message overrides the default message.
     #   @return [Types::CampaignSmsMessage]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/MessageConfiguration AWS API Documentation
@@ -10718,6 +11088,7 @@ module Aws::Pinpoint
       :adm_message,
       :apns_message,
       :baidu_message,
+      :custom_message,
       :default_message,
       :email_message,
       :gcm_message,
@@ -10734,7 +11105,7 @@ module Aws::Pinpoint
     #         addresses: {
     #           "__string" => {
     #             body_override: "__string",
-    #             channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #             channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #             context: {
     #               "__string" => "__string",
     #             },
@@ -11583,7 +11954,7 @@ module Aws::Pinpoint
     #         attributes: {
     #           "__string" => ["__string"],
     #         },
-    #         channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #         demographic: {
     #           app_version: "__string",
     #           locale: "__string",
@@ -11700,6 +12071,63 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
+    # Specifies the settings for a push notification activity in a journey.
+    # This type of activity sends a push notification to participants.
+    #
+    # @note When making an API call, you may pass PushMessageActivity
+    #   data as a hash:
+    #
+    #       {
+    #         message_config: {
+    #           time_to_live: "__string",
+    #         },
+    #         next_activity: "__string",
+    #         template_name: "__string",
+    #         template_version: "__string",
+    #       }
+    #
+    # @!attribute [rw] message_config
+    #   Specifies the time to live (TTL) value for push notifications that
+    #   are sent to participants in a journey.
+    #   @return [Types::JourneyPushMessage]
+    #
+    # @!attribute [rw] next_activity
+    #   The unique identifier for the next activity to perform, after the
+    #   message is sent.
+    #   @return [String]
+    #
+    # @!attribute [rw] template_name
+    #   The name of the push notification template to use for the message.
+    #   If specified, this value must match the name of an existing message
+    #   template.
+    #   @return [String]
+    #
+    # @!attribute [rw] template_version
+    #   The unique identifier for the version of the push notification
+    #   template to use for the message. If specified, this value must match
+    #   the identifier for an existing template version. To retrieve a list
+    #   of versions and version identifiers for a template, use the <link
+    #   linkend="templates-template-name-template-type-versions" />
+    #
+    #   Template Versions</link> resource.
+    #
+    #   If you don't specify a value for this property, Amazon Pinpoint
+    #   uses the *active version* of the template. The *active version* is
+    #   typically the version of a template that's been most recently
+    #   reviewed and approved for use, depending on your workflow. It isn't
+    #   necessarily the latest version of a template.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/PushMessageActivity AWS API Documentation
+    #
+    class PushMessageActivity < Struct.new(
+      :message_config,
+      :next_activity,
+      :template_name,
+      :template_version)
+      include Aws::Structure
+    end
+
     # Specifies the content and settings for a message template that can be
     # used in messages that are sent through a push notification channel.
     #
@@ -12000,7 +12428,7 @@ module Aws::Pinpoint
     #                 attributes: {
     #                   "__string" => ["__string"],
     #                 },
-    #                 channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #                 channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #                 demographic: {
     #                   app_version: "__string",
     #                   locale: "__string",
@@ -12243,15 +12671,15 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] attributes
     #   A map that defines 1-10 custom endpoint or user attributes,
-    #   depending on the value for the RecommenderUserIdType property. Each
-    #   of these attributes temporarily stores a recommended item that's
-    #   retrieved from the recommender model and sent to an AWS Lambda
-    #   function for additional processing. Each attribute can be used as a
-    #   message variable in a message template.
+    #   depending on the value for the RecommendationProviderIdType
+    #   property. Each of these attributes temporarily stores a recommended
+    #   item that's retrieved from the recommender model and sent to an AWS
+    #   Lambda function for additional processing. Each attribute can be
+    #   used as a message variable in a message template.
     #
     #   This value is null if the configuration doesn't invoke an AWS
-    #   Lambda function (LambdaFunctionArn) to perform additional processing
-    #   of recommendation data.
+    #   Lambda function (RecommendationTransformerUri) to perform additional
+    #   processing of recommendation data.
     #   @return [Hash<String,String>]
     #
     # @!attribute [rw] creation_date
@@ -12316,22 +12744,22 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] recommendations_display_name
     #   The custom display name for the standard endpoint or user attribute
-    #   (RecommendationItems) that temporarily stores a recommended item for
+    #   (RecommendationItems) that temporarily stores recommended items for
     #   each endpoint or user, depending on the value for the
-    #   RecommenderUserIdType property. This name appears in the **Attribute
-    #   finder** pane of the template editor on the Amazon Pinpoint console.
+    #   RecommendationProviderIdType property. This name appears in the
+    #   **Attribute finder** of the template editor on the Amazon Pinpoint
+    #   console.
     #
     #   This value is null if the configuration doesn't invoke an AWS
-    #   Lambda function (LambdaFunctionArn) to perform additional processing
-    #   of recommendation data.
+    #   Lambda function (RecommendationTransformerUri) to perform additional
+    #   processing of recommendation data.
     #   @return [String]
     #
     # @!attribute [rw] recommendations_per_message
     #   The number of recommended items that are retrieved from the model
     #   for each endpoint or user, depending on the value for the
-    #   RecommenderUserIdType property. This number determines how many
-    #   recommended attributes are available for use as message variables in
-    #   message templates.
+    #   RecommendationProviderIdType property. This number determines how
+    #   many recommended items are available for use in message variables.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/RecommenderConfigurationResponse AWS API Documentation
@@ -12605,10 +13033,10 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] message_type
-    #   The SMS message type. Valid values are: TRANSACTIONAL, the message
-    #   is critical or time-sensitive, such as a one-time password that
-    #   supports a customer transaction; and, PROMOTIONAL, the message is
-    #   not critical or time-sensitive, such as a marketing message.
+    #   The SMS message type. Valid values are TRANSACTIONAL (for messages
+    #   that are critical or time-sensitive, such as a one-time passwords)
+    #   and PROMOTIONAL (for messsages that aren't critical or
+    #   time-sensitive, such as marketing messages).
     #   @return [String]
     #
     # @!attribute [rw] origination_number
@@ -12643,6 +13071,64 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
+    # Specifies the settings for an SMS activity in a journey. This type of
+    # activity sends a text message to participants.
+    #
+    # @note When making an API call, you may pass SMSMessageActivity
+    #   data as a hash:
+    #
+    #       {
+    #         message_config: {
+    #           message_type: "TRANSACTIONAL", # accepts TRANSACTIONAL, PROMOTIONAL
+    #           sender_id: "__string",
+    #         },
+    #         next_activity: "__string",
+    #         template_name: "__string",
+    #         template_version: "__string",
+    #       }
+    #
+    # @!attribute [rw] message_config
+    #   Specifies the sender ID and message type for an SMS message that's
+    #   sent to participants in a journey.
+    #   @return [Types::JourneySMSMessage]
+    #
+    # @!attribute [rw] next_activity
+    #   The unique identifier for the next activity to perform, after the
+    #   message is sent.
+    #   @return [String]
+    #
+    # @!attribute [rw] template_name
+    #   The name of the SMS message template to use for the message. If
+    #   specified, this value must match the name of an existing message
+    #   template.
+    #   @return [String]
+    #
+    # @!attribute [rw] template_version
+    #   The unique identifier for the version of the SMS template to use for
+    #   the message. If specified, this value must match the identifier for
+    #   an existing template version. To retrieve a list of versions and
+    #   version identifiers for a template, use the <link
+    #   linkend="templates-template-name-template-type-versions" />
+    #
+    #   Template Versions</link> resource.
+    #
+    #   If you don't specify a value for this property, Amazon Pinpoint
+    #   uses the *active version* of the template. The *active version* is
+    #   typically the version of a template that's been most recently
+    #   reviewed and approved for use, depending on your workflow. It isn't
+    #   necessarily the latest version of a template.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/SMSMessageActivity AWS API Documentation
+    #
+    class SMSMessageActivity < Struct.new(
+      :message_config,
+      :next_activity,
+      :template_name,
+      :template_version)
+      include Aws::Structure
+    end
+
     # Specifies the content and settings for a message template that can be
     # used in text messages that are sent through the SMS channel.
     #
@@ -13578,7 +14064,7 @@ module Aws::Pinpoint
     #           addresses: {
     #             "__string" => {
     #               body_override: "__string",
-    #               channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #               channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #               context: {
     #                 "__string" => "__string",
     #               },
@@ -14979,9 +15465,16 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
-    # Specifies the settings for a campaign treatment. A treatment is a
+    # Specifies the settings for a campaign treatment. A *treatment* is a
     # variation of a campaign that's used for A/B testing of a campaign.
     #
+    # @!attribute [rw] custom_delivery_configuration
+    #   The delivery configuration settings for sending the treatment
+    #   through a custom channel. This object is required if the
+    #   MessageConfiguration object for the treatment specifies a
+    #   CustomMessage object.
+    #   @return [Types::CustomDeliveryConfiguration]
+    #
     # @!attribute [rw] id
     #   The unique identifier for the treatment.
     #   @return [String]
@@ -15012,13 +15505,13 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] treatment_name
-    #   The custom name of the treatment. A treatment is a variation of a
-    #   campaign that's used for A/B testing of a campaign.
+    #   The custom name of the treatment.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/TreatmentResource AWS API Documentation
     #
     class TreatmentResource < Struct.new(
+      :custom_delivery_configuration,
       :id,
       :message_configuration,
       :schedule,
@@ -15400,6 +15893,10 @@ module Aws::Pinpoint
     #         write_campaign_request: { # required
     #           additional_treatments: [
     #             {
+    #               custom_delivery_configuration: {
+    #                 delivery_uri: "__string", # required
+    #                 endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #               },
     #               message_configuration: {
     #                 adm_message: {
     #                   action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
@@ -15443,6 +15940,9 @@ module Aws::Pinpoint
     #                   title: "__string",
     #                   url: "__string",
     #                 },
+    #                 custom_message: {
+    #                   data: "__string",
+    #                 },
     #                 default_message: {
     #                   action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #                   body: "__string",
@@ -15538,6 +16038,10 @@ module Aws::Pinpoint
     #               treatment_name: "__string",
     #             },
     #           ],
+    #           custom_delivery_configuration: {
+    #             delivery_uri: "__string", # required
+    #             endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #           },
     #           description: "__string",
     #           holdout_percent: 1,
     #           hook: {
@@ -15595,6 +16099,9 @@ module Aws::Pinpoint
     #               title: "__string",
     #               url: "__string",
     #             },
+    #             custom_message: {
+    #               data: "__string",
+    #             },
     #             default_message: {
     #               action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #               body: "__string",
@@ -15835,7 +16342,7 @@ module Aws::Pinpoint
     #           attributes: {
     #             "__string" => ["__string"],
     #           },
-    #           channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #           channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #           demographic: {
     #             app_version: "__string",
     #             locale: "__string",
@@ -15912,7 +16419,7 @@ module Aws::Pinpoint
     #               attributes: {
     #                 "__string" => ["__string"],
     #               },
-    #               channel_type: "GCM", # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #               channel_type: "PUSH", # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #               demographic: {
     #                 app_version: "__string",
     #                 locale: "__string",
@@ -16029,6 +16536,16 @@ module Aws::Pinpoint
     #         write_journey_request: { # required
     #           activities: {
     #             "__string" => {
+    #               custom: {
+    #                 delivery_uri: "__string",
+    #                 endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #                 message_config: {
+    #                   data: "__string",
+    #                 },
+    #                 next_activity: "__string",
+    #                 template_name: "__string",
+    #                 template_version: "__string",
+    #               },
     #               conditional_split: {
     #                 condition: {
     #                   conditions: [
@@ -16249,6 +16766,14 @@ module Aws::Pinpoint
     #                   wait_until: "__string",
     #                 },
     #               },
+    #               push: {
+    #                 message_config: {
+    #                   time_to_live: "__string",
+    #                 },
+    #                 next_activity: "__string",
+    #                 template_name: "__string",
+    #                 template_version: "__string",
+    #               },
     #               random_split: {
     #                 branches: [
     #                   {
@@ -16257,6 +16782,15 @@ module Aws::Pinpoint
     #                   },
     #                 ],
     #               },
+    #               sms: {
+    #                 message_config: {
+    #                   message_type: "TRANSACTIONAL", # accepts TRANSACTIONAL, PROMOTIONAL
+    #                   sender_id: "__string",
+    #                 },
+    #                 next_activity: "__string",
+    #                 template_name: "__string",
+    #                 template_version: "__string",
+    #               },
     #               wait: {
     #                 next_activity: "__string",
     #                 wait_time: {
@@ -16493,17 +17027,18 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] attributes
     #   A map of key-value pairs that defines 1-10 custom endpoint or user
-    #   attributes, depending on the value for the RecommenderUserIdType
-    #   property. Each of these attributes temporarily stores a recommended
-    #   item that's retrieved from the recommender model and sent to an AWS
-    #   Lambda function for additional processing. Each attribute can be
-    #   used as a message variable in a message template.
+    #   attributes, depending on the value for the
+    #   RecommendationProviderIdType property. Each of these attributes
+    #   temporarily stores a recommended item that's retrieved from the
+    #   recommender model and sent to an AWS Lambda function for additional
+    #   processing. Each attribute can be used as a message variable in a
+    #   message template.
     #
     #   In the map, the key is the name of a custom attribute and the value
     #   is a custom display name for that attribute. The display name
-    #   appears in the **Attribute finder** pane of the template editor on
-    #   the Amazon Pinpoint console. The following restrictions apply to
-    #   these names:
+    #   appears in the **Attribute finder** of the template editor on the
+    #   Amazon Pinpoint console. The following restrictions apply to these
+    #   names:
     #
     #   * An attribute name must start with a letter or number and it can
     #     contain up to 50 characters. The characters can be letters,
@@ -16515,13 +17050,14 @@ module Aws::Pinpoint
     #     numbers, spaces, underscores (\_), or hyphens (-).
     #
     #   This object is required if the configuration invokes an AWS Lambda
-    #   function (LambdaFunctionArn) to process recommendation data.
-    #   Otherwise, don't include this object in your request.
+    #   function (RecommendationTransformerUri) to process recommendation
+    #   data. Otherwise, don't include this object in your request.
     #   @return [Hash<String,String>]
     #
     # @!attribute [rw] description
     #   A custom description of the configuration for the recommender model.
-    #   The description can contain up to 128 characters.
+    #   The description can contain up to 128 characters. The characters can
+    #   be letters, numbers, spaces, or the following symbols: \_ ; () , ‐.
     #   @return [String]
     #
     # @!attribute [rw] name
@@ -16546,7 +17082,7 @@ module Aws::Pinpoint
     #     particular user and endpoint in Amazon Pinpoint. The data is
     #     correlated based on user IDs in Amazon Pinpoint. If you specify
     #     this value, an endpoint definition in Amazon Pinpoint has to
-    #     specify a both a user ID (UserId) and an endpoint ID. Otherwise,
+    #     specify both a user ID (UserId) and an endpoint ID. Otherwise,
     #     messages won’t be sent to the user's endpoint.
     #   @return [String]
     #
@@ -16570,15 +17106,15 @@ module Aws::Pinpoint
     #
     # @!attribute [rw] recommendations_display_name
     #   A custom display name for the standard endpoint or user attribute
-    #   (RecommendationItems) that temporarily stores a recommended item for
+    #   (RecommendationItems) that temporarily stores recommended items for
     #   each endpoint or user, depending on the value for the
-    #   RecommenderUserIdType property. This value is required if the
+    #   RecommendationProviderIdType property. This value is required if the
     #   configuration doesn't invoke an AWS Lambda function
-    #   (LambdaFunctionArn) to perform additional processing of
+    #   (RecommendationTransformerUri) to perform additional processing of
     #   recommendation data.
     #
-    #   This name appears in the **Attribute finder** pane of the template
-    #   editor on the Amazon Pinpoint console. The name can contain up to 25
+    #   This name appears in the **Attribute finder** of the template editor
+    #   on the Amazon Pinpoint console. The name can contain up to 25
     #   characters. The characters can be letters, numbers, spaces,
     #   underscores (\_), or hyphens (-). These restrictions don't apply to
     #   attribute values.
@@ -16587,14 +17123,14 @@ module Aws::Pinpoint
     # @!attribute [rw] recommendations_per_message
     #   The number of recommended items to retrieve from the model for each
     #   endpoint or user, depending on the value for the
-    #   RecommenderUserIdType property. This number determines how many
-    #   recommended attributes are available for use as message variables in
-    #   message templates. The minimum value is 1. The maximum value is 5.
-    #   The default value is 5.
+    #   RecommendationProviderIdType property. This number determines how
+    #   many recommended items are available for use in message variables.
+    #   The minimum value is 1. The maximum value is 5. The default value is
+    #   5.
     #
     #   To use multiple recommended items and custom attributes with message
     #   variables, you have to use an AWS Lambda function
-    #   (LambdaFunctionArn) to perform additional processing of
+    #   (RecommendationTransformerUri) to perform additional processing of
     #   recommendation data.
     #   @return [Integer]
     #
@@ -17490,13 +18026,15 @@ module Aws::Pinpoint
     #       }
     #
     # @!attribute [rw] campaign_hook
-    #   The settings for the AWS Lambda function to use by default as a code
-    #   hook for campaigns in the application. To override these settings
-    #   for a specific campaign, use the <link
+    #   The settings for the AWS Lambda function to invoke by default as a
+    #   code hook for campaigns in the application. You can use this hook to
+    #   customize segments that are used by campaigns in the application.
+    #
+    #   To override these settings and define custom settings for a specific
+    #   campaign, use the CampaignHook object of the <link
     #   linkend="apps-application-id-campaigns-campaign-id" />
     #
-    #   Campaign</link> resource to define custom Lambda function settings
-    #   for the campaign.
+    #   Campaign</link> resource.
     #   @return [Types::CampaignHook]
     #
     # @!attribute [rw] cloud_watch_metrics_enabled
@@ -17505,11 +18043,15 @@ module Aws::Pinpoint
     #   @return [Boolean]
     #
     # @!attribute [rw] limits
-    #   The default sending limits for campaigns in the application. To
-    #   override these limits for a specific campaign, use the <link
+    #   The default sending limits for campaigns and journeys in the
+    #   application. To override these limits and define custom limits for a
+    #   specific campaign or journey, use the <link
     #   linkend="apps-application-id-campaigns-campaign-id" />
     #
-    #   Campaign</link> resource to define custom limits for the campaign.
+    #   Campaign</link> resource or the <link
+    #   linkend="apps-application-id-journeys-journey-id" />
+    #
+    #   Journey</link> resource, respectively.
     #   @return [Types::CampaignLimits]
     #
     # @!attribute [rw] quiet_time
@@ -17563,6 +18105,10 @@ module Aws::Pinpoint
     #       {
     #         additional_treatments: [
     #           {
+    #             custom_delivery_configuration: {
+    #               delivery_uri: "__string", # required
+    #               endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #             },
     #             message_configuration: {
     #               adm_message: {
     #                 action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
@@ -17606,6 +18152,9 @@ module Aws::Pinpoint
     #                 title: "__string",
     #                 url: "__string",
     #               },
+    #               custom_message: {
+    #                 data: "__string",
+    #               },
     #               default_message: {
     #                 action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #                 body: "__string",
@@ -17701,6 +18250,10 @@ module Aws::Pinpoint
     #             treatment_name: "__string",
     #           },
     #         ],
+    #         custom_delivery_configuration: {
+    #           delivery_uri: "__string", # required
+    #           endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         },
     #         description: "__string",
     #         holdout_percent: 1,
     #         hook: {
@@ -17758,6 +18311,9 @@ module Aws::Pinpoint
     #             title: "__string",
     #             url: "__string",
     #           },
+    #           custom_message: {
+    #             data: "__string",
+    #           },
     #           default_message: {
     #             action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #             body: "__string",
@@ -17863,6 +18419,13 @@ module Aws::Pinpoint
     #   campaign, in addition to the default treatment for the campaign.
     #   @return [Array<Types::WriteTreatmentResource>]
     #
+    # @!attribute [rw] custom_delivery_configuration
+    #   The delivery configuration settings for sending the campaign through
+    #   a custom channel. This object is required if the
+    #   MessageConfiguration object for the campaign specifies a
+    #   CustomMessage object.
+    #   @return [Types::CustomDeliveryConfiguration]
+    #
     # @!attribute [rw] description
     #   A custom description of the campaign.
     #   @return [String]
@@ -17873,13 +18436,14 @@ module Aws::Pinpoint
     #   @return [Integer]
     #
     # @!attribute [rw] hook
-    #   The settings for the AWS Lambda function to use as a code hook for
-    #   the campaign.
+    #   The settings for the AWS Lambda function to invoke as a code hook
+    #   for the campaign. You can use this hook to customize the segment
+    #   that's used by the campaign.
     #   @return [Types::CampaignHook]
     #
     # @!attribute [rw] is_paused
     #   Specifies whether to pause the campaign. A paused campaign doesn't
-    #   run unless you resume it by setting this value to false.
+    #   run unless you resume it by changing this value to false.
     #   @return [Boolean]
     #
     # @!attribute [rw] limits
@@ -17918,19 +18482,20 @@ module Aws::Pinpoint
     #   @return [Types::TemplateConfiguration]
     #
     # @!attribute [rw] treatment_description
-    #   A custom description of a variation of the campaign to use for A/B
-    #   testing.
+    #   A custom description of the default treatment for the campaign.
     #   @return [String]
     #
     # @!attribute [rw] treatment_name
-    #   A custom name for a variation of the campaign to use for A/B
-    #   testing.
+    #   A custom name of the default treatment for the campaign, if the
+    #   campaign has multiple treatments. A *treatment* is a variation of a
+    #   campaign that's used for A/B testing.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/WriteCampaignRequest AWS API Documentation
     #
     class WriteCampaignRequest < Struct.new(
       :additional_treatments,
+      :custom_delivery_configuration,
       :description,
       :holdout_percent,
       :hook,
@@ -17994,6 +18559,16 @@ module Aws::Pinpoint
     #       {
     #         activities: {
     #           "__string" => {
+    #             custom: {
+    #               delivery_uri: "__string",
+    #               endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #               message_config: {
+    #                 data: "__string",
+    #               },
+    #               next_activity: "__string",
+    #               template_name: "__string",
+    #               template_version: "__string",
+    #             },
     #             conditional_split: {
     #               condition: {
     #                 conditions: [
@@ -18214,6 +18789,14 @@ module Aws::Pinpoint
     #                 wait_until: "__string",
     #               },
     #             },
+    #             push: {
+    #               message_config: {
+    #                 time_to_live: "__string",
+    #               },
+    #               next_activity: "__string",
+    #               template_name: "__string",
+    #               template_version: "__string",
+    #             },
     #             random_split: {
     #               branches: [
     #                 {
@@ -18222,6 +18805,15 @@ module Aws::Pinpoint
     #                 },
     #               ],
     #             },
+    #             sms: {
+    #               message_config: {
+    #                 message_type: "TRANSACTIONAL", # accepts TRANSACTIONAL, PROMOTIONAL
+    #                 sender_id: "__string",
+    #               },
+    #               next_activity: "__string",
+    #               template_name: "__string",
+    #               template_version: "__string",
+    #             },
     #             wait: {
     #               next_activity: "__string",
     #               wait_time: {
@@ -18561,13 +19153,17 @@ module Aws::Pinpoint
       include Aws::Structure
     end
 
-    # Specifies the settings for a campaign treatment. A treatment is a
+    # Specifies the settings for a campaign treatment. A *treatment* is a
     # variation of a campaign that's used for A/B testing of a campaign.
     #
     # @note When making an API call, you may pass WriteTreatmentResource
     #   data as a hash:
     #
     #       {
+    #         custom_delivery_configuration: {
+    #           delivery_uri: "__string", # required
+    #           endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         },
     #         message_configuration: {
     #           adm_message: {
     #             action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
@@ -18611,6 +19207,9 @@ module Aws::Pinpoint
     #             title: "__string",
     #             url: "__string",
     #           },
+    #           custom_message: {
+    #             data: "__string",
+    #           },
     #           default_message: {
     #             action: "OPEN_APP", # accepts OPEN_APP, DEEP_LINK, URL
     #             body: "__string",
@@ -18706,6 +19305,13 @@ module Aws::Pinpoint
     #         treatment_name: "__string",
     #       }
     #
+    # @!attribute [rw] custom_delivery_configuration
+    #   The delivery configuration settings for sending the treatment
+    #   through a custom channel. This object is required if the
+    #   MessageConfiguration object for the treatment specifies a
+    #   CustomMessage object.
+    #   @return [Types::CustomDeliveryConfiguration]
+    #
     # @!attribute [rw] message_configuration
     #   The message configuration settings for the treatment.
     #   @return [Types::MessageConfiguration]
@@ -18728,13 +19334,13 @@ module Aws::Pinpoint
     #   @return [String]
     #
     # @!attribute [rw] treatment_name
-    #   A custom name for the treatment. A treatment is a variation of a
-    #   campaign that's used for A/B testing of a campaign.
+    #   A custom name for the treatment.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/pinpoint-2016-12-01/WriteTreatmentResource AWS API Documentation
     #
     class WriteTreatmentResource < Struct.new(
+      :custom_delivery_configuration,
       :message_configuration,
       :schedule,
       :size_percent,