aws-sdk-firehose 1.0.0.rc13 → 1.0.0.rc14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee438a409b6b25c6ab0f42a1e04faff493f7838
-  data.tar.gz: c85865fdd5bc796903baf70751c495dc4492157f
+  metadata.gz: 3ca7250a5f2ae17471f564ce6d9661628c9b79fa
+  data.tar.gz: 2533dd5d1e0f468de1bfcaa02c0687ac77af4fba
 SHA512:
-  metadata.gz: f995d7d7b0bc24fd5432c951558f9b8cd66255325926152147ee880c80d515e2394bcf16ca686779c6c4b1452d3d24fc196c910cfc2c98c9d6f61f5bada9ec15
-  data.tar.gz: 39e7f1266cdea01f126ee9b4cd1c37cac26f39231ac43aacec2c6752ff982b2727207649d29d8e418bca9a6f5377144b929117b2860b65c21117609cece633a1
+  metadata.gz: 43e33303e3c6a1a0af545d308c04017789299fceac977759eddc8107add62eff0687178721a3572ca94a5c3cb2e57c4c1636caedbc4bafa39f943ed722e3117f
+  data.tar.gz: 1243e4979d9907bcb6c9d3739f56991fe36a2501465d86d162e0d4f60ad4c60f923acf5c04cb48b73c510a3b98d9a2183313a1979c11508421e27110d655c0ea

data/lib/aws-sdk-firehose.rb

@@ -42,6 +42,6 @@ require_relative 'aws-sdk-firehose/customizations'
 # @service
 module Aws::Firehose
 
-  GEM_VERSION = '1.0.0.rc13'
+  GEM_VERSION = '1.0.0.rc14'
 
 end

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

@@ -166,9 +166,16 @@ module Aws::Firehose
     # `ACTIVE` state cause an exception. To check the state of a delivery
     # stream, use DescribeDeliveryStream.
     #
+    # A Kinesis Firehose delivery stream can be configured to receive
+    # records directly from providers using PutRecord or PutRecordBatch, or
+    # it can be configured to use an existing Kinesis stream as its source.
+    # To specify a Kinesis stream as input, set the `DeliveryStreamType`
+    # parameter to `KinesisStreamAsSource`, and provide the Kinesis stream
+    # ARN and role ARN in the `KinesisStreamSourceConfiguration` parameter.
+    #
     # A delivery stream is configured with a single destination: Amazon S3,
-    # Amazon Elasticsearch Service, or Amazon Redshift. You must specify
-    # only one of the following destination configuration parameters:
+    # Amazon ES, or Amazon Redshift. You must specify only one of the
+    # following destination configuration parameters:
     # **ExtendedS3DestinationConfiguration**,
     # **S3DestinationConfiguration**,
     # **ElasticsearchDestinationConfiguration**, or
@@ -177,10 +184,10 @@ module Aws::Firehose
     # When you specify **S3DestinationConfiguration**, you can also provide
     # the following optional values: **BufferingHints**,
     # **EncryptionConfiguration**, and **CompressionFormat**. By default, if
-    # no **BufferingHints** value is provided, Firehose buffers data up to 5
-    # MB or for 5 minutes, whichever condition is satisfied first. Note that
-    # **BufferingHints** is a hint, so there are some cases where the
-    # service cannot adhere to these conditions strictly; for example,
+    # no **BufferingHints** value is provided, Kinesis Firehose buffers data
+    # up to 5 MB or for 5 minutes, whichever condition is satisfied first.
+    # Note that **BufferingHints** is a hint, so there are some cases where
+    # the service cannot adhere to these conditions strictly; for example,
     # record boundaries are such that the size is a little over or under the
     # configured buffering size. By default, no encryption is performed. We
     # strongly recommend that you enable encryption to ensure secure data
@@ -189,10 +196,10 @@ module Aws::Firehose
     # A few notes about Amazon Redshift as a destination:
     #
     # * An Amazon Redshift destination requires an S3 bucket as intermediate
-    #   location, as Firehose first delivers data to S3 and then uses `COPY`
-    #   syntax to load data into an Amazon Redshift table. This is specified
-    #   in the **RedshiftDestinationConfiguration.S3Configuration**
-    #   parameter.
+    #   location, as Kinesis Firehose first delivers data to S3 and then
+    #   uses `COPY` syntax to load data into an Amazon Redshift table. This
+    #   is specified in the
+    #   **RedshiftDestinationConfiguration.S3Configuration** parameter.
     #
     # * The compression formats `SNAPPY` or `ZIP` cannot be specified in
     #   **RedshiftDestinationConfiguration.S3Configuration** because the
@@ -200,14 +207,15 @@ module Aws::Firehose
     #   doesn't support these compression formats.
     #
     # * We strongly recommend that you use the user name and password you
-    #   provide exclusively with Firehose, and that the permissions for the
-    #   account are restricted for Amazon Redshift `INSERT` permissions.
+    #   provide exclusively with Kinesis Firehose, and that the permissions
+    #   for the account are restricted for Amazon Redshift `INSERT`
+    #   permissions.
     #
-    # Firehose assumes the IAM role that is configured as part of the
-    # destination. The role should allow the Firehose principal to assume
-    # the role, and the role should have permissions that allows the service
-    # to deliver the data. For more information, see [Amazon S3 Bucket
-    # Access][1] in the *Amazon Kinesis Firehose Developer Guide*.
+    # Kinesis Firehose assumes the IAM role that is configured as part of
+    # the destination. The role should allow the Kinesis Firehose principal
+    # to assume the role, and the role should have permissions that allow
+    # the service to deliver the data. For more information, see [Amazon S3
+    # Bucket Access][1] in the *Amazon Kinesis Firehose Developer Guide*.
     #
     #
     #
@@ -215,9 +223,24 @@ module Aws::Firehose
     #
     # @option params [required, String] :delivery_stream_name
     #   The name of the delivery stream. This name must be unique per AWS
-    #   account in the same region. You can have multiple delivery streams
-    #   with the same name if they are in different accounts or different
-    #   regions.
+    #   account in the same region. If the delivery streams are in different
+    #   accounts or different regions, you can have multiple delivery streams
+    #   with the same name.
+    #
+    # @option params [String] :delivery_stream_type
+    #   The delivery stream type. This parameter can be one of the following
+    #   values:
+    #
+    #   * `DirectPut`\: Provider applications access the delivery stream
+    #     directly.
+    #
+    #   * `KinesisStreamAsSource`\: The delivery stream uses a Kinesis stream
+    #     as a source.
+    #
+    # @option params [Types::KinesisStreamSourceConfiguration] :kinesis_stream_source_configuration
+    #   When a Kinesis stream is used as the source for the delivery stream, a
+    #   KinesisStreamSourceConfiguration containing the Kinesis stream ARN and
+    #   the role ARN for the source stream.
     #
     # @option params [Types::S3DestinationConfiguration] :s3_destination_configuration
     #   \[Deprecated\] The destination in Amazon S3. You can specify only one
@@ -241,6 +264,11 @@ module Aws::Firehose
     #
     #   resp = client.create_delivery_stream({
     #     delivery_stream_name: "DeliveryStreamName", # required
