aws-sdk-pinpoint 1.38.0 → 1.43.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -84,6 +86,7 @@ module Aws::Pinpoint
     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')
@@ -270,12 +273,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')
@@ -349,6 +355,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')
@@ -369,6 +376,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')
@@ -647,12 +655,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
 
@@ -1003,6 +1014,14 @@ module Aws::Pinpoint
     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
@@ -1962,6 +1981,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"))
@@ -1993,6 +2015,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"))
@@ -2010,6 +2035,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"))
@@ -2282,6 +2311,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"))
@@ -2415,6 +2450,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"))

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -40,6 +42,7 @@ module Aws::Pinpoint
       :client_id,
       :client_secret,
       :enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -103,6 +106,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -254,6 +258,7 @@ module Aws::Pinpoint
       :substitutions,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -324,6 +329,7 @@ module Aws::Pinpoint
       :team_id,
       :token_key,
       :token_key_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -400,6 +406,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -667,6 +674,7 @@ module Aws::Pinpoint
       :time_to_live,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -749,6 +757,7 @@ module Aws::Pinpoint
       :sound,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -822,6 +831,7 @@ module Aws::Pinpoint
       :team_id,
       :token_key,
       :token_key_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -901,6 +911,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -972,6 +983,7 @@ module Aws::Pinpoint
       :team_id,
       :token_key,
       :token_key_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1049,6 +1061,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1122,6 +1135,7 @@ module Aws::Pinpoint
       :team_id,
       :token_key,
       :token_key_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1202,6 +1216,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1224,6 +1239,7 @@ module Aws::Pinpoint
     class ActivitiesResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1234,6 +1250,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 +1480,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 +1496,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 +1514,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 +1547,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 +1559,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,13 +1573,17 @@ 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)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1604,6 +1667,7 @@ module Aws::Pinpoint
       :timezones_total_count,
       :total_endpoint_count,
       :treatment_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1615,7 +1679,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",
     #         },
@@ -1670,6 +1734,7 @@ module Aws::Pinpoint
       :raw_content,
       :substitutions,
       :title_override)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1767,6 +1832,7 @@ module Aws::Pinpoint
       :sound,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1826,6 +1892,7 @@ module Aws::Pinpoint
       :kpi_result,
       :next_token,
       :start_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1858,6 +1925,7 @@ module Aws::Pinpoint
       :id,
       :name,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1916,6 +1984,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :limits,
       :quiet_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1936,6 +2005,7 @@ module Aws::Pinpoint
     class ApplicationsResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1969,6 +2039,7 @@ module Aws::Pinpoint
     class AttributeDimension < Struct.new(
       :attribute_type,
       :values)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2004,6 +2075,7 @@ module Aws::Pinpoint
       :application_id,
       :attribute_type,
       :attributes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2020,6 +2092,7 @@ module Aws::Pinpoint
     class BadRequestException < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2055,6 +2128,7 @@ module Aws::Pinpoint
       :api_key,
       :enabled,
       :secret_key)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2124,6 +2198,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2259,6 +2334,7 @@ module Aws::Pinpoint
       :time_to_live,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2275,6 +2351,7 @@ module Aws::Pinpoint
     #
     class BaseKpiResult < Struct.new(
       :rows)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2297,6 +2374,7 @@ module Aws::Pinpoint
     #
     class CampaignCustomMessage < Struct.new(
       :data)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2361,6 +2439,7 @@ module Aws::Pinpoint
       :kpi_result,
       :next_token,
       :start_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2404,6 +2483,7 @@ module Aws::Pinpoint
       :from_address,
       :html_body,
       :title)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2452,6 +2532,7 @@ module Aws::Pinpoint
     class CampaignEventFilter < Struct.new(
       :dimensions,
       :filter_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2497,6 +2578,7 @@ module Aws::Pinpoint
       :lambda_function_name,
       :mode,
       :web_url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2549,6 +2631,7 @@ module Aws::Pinpoint
       :maximum_duration,
       :messages_per_second,
       :total)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2692,6 +2775,7 @@ module Aws::Pinpoint
       :treatment_description,
       :treatment_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2712,10 +2796,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