+    #     delivery_stream_type: "DirectPut", # accepts DirectPut, KinesisStreamAsSource
+    #     kinesis_stream_source_configuration: {
+    #       kinesis_stream_arn: "KinesisStreamARN", # required
+    #       role_arn: "RoleARN", # required
+    #     },
     #     s3_destination_configuration: {
     #       role_arn: "RoleARN", # required
     #       bucket_arn: "BucketARN", # required
@@ -513,8 +541,8 @@ module Aws::Firehose
     #
     # @option params [String] :exclusive_start_destination_id
     #   The ID of the destination to start returning the destination
-    #   information. Currently Firehose supports one destination per delivery
-    #   stream.
+    #   information. Currently, Kinesis Firehose supports one destination per
+    #   delivery stream.
     #
     # @return [Types::DescribeDeliveryStreamOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -533,9 +561,13 @@ module Aws::Firehose
     #   resp.delivery_stream_description.delivery_stream_name #=> String
     #   resp.delivery_stream_description.delivery_stream_arn #=> String
     #   resp.delivery_stream_description.delivery_stream_status #=> String, one of "CREATING", "DELETING", "ACTIVE"
+    #   resp.delivery_stream_description.delivery_stream_type #=> String, one of "DirectPut", "KinesisStreamAsSource"
     #   resp.delivery_stream_description.version_id #=> String
     #   resp.delivery_stream_description.create_timestamp #=> Time
     #   resp.delivery_stream_description.last_update_timestamp #=> Time
+    #   resp.delivery_stream_description.source.kinesis_stream_source_description.kinesis_stream_arn #=> String
+    #   resp.delivery_stream_description.source.kinesis_stream_source_description.role_arn #=> String
+    #   resp.delivery_stream_description.source.kinesis_stream_source_description.delivery_start_timestamp #=> Time
     #   resp.delivery_stream_description.destinations #=> Array
     #   resp.delivery_stream_description.destinations[0].destination_id #=> String
     #   resp.delivery_stream_description.destinations[0].s3_destination_description.role_arn #=> String
@@ -657,6 +689,36 @@ module Aws::Firehose
       req.send_request(options)
     end
 
+    # @option params [required, String] :delivery_stream_arn
+    #
+    # @return [Types::GetKinesisStreamOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetKinesisStreamOutput#kinesis_stream_arn #kinesis_stream_arn} => String
+    #   * {Types::GetKinesisStreamOutput#credentials_for_reading_kinesis_stream #credentials_for_reading_kinesis_stream} => Types::SessionCredentials
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_kinesis_stream({
+    #     delivery_stream_arn: "DeliveryStreamARN", # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.kinesis_stream_arn #=> String
+    #   resp.credentials_for_reading_kinesis_stream.access_key_id #=> String
+    #   resp.credentials_for_reading_kinesis_stream.secret_access_key #=> String
+    #   resp.credentials_for_reading_kinesis_stream.session_token #=> String
+    #   resp.credentials_for_reading_kinesis_stream.expiration #=> Time
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/GetKinesisStream AWS API Documentation
+    #
+    # @overload get_kinesis_stream(params = {})
+    # @param [Hash] params ({})
+    def get_kinesis_stream(params = {}, options = {})
+      req = build_request(:get_kinesis_stream, params)
+      req.send_request(options)
+    end
+
     # Lists your delivery streams.
     #
     # The number of delivery streams might be too large to return using a
@@ -671,6 +733,18 @@ module Aws::Firehose
     # @option params [Integer] :limit
     #   The maximum number of delivery streams to list.
     #
+    # @option params [String] :delivery_stream_type
+    #   The delivery stream type. This can be one of the following values:
+    #
+    #   * `DirectPut`\: Provider applications access the delivery stream
+    #     directly.
+    #
+    #   * `KinesisStreamAsSource`\: The delivery stream uses a Kinesis stream
+    #     as a source.
+    #
+    #   This parameter is optional. If this parameter is omitted, delivery
+    #   streams of all types are returned.
+    #
     # @option params [String] :exclusive_start_delivery_stream_name
     #   The name of the delivery stream to start the list with.
     #
@@ -683,6 +757,7 @@ module Aws::Firehose
     #
     #   resp = client.list_delivery_streams({
     #     limit: 1,
+    #     delivery_stream_type: "DirectPut", # accepts DirectPut, KinesisStreamAsSource
     #     exclusive_start_delivery_stream_name: "DeliveryStreamName",
     #   })
     #
@@ -716,15 +791,15 @@ module Aws::Firehose
     # You must specify the name of the delivery stream and the data record
     # when using PutRecord. The data record consists of a data blob that can
     # be up to 1,000 KB in size, and any kind of data, for example, a
-    # segment from a log file, geographic location data, web site
-    # clickstream data, etc.
+    # segment from a log file, geographic location data, website clickstream
+    # data, and so on.
     #
-    # Firehose buffers records before delivering them to the destination. To
-    # disambiguate the data blobs at the destination, a common solution is
-    # to use delimiters in the data, such as a newline (`\n`) or some other
-    # character unique within the data. This allows the consumer
-    # application(s) to parse individual data items when reading the data
-    # from the destination.
+    # Kinesis Firehose buffers records before delivering them to the
+    # destination. To disambiguate the data blobs at the destination, a
+    # common solution is to use delimiters in the data, such as a newline
+    # (`\n`) or some other character unique within the data. This allows the
+    # consumer application to parse individual data items when reading the
+    # data from the destination.
     #
     # The PutRecord operation returns a **RecordId**, which is a unique
     # string assigned to each record. Producer applications can use this ID
@@ -734,10 +809,10 @@ module Aws::Firehose
     # back off and retry. If the exception persists, it is possible that the
     # throughput limits have been exceeded for the delivery stream.
     #
-    # Data records sent to Firehose are stored for 24 hours from the time
-    # they are added to a delivery stream as it attempts to send the records
-    # to the destination. If the destination is unreachable for more than 24
-    # hours, the data is no longer available.
+    # Data records sent to Kinesis Firehose are stored for 24 hours from the
+    # time they are added to a delivery stream as it attempts to send the
+    # records to the destination. If the destination is unreachable for more
+    # than 24 hours, the data is no longer available.
     #
     #
     #
@@ -782,10 +857,10 @@ module Aws::Firehose
     # producers.
     #
     # By default, each delivery stream can take in up to 2,000 transactions
-    # per second, 5,000 records per second, or 5 MB per second. Note that if
-    # you use PutRecord and PutRecordBatch, the limits are an aggregate
-    # across these two operations for each delivery stream. For more
-    # information about limits, see [Amazon Kinesis Firehose Limits][1].
+    # per second, 5,000 records per second, or 5 MB per second. If you use
+    # PutRecord and PutRecordBatch, the limits are an aggregate across these
+    # two operations for each delivery stream. For more information about
+    # limits, see [Amazon Kinesis Firehose Limits][1].
     #
     # Each PutRecordBatch request supports up to 500 records. Each record in
     # the request can be as large as 1,000 KB (before 64-bit encoding), up
@@ -794,27 +869,28 @@ module Aws::Firehose
     #
     # You must specify the name of the delivery stream and the data record
     # when using PutRecord. The data record consists of a data blob that can
-    # be up to 1,000 KB in size, and any kind of data, for example, a
-    # segment from a log file, geographic location data, web site
+    # be up to 1,000 KB in size, and any kind of data. For example, it could
+    # be a segment from a log file, geographic location data, web site
     # clickstream data, and so on.
     #
-    # Firehose buffers records before delivering them to the destination. To
-    # disambiguate the data blobs at the destination, a common solution is
-    # to use delimiters in the data, such as a newline (`\n`) or some other
-    # character unique within the data. This allows the consumer
-    # application(s) to parse individual data items when reading the data
-    # from the destination.
+    # Kinesis Firehose buffers records before delivering them to the
+    # destination. To disambiguate the data blobs at the destination, a
+    # common solution is to use delimiters in the data, such as a newline
+    # (`\n`) or some other character unique within the data. This allows the
+    # consumer application to parse individual data items when reading the
+    # data from the destination.
     #
     # The PutRecordBatch response includes a count of failed records,
     # **FailedPutCount**, and an array of responses, **RequestResponses**.
     # Each entry in the **RequestResponses** array provides additional
-    # information about the processed record, and directly correlates with a
+    # information about the processed record. It directly correlates with a
     # record in the request array using the same ordering, from the top to
     # the bottom. The response array always includes the same number of
     # records as the request array. **RequestResponses** includes both
-    # successfully and unsuccessfully processed records. Firehose attempts
-    # to process all records in each PutRecordBatch request. A single record
-    # failure does not stop the processing of subsequent records.
+    # successfully and unsuccessfully processed records. Kinesis Firehose
+    # attempts to process all records in each PutRecordBatch request. A
+    # single record failure does not stop the processing of subsequent
+    # records.
     #
     # A successfully processed record includes a **RecordId** value, which
     # is unique for the record. An unsuccessfully processed record includes
@@ -835,10 +911,10 @@ module Aws::Firehose
     # retry. If the exception persists, it is possible that the throughput
     # limits have been exceeded for the delivery stream.
     #
-    # Data records sent to Firehose are stored for 24 hours from the time
-    # they are added to a delivery stream as it attempts to send the records
-    # to the destination. If the destination is unreachable for more than 24
-    # hours, the data is no longer available.
+    # Data records sent to Kinesis Firehose are stored for 24 hours from the
+    # time they are added to a delivery stream as it attempts to send the
+    # records to the destination. If the destination is unreachable for more
+    # than 24 hours, the data is no longer available.
     #
     #
     #
@@ -898,24 +974,25 @@ module Aws::Firehose
     # supported. For an Amazon ES destination, you can only update to
     # another Amazon ES destination.
     #
-    # If the destination type is the same, Firehose merges the configuration
-    # parameters specified with the destination configuration that already
-    # exists on the delivery stream. If any of the parameters are not
-    # specified in the call, the existing values are retained. For example,
-    # in the Amazon S3 destination, if EncryptionConfiguration is not
-    # specified then the existing EncryptionConfiguration is maintained on
-    # the destination.
+    # If the destination type is the same, Kinesis Firehose merges the
+    # configuration parameters specified with the destination configuration
+    # that already exists on the delivery stream. If any of the parameters
+    # are not specified in the call, the existing values are retained. For
+    # example, in the Amazon S3 destination, if EncryptionConfiguration is
+    # not specified, then the existing EncryptionConfiguration is maintained
+    # on the destination.
     #
     # If the destination type is not the same, for example, changing the
-    # destination from Amazon S3 to Amazon Redshift, Firehose does not merge
-    # any parameters. In this case, all parameters must be specified.
+    # destination from Amazon S3 to Amazon Redshift, Kinesis Firehose does
+    # not merge any parameters. In this case, all parameters must be
+    # specified.
     #
-    # Firehose uses **CurrentDeliveryStreamVersionId** to avoid race
+    # Kinesis Firehose uses **CurrentDeliveryStreamVersionId** to avoid race
     # conditions and conflicting merges. This is a required field, and the
     # service updates the configuration only if the existing configuration
     # has a version ID that matches. After the update is applied
     # successfully, the version ID is updated, and can be retrieved using
-    # DescribeDeliveryStream. You should use the new version ID to set
+    # DescribeDeliveryStream. Use the new version ID to set
     # **CurrentDeliveryStreamVersionId** in the next call.
     #
     # @option params [required, String] :delivery_stream_name
@@ -924,7 +1001,7 @@ module Aws::Firehose
     # @option params [required, String] :current_delivery_stream_version_id
     #   Obtain this value from the **VersionId** result of
     #   DeliveryStreamDescription. This value is required, and helps the
-    #   service to perform conditional operations. For example, if there is a
+    #   service to perform conditional operations. For example, if there is an
     #   interleaving update and this value is null, then the update
     #   destination fails. After the update is successful, the **VersionId**
     #   value is updated. The service then performs a merge of the old
@@ -1185,7 +1262,7 @@ module Aws::Firehose
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-firehose'
-      context[:gem_version] = '1.0.0.rc13'
+      context[:gem_version] = '1.0.0.rc14'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -12,6 +12,7 @@ module Aws::Firehose
     include Seahorse::Model
 
     AWSKMSKeyARN = Shapes::StringShape.new(name: 'AWSKMSKeyARN')
+    AccessKeyId = Shapes::StringShape.new(name: 'AccessKeyId')
     BooleanObject = Shapes::BooleanShape.new(name: 'BooleanObject')
     BucketARN = Shapes::StringShape.new(name: 'BucketARN')
     BufferingHints = Shapes::StructureShape.new(name: 'BufferingHints')
@@ -28,11 +29,13 @@ module Aws::Firehose
     DataTableName = Shapes::StringShape.new(name: 'DataTableName')
     DeleteDeliveryStreamInput = Shapes::StructureShape.new(name: 'DeleteDeliveryStreamInput')
     DeleteDeliveryStreamOutput = Shapes::StructureShape.new(name: 'DeleteDeliveryStreamOutput')
+    DeliveryStartTimestamp = Shapes::TimestampShape.new(name: 'DeliveryStartTimestamp')
     DeliveryStreamARN = Shapes::StringShape.new(name: 'DeliveryStreamARN')
     DeliveryStreamDescription = Shapes::StructureShape.new(name: 'DeliveryStreamDescription')
     DeliveryStreamName = Shapes::StringShape.new(name: 'DeliveryStreamName')
     DeliveryStreamNameList = Shapes::ListShape.new(name: 'DeliveryStreamNameList')
     DeliveryStreamStatus = Shapes::StringShape.new(name: 'DeliveryStreamStatus')
+    DeliveryStreamType = Shapes::StringShape.new(name: 'DeliveryStreamType')
     DeliveryStreamVersionId = Shapes::StringShape.new(name: 'DeliveryStreamVersionId')
     DescribeDeliveryStreamInput = Shapes::StructureShape.new(name: 'DescribeDeliveryStreamInput')
     DescribeDeliveryStreamInputLimit = Shapes::IntegerShape.new(name: 'DescribeDeliveryStreamInputLimit')
@@ -59,9 +62,16 @@ module Aws::Firehose
     ExtendedS3DestinationConfiguration = Shapes::StructureShape.new(name: 'ExtendedS3DestinationConfiguration')
     ExtendedS3DestinationDescription = Shapes::StructureShape.new(name: 'ExtendedS3DestinationDescription')
     ExtendedS3DestinationUpdate = Shapes::StructureShape.new(name: 'ExtendedS3DestinationUpdate')
+    FirehoseSource = Shapes::StringShape.new(name: 'FirehoseSource')
+    GetKinesisStreamInput = Shapes::StructureShape.new(name: 'GetKinesisStreamInput')
+    GetKinesisStreamOutput = Shapes::StructureShape.new(name: 'GetKinesisStreamOutput')
     IntervalInSeconds = Shapes::IntegerShape.new(name: 'IntervalInSeconds')
     InvalidArgumentException = Shapes::StructureShape.new(name: 'InvalidArgumentException')
+    InvalidStreamTypeException = Shapes::StructureShape.new(name: 'InvalidStreamTypeException')
     KMSEncryptionConfig = Shapes::StructureShape.new(name: 'KMSEncryptionConfig')
+    KinesisStreamARN = Shapes::StringShape.new(name: 'KinesisStreamARN')
+    KinesisStreamSourceConfiguration = Shapes::StructureShape.new(name: 'KinesisStreamSourceConfiguration')
+    KinesisStreamSourceDescription = Shapes::StructureShape.new(name: 'KinesisStreamSourceDescription')
     LimitExceededException = Shapes::StructureShape.new(name: 'LimitExceededException')
     ListDeliveryStreamsInput = Shapes::StructureShape.new(name: 'ListDeliveryStreamsInput')
     ListDeliveryStreamsInputLimit = Shapes::IntegerShape.new(name: 'ListDeliveryStreamsInputLimit')
@@ -102,8 +112,12 @@ module Aws::Firehose
     S3DestinationConfiguration = Shapes::StructureShape.new(name: 'S3DestinationConfiguration')
     S3DestinationDescription = Shapes::StructureShape.new(name: 'S3DestinationDescription')
     S3DestinationUpdate = Shapes::StructureShape.new(name: 'S3DestinationUpdate')
+    SecretAccessKey = Shapes::StringShape.new(name: 'SecretAccessKey')
     ServiceUnavailableException = Shapes::StructureShape.new(name: 'ServiceUnavailableException')
+    SessionCredentials = Shapes::StructureShape.new(name: 'SessionCredentials')
+    SessionToken = Shapes::StringShape.new(name: 'SessionToken')
     SizeInMBs = Shapes::IntegerShape.new(name: 'SizeInMBs')
+    SourceDescription = Shapes::StructureShape.new(name: 'SourceDescription')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
     UpdateDestinationInput = Shapes::StructureShape.new(name: 'UpdateDestinationInput')
     UpdateDestinationOutput = Shapes::StructureShape.new(name: 'UpdateDestinationOutput')
@@ -124,6 +138,8 @@ module Aws::Firehose
     CopyCommand.struct_class = Types::CopyCommand
 
     CreateDeliveryStreamInput.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
+    CreateDeliveryStreamInput.add_member(:delivery_stream_type, Shapes::ShapeRef.new(shape: DeliveryStreamType, location_name: "DeliveryStreamType"))
+    CreateDeliveryStreamInput.add_member(:kinesis_stream_source_configuration, Shapes::ShapeRef.new(shape: KinesisStreamSourceConfiguration, location_name: "KinesisStreamSourceConfiguration"))
     CreateDeliveryStreamInput.add_member(:s3_destination_configuration, Shapes::ShapeRef.new(shape: S3DestinationConfiguration, deprecated: true, location_name: "S3DestinationConfiguration"))
     CreateDeliveryStreamInput.add_member(:extended_s3_destination_configuration, Shapes::ShapeRef.new(shape: ExtendedS3DestinationConfiguration, location_name: "ExtendedS3DestinationConfiguration"))
     CreateDeliveryStreamInput.add_member(:redshift_destination_configuration, Shapes::ShapeRef.new(shape: RedshiftDestinationConfiguration, location_name: "RedshiftDestinationConfiguration"))
@@ -141,9 +157,11 @@ module Aws::Firehose
     DeliveryStreamDescription.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
     DeliveryStreamDescription.add_member(:delivery_stream_arn, Shapes::ShapeRef.new(shape: DeliveryStreamARN, required: true, location_name: "DeliveryStreamARN"))
     DeliveryStreamDescription.add_member(:delivery_stream_status, Shapes::ShapeRef.new(shape: DeliveryStreamStatus, required: true, location_name: "DeliveryStreamStatus"))
+    DeliveryStreamDescription.add_member(:delivery_stream_type, Shapes::ShapeRef.new(shape: DeliveryStreamType, required: true, location_name: "DeliveryStreamType"))
     DeliveryStreamDescription.add_member(:version_id, Shapes::ShapeRef.new(shape: DeliveryStreamVersionId, required: true, location_name: "VersionId"))
     DeliveryStreamDescription.add_member(:create_timestamp, Shapes::ShapeRef.new(shape: Timestamp, location_name: "CreateTimestamp"))
     DeliveryStreamDescription.add_member(:last_update_timestamp, Shapes::ShapeRef.new(shape: Timestamp, location_name: "LastUpdateTimestamp"))
+    DeliveryStreamDescription.add_member(:source, Shapes::ShapeRef.new(shape: SourceDescription, location_name: "Source"))
     DeliveryStreamDescription.add_member(:destinations, Shapes::ShapeRef.new(shape: DestinationDescriptionList, required: true, location_name: "Destinations"))
     DeliveryStreamDescription.add_member(:has_more_destinations, Shapes::ShapeRef.new(shape: BooleanObject, required: true, location_name: "HasMoreDestinations"))
     DeliveryStreamDescription.struct_class = Types::DeliveryStreamDescription
@@ -252,10 +270,27 @@ module Aws::Firehose
     ExtendedS3DestinationUpdate.add_member(:s3_backup_update, Shapes::ShapeRef.new(shape: S3DestinationUpdate, location_name: "S3BackupUpdate"))
     ExtendedS3DestinationUpdate.struct_class = Types::ExtendedS3DestinationUpdate
 
+    GetKinesisStreamInput.add_member(:delivery_stream_arn, Shapes::ShapeRef.new(shape: DeliveryStreamARN, required: true, location_name: "DeliveryStreamARN"))
+    GetKinesisStreamInput.struct_class = Types::GetKinesisStreamInput
+
+    GetKinesisStreamOutput.add_member(:kinesis_stream_arn, Shapes::ShapeRef.new(shape: KinesisStreamARN, location_name: "KinesisStreamARN"))
+    GetKinesisStreamOutput.add_member(:credentials_for_reading_kinesis_stream, Shapes::ShapeRef.new(shape: SessionCredentials, location_name: "CredentialsForReadingKinesisStream"))
+    GetKinesisStreamOutput.struct_class = Types::GetKinesisStreamOutput
+
     KMSEncryptionConfig.add_member(:awskms_key_arn, Shapes::ShapeRef.new(shape: AWSKMSKeyARN, required: true, location_name: "AWSKMSKeyARN"))
     KMSEncryptionConfig.struct_class = Types::KMSEncryptionConfig
 
+    KinesisStreamSourceConfiguration.add_member(:kinesis_stream_arn, Shapes::ShapeRef.new(shape: KinesisStreamARN, required: true, location_name: "KinesisStreamARN"))
+    KinesisStreamSourceConfiguration.add_member(:role_arn, Shapes::ShapeRef.new(shape: RoleARN, required: true, location_name: "RoleARN"))
+    KinesisStreamSourceConfiguration.struct_class = Types::KinesisStreamSourceConfiguration
+
+    KinesisStreamSourceDescription.add_member(:kinesis_stream_arn, Shapes::ShapeRef.new(shape: KinesisStreamARN, location_name: "KinesisStreamARN"))
+    KinesisStreamSourceDescription.add_member(:role_arn, Shapes::ShapeRef.new(shape: RoleARN, location_name: "RoleARN"))
+    KinesisStreamSourceDescription.add_member(:delivery_start_timestamp, Shapes::ShapeRef.new(shape: DeliveryStartTimestamp, location_name: "DeliveryStartTimestamp"))
+    KinesisStreamSourceDescription.struct_class = Types::KinesisStreamSourceDescription
+
     ListDeliveryStreamsInput.add_member(:limit, Shapes::ShapeRef.new(shape: ListDeliveryStreamsInputLimit, location_name: "Limit"))
+    ListDeliveryStreamsInput.add_member(:delivery_stream_type, Shapes::ShapeRef.new(shape: DeliveryStreamType, location_name: "DeliveryStreamType"))
     ListDeliveryStreamsInput.add_member(:exclusive_start_delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, location_name: "ExclusiveStartDeliveryStreamName"))
     ListDeliveryStreamsInput.struct_class = Types::ListDeliveryStreamsInput
 
@@ -374,6 +409,15 @@ module Aws::Firehose
     S3DestinationUpdate.add_member(:cloud_watch_logging_options, Shapes::ShapeRef.new(shape: CloudWatchLoggingOptions, location_name: "CloudWatchLoggingOptions"))
     S3DestinationUpdate.struct_class = Types::S3DestinationUpdate
 
+    SessionCredentials.add_member(:access_key_id, Shapes::ShapeRef.new(shape: AccessKeyId, required: true, location_name: "AccessKeyId"))
+    SessionCredentials.add_member(:secret_access_key, Shapes::ShapeRef.new(shape: SecretAccessKey, required: true, location_name: "SecretAccessKey"))
+    SessionCredentials.add_member(:session_token, Shapes::ShapeRef.new(shape: SessionToken, required: true, location_name: "SessionToken"))
+    SessionCredentials.add_member(:expiration, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "Expiration"))
+    SessionCredentials.struct_class = Types::SessionCredentials
+
+    SourceDescription.add_member(:kinesis_stream_source_description, Shapes::ShapeRef.new(shape: KinesisStreamSourceDescription, location_name: "KinesisStreamSourceDescription"))
+    SourceDescription.struct_class = Types::SourceDescription
+
     UpdateDestinationInput.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
     UpdateDestinationInput.add_member(:current_delivery_stream_version_id, Shapes::ShapeRef.new(shape: DeliveryStreamVersionId, required: true, location_name: "CurrentDeliveryStreamVersionId"))
     UpdateDestinationInput.add_member(:destination_id, Shapes::ShapeRef.new(shape: DestinationId, required: true, location_name: "DestinationId"))