@@ -2729,6 +2813,7 @@ module Aws::Pinpoint
       :body,
       :message_type,
       :sender_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2748,6 +2833,7 @@ module Aws::Pinpoint
     #
     class CampaignState < Struct.new(
       :campaign_status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2770,6 +2856,7 @@ module Aws::Pinpoint
     class CampaignsResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2827,6 +2914,7 @@ module Aws::Pinpoint
       :last_modified_by,
       :last_modified_date,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2844,6 +2932,7 @@ module Aws::Pinpoint
     #
     class ChannelsResponse < Struct.new(
       :channels)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2966,6 +3055,7 @@ module Aws::Pinpoint
     class Condition < Struct.new(
       :conditions,
       :operator)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3109,6 +3199,7 @@ module Aws::Pinpoint
       :evaluation_wait_time,
       :false_activity,
       :true_activity)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3133,6 +3224,7 @@ module Aws::Pinpoint
     #
     class CreateAppRequest < Struct.new(
       :create_application_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3144,6 +3236,7 @@ module Aws::Pinpoint
     #
     class CreateAppResponse < Struct.new(
       :application_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3176,6 +3269,7 @@ module Aws::Pinpoint
     class CreateApplicationRequest < Struct.new(
       :name,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3189,7 +3283,7 @@ module Aws::Pinpoint
     #             {
     #               custom_delivery_configuration: {
     #                 delivery_uri: "__string", # required
-    #                 endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #                 endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #               },
     #               message_configuration: {
     #                 adm_message: {
@@ -3334,7 +3428,7 @@ module Aws::Pinpoint
     #           ],
     #           custom_delivery_configuration: {
     #             delivery_uri: "__string", # required
-    #             endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #             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,
@@ -3509,6 +3603,7 @@ module Aws::Pinpoint
     class CreateCampaignRequest < Struct.new(
       :application_id,
       :write_campaign_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3521,6 +3616,7 @@ module Aws::Pinpoint
     #
     class CreateCampaignResponse < Struct.new(
       :campaign_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3555,6 +3651,7 @@ module Aws::Pinpoint
     class CreateEmailTemplateRequest < Struct.new(
       :email_template_request,
       :template_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3566,6 +3663,7 @@ module Aws::Pinpoint
     #
     class CreateEmailTemplateResponse < Struct.new(
       :create_template_message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3595,6 +3693,7 @@ module Aws::Pinpoint
     class CreateExportJobRequest < Struct.new(
       :application_id,
       :export_job_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3610,6 +3709,7 @@ module Aws::Pinpoint
     #
     class CreateExportJobResponse < Struct.new(
       :export_job_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3643,6 +3743,7 @@ module Aws::Pinpoint
     class CreateImportJobRequest < Struct.new(
       :application_id,
       :import_job_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3658,6 +3759,7 @@ module Aws::Pinpoint
     #
     class CreateImportJobResponse < Struct.new(
       :import_job_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3669,6 +3771,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: [
@@ -3889,6 +4001,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: [
     #                   {
@@ -3897,6 +4017,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: {
@@ -3948,6 +4077,7 @@ module Aws::Pinpoint
     class CreateJourneyRequest < Struct.new(
       :application_id,
       :write_journey_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3960,6 +4090,7 @@ module Aws::Pinpoint
     #
     class CreateJourneyResponse < Struct.new(
       :journey_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4041,6 +4172,7 @@ module Aws::Pinpoint
     class CreatePushTemplateRequest < Struct.new(
       :push_notification_template_request,
       :template_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4052,6 +4184,7 @@ module Aws::Pinpoint
     #
     class CreatePushTemplateResponse < Struct.new(
       :create_template_message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4196,6 +4329,7 @@ module Aws::Pinpoint
       :recommendation_transformer_uri,
       :recommendations_display_name,
       :recommendations_per_message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4227,6 +4361,7 @@ module Aws::Pinpoint
     #
     class CreateRecommenderConfigurationRequest < Struct.new(
       :create_recommender_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4239,6 +4374,7 @@ module Aws::Pinpoint
     #
     class CreateRecommenderConfigurationResponse < Struct.new(
       :recommender_configuration_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4416,6 +4552,7 @@ module Aws::Pinpoint
     class CreateSegmentRequest < Struct.new(
       :application_id,
       :write_segment_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4428,6 +4565,7 @@ module Aws::Pinpoint
     #
     class CreateSegmentResponse < Struct.new(
       :segment_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4460,6 +4598,7 @@ module Aws::Pinpoint
     class CreateSmsTemplateRequest < Struct.new(
       :sms_template_request,
       :template_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4471,6 +4610,7 @@ module Aws::Pinpoint
     #
     class CreateSmsTemplateResponse < Struct.new(
       :create_template_message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4497,6 +4637,7 @@ module Aws::Pinpoint
       :arn,
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4530,6 +4671,7 @@ module Aws::Pinpoint
     class CreateVoiceTemplateRequest < Struct.new(
       :template_name,
       :voice_template_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4541,6 +4683,7 @@ module Aws::Pinpoint
     #
     class CreateVoiceTemplateResponse < Struct.new(
       :create_template_message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4554,7 +4697,7 @@ module Aws::Pinpoint
     #
     #       {
     #         delivery_uri: "__string", # required
-    #         endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #         endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #       }
     #
     # @!attribute [rw] delivery_uri
@@ -4580,6 +4723,88 @@ module Aws::Pinpoint
     class CustomDeliveryConfiguration < Struct.new(
       :delivery_uri,
       :endpoint_types)
+      SENSITIVE = []
+      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)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4609,6 +4834,7 @@ module Aws::Pinpoint
     class DefaultMessage < Struct.new(
       :body,
       :substitutions)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4692,6 +4918,7 @@ module Aws::Pinpoint
       :substitutions,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4764,6 +4991,7 @@ module Aws::Pinpoint
       :sound,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4781,6 +5009,7 @@ module Aws::Pinpoint
     #
     class DeleteAdmChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4793,6 +5022,7 @@ module Aws::Pinpoint
     #
     class DeleteAdmChannelResponse < Struct.new(
       :adm_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4810,6 +5040,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4822,6 +5053,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsChannelResponse < Struct.new(
       :apns_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4839,6 +5071,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsSandboxChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4852,6 +5085,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsSandboxChannelResponse < Struct.new(
       :apns_sandbox_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4869,6 +5103,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsVoipChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4881,6 +5116,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsVoipChannelResponse < Struct.new(
       :apns_voip_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4898,6 +5134,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsVoipSandboxChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4911,6 +5148,7 @@ module Aws::Pinpoint
     #
     class DeleteApnsVoipSandboxChannelResponse < Struct.new(
       :apns_voip_sandbox_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4928,6 +5166,7 @@ module Aws::Pinpoint
     #
     class DeleteAppRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4939,6 +5178,7 @@ module Aws::Pinpoint
     #
     class DeleteAppResponse < Struct.new(
       :application_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4956,6 +5196,7 @@ module Aws::Pinpoint
     #
     class DeleteBaiduChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4968,6 +5209,7 @@ module Aws::Pinpoint
     #
     class DeleteBaiduChannelResponse < Struct.new(
       :baidu_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4990,6 +5232,7 @@ module Aws::Pinpoint
     class DeleteCampaignRequest < Struct.new(
       :application_id,
       :campaign_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5002,6 +5245,7 @@ module Aws::Pinpoint
     #
     class DeleteCampaignResponse < Struct.new(
       :campaign_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5019,6 +5263,7 @@ module Aws::Pinpoint
     #
     class DeleteEmailChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5031,6 +5276,7 @@ module Aws::Pinpoint
     #
     class DeleteEmailChannelResponse < Struct.new(
       :email_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5053,6 +5299,7 @@ module Aws::Pinpoint
     class DeleteEmailTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5064,6 +5311,7 @@ module Aws::Pinpoint
     #
     class DeleteEmailTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5086,6 +5334,7 @@ module Aws::Pinpoint
     class DeleteEndpointRequest < Struct.new(
       :application_id,
       :endpoint_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5098,6 +5347,7 @@ module Aws::Pinpoint
     #
     class DeleteEndpointResponse < Struct.new(
       :endpoint_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5115,6 +5365,7 @@ module Aws::Pinpoint
     #
     class DeleteEventStreamRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5127,6 +5378,7 @@ module Aws::Pinpoint
     #
     class DeleteEventStreamResponse < Struct.new(
       :event_stream)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5144,6 +5396,7 @@ module Aws::Pinpoint
     #
     class DeleteGcmChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5158,6 +5411,7 @@ module Aws::Pinpoint
     #
     class DeleteGcmChannelResponse < Struct.new(
       :gcm_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5180,6 +5434,7 @@ module Aws::Pinpoint
     class DeleteJourneyRequest < Struct.new(
       :application_id,
       :journey_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5192,6 +5447,7 @@ module Aws::Pinpoint
     #
     class DeleteJourneyResponse < Struct.new(
       :journey_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5214,6 +5470,7 @@ module Aws::Pinpoint
     class DeletePushTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5225,6 +5482,7 @@ module Aws::Pinpoint
     #
     class DeletePushTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5242,6 +5500,7 @@ module Aws::Pinpoint
     #
     class DeleteRecommenderConfigurationRequest < Struct.new(
       :recommender_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5254,6 +5513,7 @@ module Aws::Pinpoint
     #
     class DeleteRecommenderConfigurationResponse < Struct.new(
       :recommender_configuration_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5276,6 +5536,7 @@ module Aws::Pinpoint
     class DeleteSegmentRequest < Struct.new(
       :application_id,
       :segment_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5288,6 +5549,7 @@ module Aws::Pinpoint
     #
     class DeleteSegmentResponse < Struct.new(
       :segment_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5305,6 +5567,7 @@ module Aws::Pinpoint
     #
     class DeleteSmsChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5317,6 +5580,7 @@ module Aws::Pinpoint
     #
     class DeleteSmsChannelResponse < Struct.new(
       :sms_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5339,6 +5603,7 @@ module Aws::Pinpoint
     class DeleteSmsTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5350,6 +5615,7 @@ module Aws::Pinpoint
     #
     class DeleteSmsTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5372,6 +5638,7 @@ module Aws::Pinpoint
     class DeleteUserEndpointsRequest < Struct.new(
       :application_id,
       :user_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5384,6 +5651,7 @@ module Aws::Pinpoint
     #
     class DeleteUserEndpointsResponse < Struct.new(
       :endpoints_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5401,6 +5669,7 @@ module Aws::Pinpoint
     #
     class DeleteVoiceChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5413,6 +5682,7 @@ module Aws::Pinpoint
     #
     class DeleteVoiceChannelResponse < Struct.new(
       :voice_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5435,6 +5705,7 @@ module Aws::Pinpoint
     class DeleteVoiceTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5446,6 +5717,7 @@ module Aws::Pinpoint
     #
     class DeleteVoiceTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5674,6 +5946,7 @@ module Aws::Pinpoint
       :gcm_message,
       :sms_message,
       :voice_message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5729,6 +6002,7 @@ module Aws::Pinpoint
       :from_address,
       :identity,
       :role_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5830,6 +6104,7 @@ module Aws::Pinpoint
       :platform,
       :role_arn,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5909,6 +6184,7 @@ module Aws::Pinpoint
       :reply_to_addresses,
       :simple_email,
       :substitutions)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5928,7 +6204,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
@@ -5937,7 +6214,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
@@ -5963,6 +6242,7 @@ module Aws::Pinpoint
       :next_activity,
       :template_name,
       :template_version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6042,6 +6322,7 @@ module Aws::Pinpoint
       :tags,
       :template_description,
       :text_part)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6131,6 +6412,7 @@ module Aws::Pinpoint
       :template_type,
       :text_part,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6145,7 +6427,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",
@@ -6281,6 +6563,7 @@ module Aws::Pinpoint
       :opt_out,
       :request_id,
       :user)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6297,7 +6580,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",
@@ -6344,6 +6627,7 @@ module Aws::Pinpoint
     #
     class EndpointBatchRequest < Struct.new(
       :item)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6411,6 +6695,7 @@ module Aws::Pinpoint
       :platform,
       :platform_version,
       :timezone)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6432,6 +6717,7 @@ module Aws::Pinpoint
     class EndpointItemResponse < Struct.new(
       :message,
       :status_code)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6487,6 +6773,7 @@ module Aws::Pinpoint
       :longitude,
       :postal_code,
       :region)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6553,6 +6840,7 @@ module Aws::Pinpoint
       :status_code,
       :status_message,
       :updated_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6566,7 +6854,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",
@@ -6695,6 +6983,7 @@ module Aws::Pinpoint
       :opt_out,
       :request_id,
       :user)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6818,6 +7107,7 @@ module Aws::Pinpoint
       :opt_out,
       :request_id,
       :user)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6879,6 +7169,7 @@ module Aws::Pinpoint
       :raw_content,
       :substitutions,
       :title_override)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6920,6 +7211,7 @@ module Aws::Pinpoint
     class EndpointUser < Struct.new(
       :user_attributes,
       :user_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6935,6 +7227,7 @@ module Aws::Pinpoint
     #
     class EndpointsResponse < Struct.new(
       :item)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7019,6 +7312,7 @@ module Aws::Pinpoint
       :sdk_name,
       :session,
       :timestamp)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7064,6 +7358,7 @@ module Aws::Pinpoint
     class EventCondition < Struct.new(
       :dimensions,
       :message_activity)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7123,6 +7418,7 @@ module Aws::Pinpoint
       :attributes,
       :event_type,
       :metrics)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7145,6 +7441,7 @@ module Aws::Pinpoint
     class EventItemResponse < Struct.new(
       :message,
       :status_code)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7199,6 +7496,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :last_updated_by,
       :role_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7213,7 +7511,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",
@@ -7285,6 +7583,7 @@ module Aws::Pinpoint
     class EventsBatch < Struct.new(
       :endpoint,
       :events)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7301,7 +7600,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",
@@ -7371,6 +7670,7 @@ module Aws::Pinpoint
     #
     class EventsRequest < Struct.new(
       :batch_item)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7390,6 +7690,7 @@ module Aws::Pinpoint
     #
     class EventsResponse < Struct.new(
       :results)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7439,6 +7740,7 @@ module Aws::Pinpoint
       :s3_url_prefix,
       :segment_id,
       :segment_version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7481,6 +7783,7 @@ module Aws::Pinpoint
       :s3_url_prefix,
       :segment_id,
       :segment_version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7568,6 +7871,7 @@ module Aws::Pinpoint
       :total_pieces,
       :total_processed,
       :type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7592,6 +7896,7 @@ module Aws::Pinpoint
     class ExportJobsResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7608,6 +7913,7 @@ module Aws::Pinpoint
     class ForbiddenException < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7638,6 +7944,7 @@ module Aws::Pinpoint
     class GCMChannelRequest < Struct.new(
       :api_key,
       :enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7709,6 +8016,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7890,6 +8198,7 @@ module Aws::Pinpoint
       :time_to_live,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7916,6 +8225,7 @@ module Aws::Pinpoint
     class GPSCoordinates < Struct.new(
       :latitude,
       :longitude)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7946,6 +8256,7 @@ module Aws::Pinpoint
     class GPSPointDimension < Struct.new(
       :coordinates,
       :range_in_kilometers)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7963,6 +8274,7 @@ module Aws::Pinpoint
     #
     class GetAdmChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7975,6 +8287,7 @@ module Aws::Pinpoint
     #
     class GetAdmChannelResponse < Struct.new(
       :adm_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7992,6 +8305,7 @@ module Aws::Pinpoint
     #
     class GetApnsChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8004,6 +8318,7 @@ module Aws::Pinpoint
     #
     class GetApnsChannelResponse < Struct.new(
       :apns_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8021,6 +8336,7 @@ module Aws::Pinpoint
     #
     class GetApnsSandboxChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8034,6 +8350,7 @@ module Aws::Pinpoint
     #
     class GetApnsSandboxChannelResponse < Struct.new(
       :apns_sandbox_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8051,6 +8368,7 @@ module Aws::Pinpoint
     #
     class GetApnsVoipChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8063,6 +8381,7 @@ module Aws::Pinpoint
     #
     class GetApnsVoipChannelResponse < Struct.new(
       :apns_voip_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8080,6 +8399,7 @@ module Aws::Pinpoint
     #
     class GetApnsVoipSandboxChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8093,6 +8413,7 @@ module Aws::Pinpoint
     #
     class GetApnsVoipSandboxChannelResponse < Struct.new(
       :apns_voip_sandbox_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8110,6 +8431,7 @@ module Aws::Pinpoint
     #
     class GetAppRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8121,6 +8443,7 @@ module Aws::Pinpoint
     #
     class GetAppResponse < Struct.new(
       :application_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8163,6 +8486,7 @@ module Aws::Pinpoint
       :next_token,
       :page_size,
       :start_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8176,6 +8500,7 @@ module Aws::Pinpoint
     #
     class GetApplicationDateRangeKpiResponse < Struct.new(
       :application_date_range_kpi_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8193,6 +8518,7 @@ module Aws::Pinpoint
     #
     class GetApplicationSettingsRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8205,6 +8531,7 @@ module Aws::Pinpoint
     #
     class GetApplicationSettingsResponse < Struct.new(
       :application_settings_resource)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8227,6 +8554,7 @@ module Aws::Pinpoint
     class GetAppsRequest < Struct.new(
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8238,6 +8566,7 @@ module Aws::Pinpoint
     #
     class GetAppsResponse < Struct.new(
       :applications_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8255,6 +8584,7 @@ module Aws::Pinpoint
     #
     class GetBaiduChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8267,6 +8597,7 @@ module Aws::Pinpoint
     #
     class GetBaiduChannelResponse < Struct.new(
       :baidu_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8299,6 +8630,7 @@ module Aws::Pinpoint
       :campaign_id,
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8311,6 +8643,7 @@ module Aws::Pinpoint
     #
     class GetCampaignActivitiesResponse < Struct.new(
       :activities_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8358,6 +8691,7 @@ module Aws::Pinpoint
       :next_token,
       :page_size,
       :start_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8371,6 +8705,7 @@ module Aws::Pinpoint
     #
     class GetCampaignDateRangeKpiResponse < Struct.new(
       :campaign_date_range_kpi_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8393,6 +8728,7 @@ module Aws::Pinpoint
     class GetCampaignRequest < Struct.new(
       :application_id,
       :campaign_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8405,6 +8741,7 @@ module Aws::Pinpoint
     #
     class GetCampaignResponse < Struct.new(
       :campaign_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8432,6 +8769,7 @@ module Aws::Pinpoint
       :application_id,
       :campaign_id,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8444,6 +8782,7 @@ module Aws::Pinpoint
     #
     class GetCampaignVersionResponse < Struct.new(
       :campaign_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8476,6 +8815,7 @@ module Aws::Pinpoint
       :campaign_id,
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8488,6 +8828,7 @@ module Aws::Pinpoint
     #
     class GetCampaignVersionsResponse < Struct.new(
       :campaigns_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8515,6 +8856,7 @@ module Aws::Pinpoint
       :application_id,
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8527,6 +8869,7 @@ module Aws::Pinpoint
     #
     class GetCampaignsResponse < Struct.new(
       :campaigns_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8544,6 +8887,7 @@ module Aws::Pinpoint
     #
     class GetChannelsRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8557,6 +8901,7 @@ module Aws::Pinpoint
     #
     class GetChannelsResponse < Struct.new(
       :channels_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8574,6 +8919,7 @@ module Aws::Pinpoint
     #
     class GetEmailChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8586,6 +8932,7 @@ module Aws::Pinpoint
     #
     class GetEmailChannelResponse < Struct.new(
       :email_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8608,6 +8955,7 @@ module Aws::Pinpoint
     class GetEmailTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8621,6 +8969,7 @@ module Aws::Pinpoint
     #
     class GetEmailTemplateResponse < Struct.new(
       :email_template_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8643,6 +8992,7 @@ module Aws::Pinpoint
     class GetEndpointRequest < Struct.new(
       :application_id,
       :endpoint_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8655,6 +9005,7 @@ module Aws::Pinpoint
     #
     class GetEndpointResponse < Struct.new(
       :endpoint_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8672,6 +9023,7 @@ module Aws::Pinpoint
     #
     class GetEventStreamRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8684,6 +9036,7 @@ module Aws::Pinpoint
     #
     class GetEventStreamResponse < Struct.new(
       :event_stream)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8706,6 +9059,7 @@ module Aws::Pinpoint
     class GetExportJobRequest < Struct.new(
       :application_id,
       :job_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8721,6 +9075,7 @@ module Aws::Pinpoint
     #
     class GetExportJobResponse < Struct.new(
       :export_job_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8748,6 +9103,7 @@ module Aws::Pinpoint
       :application_id,
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8761,6 +9117,7 @@ module Aws::Pinpoint
     #
     class GetExportJobsResponse < Struct.new(
       :export_jobs_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8778,6 +9135,7 @@ module Aws::Pinpoint
     #
     class GetGcmChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8792,6 +9150,7 @@ module Aws::Pinpoint
     #
     class GetGcmChannelResponse < Struct.new(
       :gcm_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8814,6 +9173,7 @@ module Aws::Pinpoint
     class GetImportJobRequest < Struct.new(
       :application_id,
       :job_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8829,6 +9189,7 @@ module Aws::Pinpoint
     #
     class GetImportJobResponse < Struct.new(
       :import_job_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8856,6 +9217,7 @@ module Aws::Pinpoint
       :application_id,
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8870,6 +9232,7 @@ module Aws::Pinpoint
     #
     class GetImportJobsResponse < Struct.new(
       :import_jobs_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8917,6 +9280,7 @@ module Aws::Pinpoint
       :next_token,
       :page_size,
       :start_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8930,6 +9294,7 @@ module Aws::Pinpoint
     #
     class GetJourneyDateRangeKpiResponse < Struct.new(
       :journey_date_range_kpi_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8967,6 +9332,7 @@ module Aws::Pinpoint
       :journey_id,
       :next_token,
       :page_size)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8980,6 +9346,7 @@ module Aws::Pinpoint
     #
     class GetJourneyExecutionActivityMetricsResponse < Struct.new(
       :journey_execution_activity_metrics_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9012,6 +9379,7 @@ module Aws::Pinpoint
       :journey_id,
       :next_token,
       :page_size)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9025,6 +9393,7 @@ module Aws::Pinpoint
     #
     class GetJourneyExecutionMetricsResponse < Struct.new(
       :journey_execution_metrics_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9047,6 +9416,7 @@ module Aws::Pinpoint
     class GetJourneyRequest < Struct.new(
       :application_id,
       :journey_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9059,6 +9429,7 @@ module Aws::Pinpoint
     #
     class GetJourneyResponse < Struct.new(
       :journey_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9081,6 +9452,7 @@ module Aws::Pinpoint
     class GetPushTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9094,6 +9466,7 @@ module Aws::Pinpoint
     #
     class GetPushTemplateResponse < Struct.new(
       :push_notification_template_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9111,6 +9484,7 @@ module Aws::Pinpoint
     #
     class GetRecommenderConfigurationRequest < Struct.new(
       :recommender_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9123,6 +9497,7 @@ module Aws::Pinpoint
     #
     class GetRecommenderConfigurationResponse < Struct.new(
       :recommender_configuration_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9145,6 +9520,7 @@ module Aws::Pinpoint
     class GetRecommenderConfigurationsRequest < Struct.new(
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9157,6 +9533,7 @@ module Aws::Pinpoint
     #
     class GetRecommenderConfigurationsResponse < Struct.new(
       :list_recommender_configurations_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9189,6 +9566,7 @@ module Aws::Pinpoint
       :page_size,
       :segment_id,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9202,6 +9580,7 @@ module Aws::Pinpoint
     #
     class GetSegmentExportJobsResponse < Struct.new(
       :export_jobs_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9234,6 +9613,7 @@ module Aws::Pinpoint
       :page_size,
       :segment_id,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9248,6 +9628,7 @@ module Aws::Pinpoint
     #
     class GetSegmentImportJobsResponse < Struct.new(
       :import_jobs_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9270,6 +9651,7 @@ module Aws::Pinpoint
     class GetSegmentRequest < Struct.new(
       :application_id,
       :segment_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9282,6 +9664,7 @@ module Aws::Pinpoint
     #
     class GetSegmentResponse < Struct.new(
       :segment_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9309,6 +9692,7 @@ module Aws::Pinpoint
       :application_id,
       :segment_id,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9321,6 +9705,7 @@ module Aws::Pinpoint
     #
     class GetSegmentVersionResponse < Struct.new(
       :segment_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9353,6 +9738,7 @@ module Aws::Pinpoint
       :page_size,
       :segment_id,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9365,6 +9751,7 @@ module Aws::Pinpoint
     #
     class GetSegmentVersionsResponse < Struct.new(
       :segments_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9392,6 +9779,7 @@ module Aws::Pinpoint
       :application_id,
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9404,6 +9792,7 @@ module Aws::Pinpoint
     #
     class GetSegmentsResponse < Struct.new(
       :segments_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9421,6 +9810,7 @@ module Aws::Pinpoint
     #
     class GetSmsChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9433,6 +9823,7 @@ module Aws::Pinpoint
     #
     class GetSmsChannelResponse < Struct.new(
       :sms_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9455,6 +9846,7 @@ module Aws::Pinpoint
     class GetSmsTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9468,6 +9860,7 @@ module Aws::Pinpoint
     #
     class GetSmsTemplateResponse < Struct.new(
       :sms_template_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9490,6 +9883,7 @@ module Aws::Pinpoint
     class GetUserEndpointsRequest < Struct.new(
       :application_id,
       :user_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9502,6 +9896,7 @@ module Aws::Pinpoint
     #
     class GetUserEndpointsResponse < Struct.new(
       :endpoints_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9519,6 +9914,7 @@ module Aws::Pinpoint
     #
     class GetVoiceChannelRequest < Struct.new(
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9531,6 +9927,7 @@ module Aws::Pinpoint
     #
     class GetVoiceChannelResponse < Struct.new(
       :voice_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9553,6 +9950,7 @@ module Aws::Pinpoint
     class GetVoiceTemplateRequest < Struct.new(
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9566,6 +9964,7 @@ module Aws::Pinpoint
     #
     class GetVoiceTemplateResponse < Struct.new(
       :voice_template_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9600,6 +9999,7 @@ module Aws::Pinpoint
     class HoldoutActivity < Struct.new(
       :next_activity,
       :percentage)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9688,6 +10088,7 @@ module Aws::Pinpoint
       :s3_url,
       :segment_id,
       :segment_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9766,6 +10167,7 @@ module Aws::Pinpoint
       :s3_url,
       :segment_id,
       :segment_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9853,6 +10255,7 @@ module Aws::Pinpoint
       :total_pieces,
       :total_processed,
       :type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9877,6 +10280,7 @@ module Aws::Pinpoint
     class ImportJobsResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9893,6 +10297,7 @@ module Aws::Pinpoint
     class InternalServerErrorException < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9914,6 +10319,30 @@ module Aws::Pinpoint
     class ItemResponse < Struct.new(
       :endpoint_item_response,
       :events_item_response)
+      SENSITIVE = []
+      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)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9978,6 +10407,7 @@ module Aws::Pinpoint
       :kpi_result,
       :next_token,
       :start_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10001,6 +10431,7 @@ module Aws::Pinpoint
     #
     class JourneyEmailMessage < Struct.new(
       :from_address)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10062,7 +10493,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
@@ -10074,6 +10505,7 @@ module Aws::Pinpoint
       :journey_id,
       :last_evaluated_time,
       :metrics)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10102,7 +10534,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
@@ -10112,6 +10544,7 @@ module Aws::Pinpoint
       :journey_id,
       :last_evaluated_time,
       :metrics)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10149,6 +10582,37 @@ module Aws::Pinpoint
       :daily_cap,
       :endpoint_reentry_cap,
       :messages_per_second)
+      SENSITIVE = []
+      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)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10284,6 +10748,45 @@ module Aws::Pinpoint
       :start_condition,
       :state,
       :tags)
+      SENSITIVE = []
+      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)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10325,6 +10828,7 @@ module Aws::Pinpoint
       :end_time,
       :start_time,
       :timezone)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10358,6 +10862,7 @@ module Aws::Pinpoint
     #
     class JourneyStateRequest < Struct.new(
       :state)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10380,6 +10885,7 @@ module Aws::Pinpoint
     class JourneysResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10407,6 +10913,7 @@ module Aws::Pinpoint
       :application_id,
       :page_size,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10420,6 +10927,7 @@ module Aws::Pinpoint
     #
     class ListJourneysResponse < Struct.new(
       :journeys_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10442,6 +10950,7 @@ module Aws::Pinpoint
     class ListRecommenderConfigurationsResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10459,6 +10968,7 @@ module Aws::Pinpoint
     #
     class ListTagsForResourceRequest < Struct.new(
       :resource_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10471,6 +10981,7 @@ module Aws::Pinpoint
     #
     class ListTagsForResourceResponse < Struct.new(
       :tags_model)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10503,6 +11014,7 @@ module Aws::Pinpoint
       :page_size,
       :template_name,
       :template_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10515,6 +11027,7 @@ module Aws::Pinpoint
     #
     class ListTemplateVersionsResponse < Struct.new(
       :template_versions_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10547,6 +11060,7 @@ module Aws::Pinpoint
       :page_size,
       :prefix,
       :template_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10559,6 +11073,7 @@ module Aws::Pinpoint
     #
     class ListTemplatesResponse < Struct.new(
       :templates_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10677,6 +11192,7 @@ module Aws::Pinpoint
       :time_to_live,
       :title,
       :url)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10695,6 +11211,7 @@ module Aws::Pinpoint
     class MessageBody < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10849,6 +11366,7 @@ module Aws::Pinpoint
       :email_message,
       :gcm_message,
       :sms_message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10861,7 +11379,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",
     #             },
@@ -11112,6 +11630,7 @@ module Aws::Pinpoint
       :message_configuration,
       :template_configuration,
       :trace_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11148,6 +11667,7 @@ module Aws::Pinpoint
       :endpoint_result,
       :request_id,
       :result)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11209,6 +11729,7 @@ module Aws::Pinpoint
       :status_code,
       :status_message,
       :updated_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11225,6 +11746,7 @@ module Aws::Pinpoint
     class MethodNotAllowedException < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11255,6 +11777,7 @@ module Aws::Pinpoint
     class MetricDimension < Struct.new(
       :comparison_operator,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11372,6 +11895,7 @@ module Aws::Pinpoint
     class MultiConditionalBranch < Struct.new(
       :condition,
       :next_activity)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11509,6 +12033,7 @@ module Aws::Pinpoint
       :branches,
       :default_activity,
       :evaluation_wait_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11525,6 +12050,7 @@ module Aws::Pinpoint
     class NotFoundException < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11554,6 +12080,7 @@ module Aws::Pinpoint
     class NumberValidateRequest < Struct.new(
       :iso_country_code,
       :phone_number)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11648,6 +12175,7 @@ module Aws::Pinpoint
       :phone_type_code,
       :timezone,
       :zip_code)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11664,6 +12192,7 @@ module Aws::Pinpoint
     class PayloadTooLargeException < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11685,6 +12214,7 @@ module Aws::Pinpoint
     #
     class PhoneNumberValidateRequest < Struct.new(
       :number_validate_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11696,6 +12226,7 @@ module Aws::Pinpoint
     #
     class PhoneNumberValidateResponse < Struct.new(
       :number_validate_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11710,7 +12241,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",
@@ -11824,6 +12355,65 @@ module Aws::Pinpoint
       :opt_out,
       :request_id,
       :user)
+      SENSITIVE = []
+      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)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11962,6 +12552,7 @@ module Aws::Pinpoint
       :recommender_id,
       :tags,
       :template_description)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12071,6 +12662,7 @@ module Aws::Pinpoint
       :template_name,
       :template_type,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12099,6 +12691,7 @@ module Aws::Pinpoint
     class PutEventStreamRequest < Struct.new(
       :application_id,
       :write_event_stream)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12111,6 +12704,7 @@ module Aws::Pinpoint
     #
     class PutEventStreamResponse < Struct.new(
       :event_stream)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12127,7 +12721,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",
@@ -12200,6 +12794,7 @@ module Aws::Pinpoint
     class PutEventsRequest < Struct.new(
       :application_id,
       :events_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12212,6 +12807,7 @@ module Aws::Pinpoint
     #
     class PutEventsResponse < Struct.new(
       :events_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12245,6 +12841,7 @@ module Aws::Pinpoint
     class QuietTime < Struct.new(
       :end,
       :start)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12274,6 +12871,7 @@ module Aws::Pinpoint
     #
     class RandomSplitActivity < Struct.new(
       :branches)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12308,6 +12906,7 @@ module Aws::Pinpoint
     class RandomSplitEntry < Struct.new(
       :next_activity,
       :percentage)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12330,6 +12929,7 @@ module Aws::Pinpoint
     #
     class RawEmail < Struct.new(
       :data)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12362,6 +12962,7 @@ module Aws::Pinpoint
     class RecencyDimension < Struct.new(
       :duration,
       :recency_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12476,6 +13077,7 @@ module Aws::Pinpoint
       :recommendation_transformer_uri,
       :recommendations_display_name,
       :recommendations_per_message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12507,6 +13109,7 @@ module Aws::Pinpoint
       :application_id,
       :attribute_type,
       :update_attributes_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12520,6 +13123,7 @@ module Aws::Pinpoint
     #
     class RemoveAttributesResponse < Struct.new(
       :attributes_resource)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12544,6 +13148,7 @@ module Aws::Pinpoint
     class ResultRow < Struct.new(
       :grouped_bys,
       :values)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12573,6 +13178,7 @@ module Aws::Pinpoint
       :key,
       :type,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12608,6 +13214,7 @@ module Aws::Pinpoint
       :enabled,
       :sender_id,
       :short_code)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12697,6 +13304,7 @@ module Aws::Pinpoint
       :short_code,
       :transactional_messages_per_second,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12732,10 +13340,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
@@ -12767,6 +13375,66 @@ module Aws::Pinpoint
       :origination_number,
       :sender_id,
       :substitutions)
+      SENSITIVE = []
+      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)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12827,6 +13495,7 @@ module Aws::Pinpoint
       :recommender_id,
       :tags,
       :template_description)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12904,6 +13573,7 @@ module Aws::Pinpoint
       :template_name,
       :template_type,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13011,6 +13681,7 @@ module Aws::Pinpoint
       :quiet_time,
       :start_time,
       :timezone)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13036,6 +13707,7 @@ module Aws::Pinpoint
     #
     class SegmentBehaviors < Struct.new(
       :recency)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13057,6 +13729,7 @@ module Aws::Pinpoint
     #
     class SegmentCondition < Struct.new(
       :segment_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13128,6 +13801,7 @@ module Aws::Pinpoint
       :make,
       :model,
       :platform)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13239,6 +13913,7 @@ module Aws::Pinpoint
       :location,
       :metrics,
       :user_attributes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13364,6 +14039,7 @@ module Aws::Pinpoint
       :source_segments,
       :source_type,
       :type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13473,6 +14149,7 @@ module Aws::Pinpoint
     class SegmentGroupList < Struct.new(
       :groups,
       :include)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13524,6 +14201,7 @@ module Aws::Pinpoint
       :role_arn,
       :s3_url,
       :size)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13560,6 +14238,7 @@ module Aws::Pinpoint
     class SegmentLocation < Struct.new(
       :country,
       :gps_point)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13586,6 +14265,7 @@ module Aws::Pinpoint
     class SegmentReference < Struct.new(
       :id,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13670,6 +14350,7 @@ module Aws::Pinpoint
       :segment_type,
       :tags,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13693,6 +14374,7 @@ module Aws::Pinpoint
     class SegmentsResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13705,7 +14387,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",
     #               },
@@ -13922,6 +14604,7 @@ module Aws::Pinpoint
     class SendMessagesRequest < Struct.new(
       :application_id,
       :message_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -13934,6 +14617,7 @@ module Aws::Pinpoint
     #
     class SendMessagesResponse < Struct.new(
       :message_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14174,6 +14858,7 @@ module Aws::Pinpoint
       :template_configuration,
       :trace_id,
       :users)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14202,6 +14887,7 @@ module Aws::Pinpoint
       :application_id,
       :request_id,
       :result)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14418,6 +15104,7 @@ module Aws::Pinpoint
     class SendUsersMessagesRequest < Struct.new(
       :application_id,
       :send_users_message_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14430,6 +15117,7 @@ module Aws::Pinpoint
     #
     class SendUsersMessagesResponse < Struct.new(
       :send_users_message_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14468,6 +15156,7 @@ module Aws::Pinpoint
       :id,
       :start_timestamp,
       :stop_timestamp)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14499,6 +15188,7 @@ module Aws::Pinpoint
     class SetDimension < Struct.new(
       :dimension_type,
       :values)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14619,6 +15309,7 @@ module Aws::Pinpoint
       :event_condition,
       :segment_condition,
       :segment_dimensions)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14666,6 +15357,7 @@ module Aws::Pinpoint
       :html_part,
       :subject,
       :text_part)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14693,6 +15385,7 @@ module Aws::Pinpoint
     class SimpleEmailPart < Struct.new(
       :charset,
       :data)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14725,6 +15418,7 @@ module Aws::Pinpoint
     class StartCondition < Struct.new(
       :description,
       :segment_start_condition)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14753,6 +15447,7 @@ module Aws::Pinpoint
     class TagResourceRequest < Struct.new(
       :resource_arn,
       :tags_model)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14782,6 +15477,7 @@ module Aws::Pinpoint
     #
     class TagsModel < Struct.new(
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14823,6 +15519,7 @@ module Aws::Pinpoint
     class Template < Struct.new(
       :name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14852,6 +15549,7 @@ module Aws::Pinpoint
     #
     class TemplateActiveVersionRequest < Struct.new(
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14904,6 +15602,7 @@ module Aws::Pinpoint
       :push_template,
       :sms_template,
       :voice_template)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -14979,6 +15678,7 @@ module Aws::Pinpoint
       :template_name,
       :template_type,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15031,6 +15731,7 @@ module Aws::Pinpoint
       :template_name,
       :template_type,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15064,6 +15765,7 @@ module Aws::Pinpoint
       :message,
       :next_token,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15087,6 +15789,7 @@ module Aws::Pinpoint
     class TemplatesResponse < Struct.new(
       :item,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15103,6 +15806,7 @@ module Aws::Pinpoint
     class TooManyRequestsException < Struct.new(
       :message,
       :request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15161,6 +15865,7 @@ module Aws::Pinpoint
       :template_configuration,
       :treatment_description,
       :treatment_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15183,6 +15888,7 @@ module Aws::Pinpoint
     class UntagResourceRequest < Struct.new(
       :resource_arn,
       :tag_keys)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15211,6 +15917,7 @@ module Aws::Pinpoint
     class UpdateAdmChannelRequest < Struct.new(
       :adm_channel_request,
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15223,6 +15930,7 @@ module Aws::Pinpoint
     #
     class UpdateAdmChannelResponse < Struct.new(
       :adm_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15256,6 +15964,7 @@ module Aws::Pinpoint
     class UpdateApnsChannelRequest < Struct.new(
       :apns_channel_request,
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15268,6 +15977,7 @@ module Aws::Pinpoint
     #
     class UpdateApnsChannelResponse < Struct.new(
       :apns_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15301,6 +16011,7 @@ module Aws::Pinpoint
     class UpdateApnsSandboxChannelRequest < Struct.new(
       :apns_sandbox_channel_request,
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15314,6 +16025,7 @@ module Aws::Pinpoint
     #
     class UpdateApnsSandboxChannelResponse < Struct.new(
       :apns_sandbox_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15347,6 +16059,7 @@ module Aws::Pinpoint
     class UpdateApnsVoipChannelRequest < Struct.new(
       :apns_voip_channel_request,
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15359,6 +16072,7 @@ module Aws::Pinpoint
     #
     class UpdateApnsVoipChannelResponse < Struct.new(
       :apns_voip_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15392,6 +16106,7 @@ module Aws::Pinpoint
     class UpdateApnsVoipSandboxChannelRequest < Struct.new(
       :apns_voip_sandbox_channel_request,
       :application_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15405,6 +16120,7 @@ module Aws::Pinpoint
     #
     class UpdateApnsVoipSandboxChannelResponse < Struct.new(
       :apns_voip_sandbox_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15445,6 +16161,7 @@ module Aws::Pinpoint
     class UpdateApplicationSettingsRequest < Struct.new(
       :application_id,
       :write_application_settings_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15457,6 +16174,7 @@ module Aws::Pinpoint
     #
     class UpdateApplicationSettingsResponse < Struct.new(
       :application_settings_resource)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15482,6 +16200,7 @@ module Aws::Pinpoint
     #
     class UpdateAttributesRequest < Struct.new(
       :blacklist)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15510,6 +16229,7 @@ module Aws::Pinpoint
     class UpdateBaiduChannelRequest < Struct.new(
       :application_id,
       :baidu_channel_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15522,6 +16242,7 @@ module Aws::Pinpoint
     #
     class UpdateBaiduChannelResponse < Struct.new(
       :baidu_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15536,7 +16257,7 @@ module Aws::Pinpoint
     #             {
     #               custom_delivery_configuration: {
     #                 delivery_uri: "__string", # required
-    #                 endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #                 endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #               },
     #               message_configuration: {
     #                 adm_message: {
@@ -15681,7 +16402,7 @@ module Aws::Pinpoint
     #           ],
     #           custom_delivery_configuration: {
     #             delivery_uri: "__string", # required
-    #             endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #             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,
@@ -15860,6 +16581,7 @@ module Aws::Pinpoint
       :application_id,
       :campaign_id,
       :write_campaign_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15872,6 +16594,7 @@ module Aws::Pinpoint
     #
     class UpdateCampaignResponse < Struct.new(
       :campaign_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15902,6 +16625,7 @@ module Aws::Pinpoint
     class UpdateEmailChannelRequest < Struct.new(
       :application_id,
       :email_channel_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15914,6 +16638,7 @@ module Aws::Pinpoint
     #
     class UpdateEmailChannelResponse < Struct.new(
       :email_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15958,6 +16683,7 @@ module Aws::Pinpoint
       :email_template_request,
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15969,6 +16695,7 @@ module Aws::Pinpoint
     #
     class UpdateEmailTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -15983,7 +16710,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",
@@ -16034,6 +16761,7 @@ module Aws::Pinpoint
       :application_id,
       :endpoint_id,
       :endpoint_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16045,6 +16773,7 @@ module Aws::Pinpoint
     #
     class UpdateEndpointResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16060,7 +16789,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",
@@ -16111,6 +16840,7 @@ module Aws::Pinpoint
     class UpdateEndpointsBatchRequest < Struct.new(
       :application_id,
       :endpoint_batch_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16122,6 +16852,7 @@ module Aws::Pinpoint
     #
     class UpdateEndpointsBatchResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16151,6 +16882,7 @@ module Aws::Pinpoint
     class UpdateGcmChannelRequest < Struct.new(
       :application_id,
       :gcm_channel_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16165,6 +16897,7 @@ module Aws::Pinpoint
     #
     class UpdateGcmChannelResponse < Struct.new(
       :gcm_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16177,6 +16910,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: [
@@ -16397,6 +17140,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: [
     #                   {
@@ -16405,6 +17156,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: {
@@ -16460,6 +17220,7 @@ module Aws::Pinpoint
       :application_id,
       :journey_id,
       :write_journey_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16472,6 +17233,7 @@ module Aws::Pinpoint
     #
     class UpdateJourneyResponse < Struct.new(
       :journey_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16502,6 +17264,7 @@ module Aws::Pinpoint
       :application_id,
       :journey_id,
       :journey_state_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16514,6 +17277,7 @@ module Aws::Pinpoint
     #
     class UpdateJourneyStateResponse < Struct.new(
       :journey_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16605,6 +17369,7 @@ module Aws::Pinpoint
       :push_notification_template_request,
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16616,6 +17381,7 @@ module Aws::Pinpoint
     #
     class UpdatePushTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16760,6 +17526,7 @@ module Aws::Pinpoint
       :recommendation_transformer_uri,
       :recommendations_display_name,
       :recommendations_per_message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16796,6 +17563,7 @@ module Aws::Pinpoint
     class UpdateRecommenderConfigurationRequest < Struct.new(
       :recommender_id,
       :update_recommender_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16808,6 +17576,7 @@ module Aws::Pinpoint
     #
     class UpdateRecommenderConfigurationResponse < Struct.new(
       :recommender_configuration_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -16990,6 +17759,7 @@ module Aws::Pinpoint
       :application_id,
       :segment_id,
       :write_segment_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17002,6 +17772,7 @@ module Aws::Pinpoint
     #
     class UpdateSegmentResponse < Struct.new(
       :segment_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17030,6 +17801,7 @@ module Aws::Pinpoint
     class UpdateSmsChannelRequest < Struct.new(
       :application_id,
       :sms_channel_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17042,6 +17814,7 @@ module Aws::Pinpoint
     #
     class UpdateSmsChannelResponse < Struct.new(
       :sms_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17084,6 +17857,7 @@ module Aws::Pinpoint
       :sms_template_request,
       :template_name,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17095,6 +17869,7 @@ module Aws::Pinpoint
     #
     class UpdateSmsTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17126,6 +17901,7 @@ module Aws::Pinpoint
       :template_active_version_request,
       :template_name,
       :template_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17137,6 +17913,7 @@ module Aws::Pinpoint
     #
     class UpdateTemplateActiveVersionResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17163,6 +17940,7 @@ module Aws::Pinpoint
     class UpdateVoiceChannelRequest < Struct.new(
       :application_id,
       :voice_channel_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17175,6 +17953,7 @@ module Aws::Pinpoint
     #
     class UpdateVoiceChannelResponse < Struct.new(
       :voice_channel_response)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17218,6 +17997,7 @@ module Aws::Pinpoint
       :template_name,
       :version,
       :voice_template_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17229,6 +18009,7 @@ module Aws::Pinpoint
     #
     class UpdateVoiceTemplateResponse < Struct.new(
       :message_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17250,6 +18031,7 @@ module Aws::Pinpoint
     #
     class VoiceChannelRequest < Struct.new(
       :enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17315,6 +18097,7 @@ module Aws::Pinpoint
       :last_modified_date,
       :platform,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17378,6 +18161,7 @@ module Aws::Pinpoint
       :origination_number,
       :substitutions,
       :voice_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17453,6 +18237,7 @@ module Aws::Pinpoint
       :tags,
       :template_description,
       :voice_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17547,6 +18332,7 @@ module Aws::Pinpoint
       :template_type,
       :version,
       :voice_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17580,6 +18366,7 @@ module Aws::Pinpoint
     class WaitActivity < Struct.new(
       :next_activity,
       :wait_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17612,6 +18399,7 @@ module Aws::Pinpoint
     class WaitTime < Struct.new(
       :wait_for,
       :wait_until)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17708,6 +18496,7 @@ module Aws::Pinpoint
       :cloud_watch_metrics_enabled,
       :limits,
       :quiet_time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -17721,7 +18510,7 @@ module Aws::Pinpoint
     #           {
     #             custom_delivery_configuration: {
     #               delivery_uri: "__string", # required
-    #               endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #               endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #             },
     #             message_configuration: {
     #               adm_message: {
@@ -17866,7 +18655,7 @@ module Aws::Pinpoint
     #         ],
     #         custom_delivery_configuration: {
     #           delivery_uri: "__string", # required
-    #           endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #           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,
@@ -18124,6 +18913,7 @@ module Aws::Pinpoint
       :template_configuration,
       :treatment_description,
       :treatment_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -18162,6 +18952,7 @@ module Aws::Pinpoint
     class WriteEventStream < Struct.new(
       :destination_stream_arn,
       :role_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -18173,6 +18964,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: [
@@ -18393,6 +19194,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: [
     #                 {
@@ -18401,6 +19210,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: {
@@ -18545,6 +19363,7 @@ module Aws::Pinpoint
       :start_activity,
       :start_condition,
       :state)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -18737,6 +19556,7 @@ module Aws::Pinpoint
       :name,
       :segment_groups,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -18749,7 +19569,7 @@ module Aws::Pinpoint
     #       {
     #         custom_delivery_configuration: {
     #           delivery_uri: "__string", # required
-    #           endpoint_types: ["GCM"], # accepts GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
+    #           endpoint_types: ["PUSH"], # accepts PUSH, GCM, APNS, APNS_SANDBOX, APNS_VOIP, APNS_VOIP_SANDBOX, ADM, SMS, VOICE, EMAIL, BAIDU, CUSTOM
     #         },
     #         message_configuration: {
     #           adm_message: {
@@ -18934,6 +19754,7 @@ module Aws::Pinpoint
       :template_configuration,
       :treatment_description,
       :treatment_name)
+      SENSITIVE = []
       include Aws::Structure
     end