@@ -430,6 +474,17 @@ module Aws::Firehose
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
       end)
 
+      api.add_operation(:get_kinesis_stream, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetKinesisStream"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetKinesisStreamInput)
+        o.output = Shapes::ShapeRef.new(shape: GetKinesisStreamOutput)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidStreamTypeException)
+      end)
+
       api.add_operation(:list_delivery_streams, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListDeliveryStreams"
         o.http_method = "POST"

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

@@ -10,8 +10,8 @@ module Aws::Firehose
 
     # Describes hints for the buffering to perform before delivering data to
     # the destination. Please note that these options are treated as hints,
-    # and therefore Firehose may choose to use different values when it is
-    # optimal.
+    # and therefore Kinesis Firehose may choose to use different values when
+    # it is optimal.
     #
     # @note When making an API call, you may pass BufferingHints
     #   data as a hash:
@@ -44,7 +44,8 @@ module Aws::Firehose
       include Aws::Structure
     end
 
-    # Describes the CloudWatch logging options for your delivery stream.
+    # Describes the Amazon CloudWatch logging options for your delivery
+    # stream.
     #
     # @note When making an API call, you may pass CloudWatchLoggingOptions
     #   data as a hash:
@@ -102,12 +103,12 @@ module Aws::Firehose
     #   Optional parameters to use with the Amazon Redshift `COPY` command.
     #   For more information, see the "Optional Parameters" section of
     #   [Amazon Redshift COPY command][1]. Some possible examples that would
-    #   apply to Firehose are as follows:
+    #   apply to Kinesis Firehose are as follows:
     #
     #   `delimiter '\t' lzop;` - fields are delimited with "\\t" (TAB
     #   character) and compressed using lzop.
     #
-    #   `delimiter '|` - fields are delimited with "\|" (this is the
+    #   `delimiter '|'` - fields are delimited with "\|" (this is the
     #   default delimiter).
     #
     #   `delimiter '|' escape` - the delimiter should be escaped.
@@ -142,6 +143,11 @@ module Aws::Firehose
     #
     #       {
     #         delivery_stream_name: "DeliveryStreamName", # required
+    #         delivery_stream_type: "DirectPut", # accepts DirectPut, KinesisStreamAsSource
+    #         kinesis_stream_source_configuration: {
+    #           kinesis_stream_arn: "KinesisStreamARN", # required
+    #           role_arn: "RoleARN", # required
+    #         },
     #         s3_destination_configuration: {
     #           role_arn: "RoleARN", # required
     #           bucket_arn: "BucketARN", # required
@@ -355,11 +361,28 @@ module Aws::Firehose
     #
     # @!attribute [rw] delivery_stream_name
     #   The name of the delivery stream. This name must be unique per AWS
-    #   account in the same region. You can have multiple delivery streams
-    #   with the same name if they are in different accounts or different
-    #   regions.
+    #   account in the same region. If the delivery streams are in different
+    #   accounts or different regions, you can have multiple delivery
+    #   streams with the same name.
+    #   @return [String]
+    #
+    # @!attribute [rw] delivery_stream_type
+    #   The delivery stream type. This parameter can be one of the following
+    #   values:
+    #
+    #   * `DirectPut`\: Provider applications access the delivery stream
+    #     directly.
+    #
+    #   * `KinesisStreamAsSource`\: The delivery stream uses a Kinesis
+    #     stream as a source.
     #   @return [String]
     #
+    # @!attribute [rw] kinesis_stream_source_configuration
+    #   When a Kinesis stream is used as the source for the delivery stream,
+    #   a KinesisStreamSourceConfiguration containing the Kinesis stream ARN
+    #   and the role ARN for the source stream.
+    #   @return [Types::KinesisStreamSourceConfiguration]
+    #
     # @!attribute [rw] s3_destination_configuration
     #   \[Deprecated\] The destination in Amazon S3. You can specify only
     #   one destination.
@@ -382,6 +405,8 @@ module Aws::Firehose
     #
     class CreateDeliveryStreamInput < Struct.new(
       :delivery_stream_name,
+      :delivery_stream_type,
+      :kinesis_stream_source_configuration,
       :s3_destination_configuration,
       :extended_s3_destination_configuration,
       :redshift_destination_configuration,
@@ -436,6 +461,16 @@ module Aws::Firehose
     #   The status of the delivery stream.
     #   @return [String]
     #
+    # @!attribute [rw] delivery_stream_type
+    #   The delivery stream type. This can be one of the following values:
+    #
+    #   * `DirectPut`\: Provider applications access the delivery stream
+    #     directly.
+    #
+    #   * `KinesisStreamAsSource`\: The delivery stream uses a Kinesis
+    #     stream as a source.
+    #   @return [String]
+    #
     # @!attribute [rw] version_id
     #   Each time the destination is updated for a delivery stream, the
     #   version ID is changed, and the current version ID is required when
@@ -451,6 +486,11 @@ module Aws::Firehose
     #   The date and time that the delivery stream was last updated.
     #   @return [Time]
     #
+    # @!attribute [rw] source
+    #   If the `DeliveryStreamType` parameter is `KinesisStreamAsSource`, a
+    #   SourceDescription object describing the source Kinesis stream.
+    #   @return [Types::SourceDescription]
+    #
     # @!attribute [rw] destinations
     #   The destinations.
     #   @return [Array<Types::DestinationDescription>]
@@ -465,9 +505,11 @@ module Aws::Firehose
       :delivery_stream_name,
       :delivery_stream_arn,
       :delivery_stream_status,
+      :delivery_stream_type,
       :version_id,
       :create_timestamp,
       :last_update_timestamp,
+      :source,
       :destinations,
       :has_more_destinations)
       include Aws::Structure
@@ -493,8 +535,8 @@ module Aws::Firehose
     #
     # @!attribute [rw] exclusive_start_destination_id
     #   The ID of the destination to start returning the destination
-    #   information. Currently Firehose supports one destination per
-    #   delivery stream.
+    #   information. Currently, Kinesis Firehose supports one destination
+    #   per delivery stream.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/DescribeDeliveryStreamInput AWS API Documentation
@@ -647,9 +689,9 @@ module Aws::Firehose
     #       }
     #
     # @!attribute [rw] role_arn
-    #   The ARN of the IAM role to be assumed by Firehose for calling the
-    #   Amazon ES Configuration API and for indexing documents. For more
-    #   information, see [Amazon S3 Bucket Access][1].
+    #   The ARN of the IAM role to be assumed by Kinesis Firehose for
+    #   calling the Amazon ES Configuration API and for indexing documents.
+    #   For more information, see [Amazon S3 Bucket Access][1].
     #
     #
     #
@@ -673,9 +715,10 @@ module Aws::Firehose
     #
     # @!attribute [rw] index_rotation_period
     #   The Elasticsearch index rotation period. Index rotation appends a
-    #   timestamp to the IndexName to facilitate expiration of old data. For
-    #   more information, see [Index Rotation for Amazon Elasticsearch
-    #   Service Destination][1]. The default value is `OneDay`.
+    #   time stamp to the IndexName to facilitate the expiration of old
+    #   data. For more information, see [Index Rotation for Amazon
+    #   Elasticsearch Service Destination][1]. The default value
+    #   is `OneDay`.
     #
     #
     #
@@ -688,20 +731,20 @@ module Aws::Firehose
     #   @return [Types::ElasticsearchBufferingHints]
     #
     # @!attribute [rw] retry_options
-    #   The retry behavior in the event that Firehose is unable to deliver
+    #   The retry behavior in case Kinesis Firehose is unable to deliver
     #   documents to Amazon ES. The default value is 300 (5 minutes).
     #   @return [Types::ElasticsearchRetryOptions]
     #
     # @!attribute [rw] s3_backup_mode
     #   Defines how documents should be delivered to Amazon S3. When set to
-    #   FailedDocumentsOnly, Firehose writes any documents that could not be
-    #   indexed to the configured Amazon S3 destination, with
+    #   FailedDocumentsOnly, Kinesis Firehose writes any documents that
+    #   could not be indexed to the configured Amazon S3 destination, with
     #   elasticsearch-failed/ appended to the key prefix. When set to
-    #   AllDocuments, Firehose delivers all incoming records to Amazon S3,
-    #   and also writes failed documents with elasticsearch-failed/ appended
-    #   to the prefix. For more information, see [Amazon S3 Backup for
-    #   Amazon Elasticsearch Service Destination][1]. Default value is
-    #   FailedDocumentsOnly.
+    #   AllDocuments, Kinesis Firehose delivers all incoming records to
+    #   Amazon S3, and also writes failed documents with
+    #   elasticsearch-failed/ appended to the prefix. For more information,
+    #   see [Amazon S3 Backup for Amazon Elasticsearch Service
+    #   Destination][1]. Default value is FailedDocumentsOnly.
     #
     #
     #
@@ -709,8 +752,7 @@ module Aws::Firehose
     #   @return [String]
     #
     # @!attribute [rw] s3_configuration
-    #   The configuration for the intermediate Amazon S3 location from which
-    #   Amazon ES obtains data.
+    #   The configuration for the backup Amazon S3 location.
     #   @return [Types::S3DestinationConfiguration]
     #
     # @!attribute [rw] processing_configuration
@@ -862,9 +904,9 @@ module Aws::Firehose
     #       }
     #
     # @!attribute [rw] role_arn
-    #   The ARN of the IAM role to be assumed by Firehose for calling the
-    #   Amazon ES Configuration API and for indexing documents. For more
-    #   information, see [Amazon S3 Bucket Access][1].
+    #   The ARN of the IAM role to be assumed by Kinesis Firehose for
+    #   calling the Amazon ES Configuration API and for indexing documents.
+    #   For more information, see [Amazon S3 Bucket Access][1].
     #
     #
     #
@@ -888,8 +930,8 @@ module Aws::Firehose
     #
     # @!attribute [rw] index_rotation_period
     #   The Elasticsearch index rotation period. Index rotation appends a
-    #   timestamp to IndexName to facilitate the expiration of old data. For
-    #   more information, see [Index Rotation for Amazon Elasticsearch
+    #   time stamp to IndexName to facilitate the expiration of old data.
+    #   For more information, see [Index Rotation for Amazon Elasticsearch
     #   Service Destination][1]. Default value is `OneDay`.
     #
     #
@@ -903,8 +945,8 @@ module Aws::Firehose
     #   @return [Types::ElasticsearchBufferingHints]
     #
     # @!attribute [rw] retry_options
-    #   The retry behavior in the event that Firehose is unable to deliver
-    #   documents to Amazon ES. Default value is 300 (5 minutes).
+    #   The retry behavior in case Kinesis Firehose is unable to deliver
+    #   documents to Amazon ES. The default value is 300 (5 minutes).
     #   @return [Types::ElasticsearchRetryOptions]
     #
     # @!attribute [rw] s3_update
@@ -935,7 +977,7 @@ module Aws::Firehose
       include Aws::Structure
     end
 
-    # Configures retry behavior in the event that Firehose is unable to
+    # Configures retry behavior in case Kinesis Firehose is unable to
     # deliver documents to Amazon ES.
     #
     # @note When making an API call, you may pass ElasticsearchRetryOptions
@@ -947,10 +989,10 @@ module Aws::Firehose
     #
     # @!attribute [rw] duration_in_seconds
     #   After an initial failure to deliver to Amazon ES, the total amount
-    #   of time during which Firehose re-attempts delivery (including the
-    #   first attempt). After this time has elapsed, the failed documents
-    #   are written to Amazon S3. Default value is 300 seconds (5 minutes).
-    #   A value of 0 (zero) results in no retries.
+    #   of time during which Kinesis Firehose re-attempts delivery
+    #   (including the first attempt). After this time has elapsed, the
+    #   failed documents are written to Amazon S3. Default value is 300
+    #   seconds (5 minutes). A value of 0 (zero) results in no retries.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/ElasticsearchRetryOptions AWS API Documentation
@@ -973,8 +1015,8 @@ module Aws::Firehose
     #       }
     #
     # @!attribute [rw] no_encryption_config
-    #   Specifically override existing encryption information to ensure no
-    #   encryption is used.
+    #   Specifically override existing encryption information to ensure that
+    #   no encryption is used.
     #   @return [String]
     #
     # @!attribute [rw] kms_encryption_config
@@ -1063,10 +1105,10 @@ module Aws::Firehose
     # @!attribute [rw] prefix
     #   The "YYYY/MM/DD/HH" time format prefix is automatically used for
     #   delivered S3 files. You can specify an extra prefix to be added in
-    #   front of the time format prefix. Note that if the prefix ends with a
-    #   slash, it appears as a folder in the S3 bucket. For more
-    #   information, see [Amazon S3 Object Name Format][1] in the *Amazon
-    #   Kinesis Firehose Developer Guide*.
+    #   front of the time format prefix. If the prefix ends with a slash, it
+    #   appears as a folder in the S3 bucket. For more information, see
+    #   [Amazon S3 Object Name Format][1] in the *Amazon Kinesis Firehose
+    #   Developer Guide*.
     #
     #
     #
@@ -1132,10 +1174,10 @@ module Aws::Firehose
     # @!attribute [rw] prefix
     #   The "YYYY/MM/DD/HH" time format prefix is automatically used for
     #   delivered S3 files. You can specify an extra prefix to be added in
-    #   front of the time format prefix. Note that if the prefix ends with a
-    #   slash, it appears as a folder in the S3 bucket. For more
-    #   information, see [Amazon S3 Object Name Format][1] in the *Amazon
-    #   Kinesis Firehose Developer Guide*.
+    #   front of the time format prefix. If the prefix ends with a slash, it
+    #   appears as a folder in the S3 bucket. For more information, see
+    #   [Amazon S3 Object Name Format][1] in the *Amazon Kinesis Firehose
+    #   Developer Guide*.
     #
     #
     #
@@ -1262,10 +1304,10 @@ module Aws::Firehose
     # @!attribute [rw] prefix
     #   The "YYYY/MM/DD/HH" time format prefix is automatically used for
     #   delivered S3 files. You can specify an extra prefix to be added in
-    #   front of the time format prefix. Note that if the prefix ends with a
-    #   slash, it appears as a folder in the S3 bucket. For more
-    #   information, see [Amazon S3 Object Name Format][1] in the *Amazon
-    #   Kinesis Firehose Developer Guide*.
+    #   front of the time format prefix. If the prefix ends with a slash, it
+    #   appears as a folder in the S3 bucket. For more information, see
+    #   [Amazon S3 Object Name Format][1] in the *Amazon Kinesis Firehose
+    #   Developer Guide*.
     #
     #
     #
@@ -1318,6 +1360,37 @@ module Aws::Firehose
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetKinesisStreamInput
+    #   data as a hash:
+    #
+    #       {
+    #         delivery_stream_arn: "DeliveryStreamARN", # required
+    #       }
+    #
+    # @!attribute [rw] delivery_stream_arn
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/GetKinesisStreamInput AWS API Documentation
+    #
+    class GetKinesisStreamInput < Struct.new(
+      :delivery_stream_arn)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] kinesis_stream_arn
+    #   @return [String]
+    #
+    # @!attribute [rw] credentials_for_reading_kinesis_stream
+    #   @return [Types::SessionCredentials]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/GetKinesisStreamOutput AWS API Documentation
+    #
+    class GetKinesisStreamOutput < Struct.new(
+      :kinesis_stream_arn,
+      :credentials_for_reading_kinesis_stream)
+      include Aws::Structure
+    end
+
     # Describes an encryption key for a destination in Amazon S3.
     #
     # @note When making an API call, you may pass KMSEncryptionConfig
@@ -1339,11 +1412,65 @@ module Aws::Firehose
       include Aws::Structure
     end
 
+    # The stream and role ARNs for a Kinesis stream used as the source for a
+    # delivery stream.
+    #
+    # @note When making an API call, you may pass KinesisStreamSourceConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         kinesis_stream_arn: "KinesisStreamARN", # required
+    #         role_arn: "RoleARN", # required
+    #       }
+    #
+    # @!attribute [rw] kinesis_stream_arn
+    #   The ARN of the source Kinesis stream.
+    #   @return [String]
+    #
+    # @!attribute [rw] role_arn
+    #   The ARN of the role that provides access to the source Kinesis
+    #   stream.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/KinesisStreamSourceConfiguration AWS API Documentation
+    #
+    class KinesisStreamSourceConfiguration < Struct.new(
+      :kinesis_stream_arn,
+      :role_arn)
+      include Aws::Structure
+    end
+
+    # Details about a Kinesis stream used as the source for a Kinesis
+    # Firehose delivery stream.
+    #
+    # @!attribute [rw] kinesis_stream_arn
+    #   The ARN of the source Kinesis stream.
+    #   @return [String]
+    #
+    # @!attribute [rw] role_arn
+    #   The ARN of the role used by the source Kinesis stream.
+    #   @return [String]
+    #
+    # @!attribute [rw] delivery_start_timestamp
+    #   Kinesis Firehose starts retrieving records from the Kinesis stream
+    #   starting with this time stamp.
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/KinesisStreamSourceDescription AWS API Documentation
+    #
+    class KinesisStreamSourceDescription < Struct.new(
+      :kinesis_stream_arn,
+      :role_arn,
+      :delivery_start_timestamp)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListDeliveryStreamsInput
     #   data as a hash:
     #
     #       {
     #         limit: 1,
+    #         delivery_stream_type: "DirectPut", # accepts DirectPut, KinesisStreamAsSource
     #         exclusive_start_delivery_stream_name: "DeliveryStreamName",
     #       }
     #
@@ -1351,6 +1478,19 @@ module Aws::Firehose
     #   The maximum number of delivery streams to list.
     #   @return [Integer]
     #
+    # @!attribute [rw] delivery_stream_type
+    #   The delivery stream type. This can be one of the following values:
+    #
+    #   * `DirectPut`\: Provider applications access the delivery stream
+    #     directly.
+    #
+    #   * `KinesisStreamAsSource`\: The delivery stream uses a Kinesis
+    #     stream as a source.
+    #
+    #   This parameter is optional. If this parameter is omitted, delivery
+    #   streams of all types are returned.
+    #   @return [String]
+    #
     # @!attribute [rw] exclusive_start_delivery_stream_name
     #   The name of the delivery stream to start the list with.
     #   @return [String]
@@ -1359,6 +1499,7 @@ module Aws::Firehose
     #
     class ListDeliveryStreamsInput < Struct.new(
       :limit,
+      :delivery_stream_type,
       :exclusive_start_delivery_stream_name)
       include Aws::Structure
     end
@@ -1706,7 +1847,7 @@ module Aws::Firehose
     #   @return [String]
     #
     # @!attribute [rw] retry_options
-    #   The retry behavior in the event that Firehose is unable to deliver
+    #   The retry behavior in case Kinesis Firehose is unable to deliver
     #   documents to Amazon Redshift. Default value is 3600 (60 minutes).
     #   @return [Types::RedshiftRetryOptions]
     #
@@ -1773,7 +1914,7 @@ module Aws::Firehose
     #   @return [String]
     #
     # @!attribute [rw] retry_options
-    #   The retry behavior in the event that Firehose is unable to deliver
+    #   The retry behavior in case Kinesis Firehose is unable to deliver
     #   documents to Amazon Redshift. Default value is 3600 (60 minutes).
     #   @return [Types::RedshiftRetryOptions]
     #
@@ -1916,7 +2057,7 @@ module Aws::Firehose
     #   @return [String]
     #
     # @!attribute [rw] retry_options
-    #   The retry behavior in the event that Firehose is unable to deliver
+    #   The retry behavior in case Kinesis Firehose is unable to deliver
     #   documents to Amazon Redshift. Default value is 3600 (60 minutes).
     #   @return [Types::RedshiftRetryOptions]
     #
@@ -1962,7 +2103,7 @@ module Aws::Firehose
       include Aws::Structure
     end
 
-    # Configures retry behavior in the event that Firehose is unable to
+    # Configures retry behavior in case Kinesis Firehose is unable to
     # deliver documents to Amazon Redshift.
     #
     # @note When making an API call, you may pass RedshiftRetryOptions
@@ -1973,11 +2114,12 @@ module Aws::Firehose
     #       }
     #
     # @!attribute [rw] duration_in_seconds
-    #   The length of time during which Firehose retries delivery after a
-    #   failure, starting from the initial request and including the first
-    #   attempt. The default value is 3600 seconds (60 minutes). Firehose
-    #   does not retry if the value of `DurationInSeconds` is 0 (zero) or if
-    #   the first delivery attempt takes longer than the current value.
+    #   The length of time during which Kinesis Firehose retries delivery
+    #   after a failure, starting from the initial request and including the
+    #   first attempt. The default value is 3600 seconds (60 minutes).
+    #   Kinesis Firehose does not retry if the value of `DurationInSeconds`
+    #   is 0 (zero) or if the first delivery attempt takes longer than the
+    #   current value.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/RedshiftRetryOptions AWS API Documentation
@@ -2025,10 +2167,10 @@ module Aws::Firehose
     # @!attribute [rw] prefix
     #   The "YYYY/MM/DD/HH" time format prefix is automatically used for
     #   delivered S3 files. You can specify an extra prefix to be added in
-    #   front of the time format prefix. Note that if the prefix ends with a
-    #   slash, it appears as a folder in the S3 bucket. For more
-    #   information, see [Amazon S3 Object Name Format][1] in the *Amazon
-    #   Kinesis Firehose Developer Guide*.
+    #   front of the time format prefix. If the prefix ends with a slash, it
+    #   appears as a folder in the S3 bucket. For more information, see
+    #   [Amazon S3 Object Name Format][1] in the *Amazon Kinesis Firehose
+    #   Developer Guide*.
     #
     #
     #
@@ -2084,10 +2226,10 @@ module Aws::Firehose
     # @!attribute [rw] prefix
     #   The "YYYY/MM/DD/HH" time format prefix is automatically used for
     #   delivered S3 files. You can specify an extra prefix to be added in
-    #   front of the time format prefix. Note that if the prefix ends with a
-    #   slash, it appears as a folder in the S3 bucket. For more
-    #   information, see [Amazon S3 Object Name Format][1] in the *Amazon
-    #   Kinesis Firehose Developer Guide*.
+    #   front of the time format prefix. If the prefix ends with a slash, it
+    #   appears as a folder in the S3 bucket. For more information, see
+    #   [Amazon S3 Object Name Format][1] in the *Amazon Kinesis Firehose
+    #   Developer Guide*.
     #
     #
     #
@@ -2164,10 +2306,10 @@ module Aws::Firehose
     # @!attribute [rw] prefix
     #   The "YYYY/MM/DD/HH" time format prefix is automatically used for
     #   delivered S3 files. You can specify an extra prefix to be added in
-    #   front of the time format prefix. Note that if the prefix ends with a
-    #   slash, it appears as a folder in the S3 bucket. For more
-    #   information, see [Amazon S3 Object Name Format][1] in the *Amazon
-    #   Kinesis Firehose Developer Guide*.
+    #   front of the time format prefix. If the prefix ends with a slash, it
+    #   appears as a folder in the S3 bucket. For more information, see
+    #   [Amazon S3 Object Name Format][1] in the *Amazon Kinesis Firehose
+    #   Developer Guide*.
     #
     #
     #
@@ -2210,6 +2352,43 @@ module Aws::Firehose
       include Aws::Structure
     end
 
+    # @!attribute [rw] access_key_id
+    #   @return [String]
+    #
+    # @!attribute [rw] secret_access_key
+    #   @return [String]
+    #
+    # @!attribute [rw] session_token
+    #   @return [String]
+    #
+    # @!attribute [rw] expiration
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/SessionCredentials AWS API Documentation
+    #
+    class SessionCredentials < Struct.new(
+      :access_key_id,
+      :secret_access_key,
+      :session_token,
+      :expiration)
+      include Aws::Structure
+    end
+
+    # Details about a Kinesis stream used as the source for a Kinesis
+    # Firehose delivery stream.
+    #
+    # @!attribute [rw] kinesis_stream_source_description
+    #   The KinesisStreamSourceDescription value for the source Kinesis
+    #   stream.
+    #   @return [Types::KinesisStreamSourceDescription]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/SourceDescription AWS API Documentation
+    #
+    class SourceDescription < Struct.new(
+      :kinesis_stream_source_description)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass UpdateDestinationInput
     #   data as a hash:
     #
@@ -2435,7 +2614,7 @@ module Aws::Firehose
     #   Obtain this value from the **VersionId** result of
     #   DeliveryStreamDescription. This value is required, and helps the
     #   service to perform conditional operations. For example, if there is
-    #   a interleaving update and this value is null, then the update
+    #   an interleaving update and this value is null, then the update
     #   destination fails. After the update is successful, the **VersionId**
     #   value is updated. The service then performs a merge of the old
     #   configuration with the new configuration.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-firehose
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc13
+  version: 1.0.0.rc14
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core