aws-sdk-kinesis 1.0.0.rc6 → 1.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06cb49f340515303bba7f420f1d69d37a7357526
-  data.tar.gz: c0e520e5b62f490e5f06ae7db0b3ce206a99429d
+  metadata.gz: 7920fd59d51af354f4d90e772ea1930fee76c6c8
+  data.tar.gz: 32d549a450f852865bfa72bf77b29f89af2651d6
 SHA512:
-  metadata.gz: 56392442f76cadb18251450df1c247d6510594868577d85d402843fefd4f64f382f4f75e353ce94af6abe152656f1af17a3f92d1ef8c323131080c1324d305d1
-  data.tar.gz: 8fdbcc3c4549bba25a574ae8b6dfb2ff0421bc871e766d0a7319da73dce18d4f0569123238b697fbb2f1cfb880831030168a31b1bb2a92da8dba10a06a247da0
+  metadata.gz: b452e908bd7a65f373356dede794a4903440c6604a03eb80664e9684bb009621376bf37935c809ed1da8a6c994d2dc21bd16590e29d148a87b84633ff39515b3
+  data.tar.gz: 0175b0be457256014a339b0912d1d489122355b2f2ae244509a68c4e08e0392625a66c10901b8571d975a3a024bdaa270e4afc1a0572bb29c8f46b57fa75014b

data/lib/aws-sdk-kinesis.rb

@@ -43,6 +43,6 @@ require_relative 'aws-sdk-kinesis/customizations'
 # @service
 module Aws::Kinesis
 
-  GEM_VERSION = '1.0.0.rc6'
+  GEM_VERSION = '1.0.0.rc7'
 
 end

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

@@ -435,6 +435,8 @@ module Aws::Kinesis
     #   resp.stream_description.enhanced_monitoring #=> Array
     #   resp.stream_description.enhanced_monitoring[0].shard_level_metrics #=> Array
     #   resp.stream_description.enhanced_monitoring[0].shard_level_metrics[0] #=> String, one of "IncomingBytes", "IncomingRecords", "OutgoingBytes", "OutgoingRecords", "WriteProvisionedThroughputExceeded", "ReadProvisionedThroughputExceeded", "IteratorAgeMilliseconds", "ALL"
+    #   resp.stream_description.encryption_type #=> String, one of "NONE", "KMS"
+    #   resp.stream_description.key_id #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/DescribeStream AWS API Documentation
     #
@@ -670,6 +672,7 @@ module Aws::Kinesis
     #   resp.records[0].approximate_arrival_timestamp #=> Time
     #   resp.records[0].data #=> String
     #   resp.records[0].partition_key #=> String
+    #   resp.records[0].encryption_type #=> String, one of "NONE", "KMS"
     #   resp.next_shard_iterator #=> String
     #   resp.millis_behind_latest #=> Integer
     #
@@ -1052,8 +1055,10 @@ module Aws::Kinesis
     # provisioned throughput on the shard involved in the request,
     # `PutRecord` throws `ProvisionedThroughputExceededException`.
     #
-    # Data records are accessible for only 24 hours from the time that they
-    # are added to a stream.
+    # By default, data records are accessible for 24 hours from the time
+    # that they are added to a stream. You can use
+    # IncreaseStreamRetentionPeriod or DecreaseStreamRetentionPeriod to
+    # modify this retention period.
     #
     #
     #
@@ -1095,6 +1100,7 @@ module Aws::Kinesis
     #
     #   * {Types::PutRecordOutput#shard_id #shard_id} => String
     #   * {Types::PutRecordOutput#sequence_number #sequence_number} => String
+    #   * {Types::PutRecordOutput#encryption_type #encryption_type} => String
     #
     # @example Request syntax with placeholder values
     #
@@ -1110,6 +1116,7 @@ module Aws::Kinesis
     #
     #   resp.shard_id #=> String
     #   resp.sequence_number #=> String
+    #   resp.encryption_type #=> String, one of "NONE", "KMS"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/PutRecord AWS API Documentation
     #
@@ -1184,10 +1191,10 @@ module Aws::Kinesis
     # see [Adding Multiple Records with PutRecords][3] in the *Amazon
     # Kinesis Streams Developer Guide*.
     #
-    # By default, data records are accessible for only 24 hours from the
-    # time that they are added to an Amazon Kinesis stream. This retention
-    # period can be modified using the DecreaseStreamRetentionPeriod and
-    # IncreaseStreamRetentionPeriod operations.
+    # By default, data records are accessible for 24 hours from the time
+    # that they are added to a stream. You can use
+    # IncreaseStreamRetentionPeriod or DecreaseStreamRetentionPeriod to
+    # modify this retention period.
     #
     #
     #
@@ -1205,6 +1212,7 @@ module Aws::Kinesis
     #
     #   * {Types::PutRecordsOutput#failed_record_count #failed_record_count} => Integer
     #   * {Types::PutRecordsOutput#records #records} => Array<Types::PutRecordsResultEntry>
+    #   * {Types::PutRecordsOutput#encryption_type #encryption_type} => String
     #
     # @example Request syntax with placeholder values
     #
@@ -1227,6 +1235,7 @@ module Aws::Kinesis
     #   resp.records[0].shard_id #=> String
     #   resp.records[0].error_code #=> String
     #   resp.records[0].error_message #=> String
+    #   resp.encryption_type #=> String, one of "NONE", "KMS"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/PutRecords AWS API Documentation
     #
@@ -1360,6 +1369,119 @@ module Aws::Kinesis
       req.send_request(options)
     end
 
+    # Enables or updates server-side encryption using an AWS KMS key for a
+    # specified stream.
+    #
+    # Starting encryption is an asynchronous operation. Upon receiving the
+    # request, Amazon Kinesis returns immediately and sets the status of the
+    # stream to `UPDATING`. After the update is complete, Amazon Kinesis
+    # sets the status of the stream back to `ACTIVE`. Updating or applying
+    # encryption normally takes a few seconds to complete but it can take
+    # minutes. You can continue to read and write data to your stream while
+    # its status is `UPDATING`. Once the status of the stream is `ACTIVE`,
+    # records written to the stream will begin to be encrypted.
+    #
+    # API Limits: You can successfully apply a new AWS KMS key for
+    # server-side encryption 25 times in a rolling 24 hour period.
+    #
+    # Note: It can take up to 5 seconds after the stream is in an `ACTIVE`
+    # status before all records written to the stream are encrypted. After
+    # you’ve enabled encryption, you can verify encryption was applied by
+    # inspecting the API response from `PutRecord` or `PutRecords`.
+    #
+    # @option params [required, String] :stream_name
+    #   The name of the stream for which to start encrypting records.
+    #
+    # @option params [required, String] :encryption_type
+    #   The encryption type to use. This parameter can be one of the following
+    #   values:
+    #
+    #   * `NONE`\: Not valid for this operation. An
+    #     `InvalidOperationException` will be thrown.
+    #
+    #   * `KMS`\: Use server-side encryption on the records in the stream
+    #     using a customer-managed KMS key.
+    #
+    # @option params [required, String] :key_id
+    #   The GUID for the customer-managed KMS key to use for encryption. You
+    #   can also use a Kinesis-owned master key by specifying the alias
+    #   `aws/kinesis`.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.start_stream_encryption({
+    #     stream_name: "StreamName", # required
+    #     encryption_type: "NONE", # required, accepts NONE, KMS
+    #     key_id: "KeyId", # required
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/StartStreamEncryption AWS API Documentation
+    #
+    # @overload start_stream_encryption(params = {})
+    # @param [Hash] params ({})
+    def start_stream_encryption(params = {}, options = {})
+      req = build_request(:start_stream_encryption, params)
+      req.send_request(options)
+    end
+
+    # Disables server-side encryption for a specified stream.
+    #
+    # Stopping encryption is an asynchronous operation. Upon receiving the
+    # request, Amazon Kinesis returns immediately and sets the status of the
+    # stream to `UPDATING`. After the update is complete, Amazon Kinesis
+    # sets the status of the stream back to `ACTIVE`. Stopping encryption
+    # normally takes a few seconds to complete but it can take minutes. You
+    # can continue to read and write data to your stream while its status is
+    # `UPDATING`. Once the status of the stream is `ACTIVE` records written
+    # to the stream will no longer be encrypted by the Amazon Kinesis
+    # Streams service.
+    #
+    # API Limits: You can successfully disable server-side encryption 25
+    # times in a rolling 24 hour period.
+    #
+    # Note: It can take up to 5 seconds after the stream is in an `ACTIVE`
+    # status before all records written to the stream are no longer subject
+    # to encryption. After you’ve disabled encryption, you can verify
+    # encryption was not applied by inspecting the API response from
+    # `PutRecord` or `PutRecords`.
+    #
+    # @option params [required, String] :stream_name
+    #   The name of the stream on which to stop encrypting records.
+    #
+    # @option params [required, String] :encryption_type
+    #   The encryption type. This parameter can be one of the following
+    #   values:
+    #
+    #   * `NONE`\: Not valid for this operation. An
+    #     `InvalidOperationException` will be thrown.
+    #
+    #   * `KMS`\: Use server-side encryption on the records in the stream
+    #     using a customer-managed KMS key.
+    #
+    # @option params [required, String] :key_id
+    #   The GUID for the customer-managed key that was used for encryption.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.stop_stream_encryption({
+    #     stream_name: "StreamName", # required
+    #     encryption_type: "NONE", # required, accepts NONE, KMS
+    #     key_id: "KeyId", # required
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/StopStreamEncryption AWS API Documentation
+    #
+    # @overload stop_stream_encryption(params = {})
+    # @param [Hash] params ({})
+    def stop_stream_encryption(params = {}, options = {})
+      req = build_request(:stop_stream_encryption, params)
+      req.send_request(options)
+    end
+
     # Updates the shard count of the specified stream to the specified
     # number of shards.
     #
@@ -1371,16 +1493,29 @@ module Aws::Kinesis
     # complete. You can continue to read and write data to your stream while
     # its status is `UPDATING`.
     #
-    # To update the shard count, Amazon Kinesis performs splits and merges
-    # and individual shards. This can cause short-lived shards to be
-    # created, in addition to the final shards. We recommend that you double
-    # or halve the shard count, as this results in the fewest number of
-    # splits or merges.
+    # To update the shard count, Amazon Kinesis performs splits or merges on
+    # individual shards. This can cause short-lived shards to be created, in
+    # addition to the final shards. We recommend that you double or halve
+    # the shard count, as this results in the fewest number of splits or
+    # merges.
+    #
+    # This operation has the following limits, which are per region per
+    # account unless otherwise noted:
+    #
+    # * scale more than twice per rolling 24 hour period
+    #
+    # * scale up above double your current shard count
+    #
+    # * scale down below half your current shard count
+    #
+    # * scale up above 200 shards in a stream
+    #
+    # * scale a stream with more than 200 shards down unless the result is
+    #   less than 200 shards
+    #
+    # * scale up above the shard limits for your account
     #
-    # This operation has a rate limit of twice per rolling 24 hour period.
-    # You cannot scale above double your current shard count, scale below
-    # half your current shard count, or exceed the shard limits for your
-    # account.
+    # *
     #
     # For the default limits for an AWS account, see [Streams Limits][1] in
     # the *Amazon Kinesis Streams Developer Guide*. If you need to increase
@@ -1442,7 +1577,7 @@ module Aws::Kinesis
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-kinesis'
-      context[:gem_version] = '1.0.0.rc6'
+      context[:gem_version] = '1.0.0.rc7'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -24,6 +24,7 @@ module Aws::Kinesis
     DescribeStreamOutput = Shapes::StructureShape.new(name: 'DescribeStreamOutput')
     DisableEnhancedMonitoringInput = Shapes::StructureShape.new(name: 'DisableEnhancedMonitoringInput')
     EnableEnhancedMonitoringInput = Shapes::StructureShape.new(name: 'EnableEnhancedMonitoringInput')
+    EncryptionType = Shapes::StringShape.new(name: 'EncryptionType')
     EnhancedMetrics = Shapes::StructureShape.new(name: 'EnhancedMetrics')
     EnhancedMonitoringList = Shapes::ListShape.new(name: 'EnhancedMonitoringList')
     EnhancedMonitoringOutput = Shapes::StructureShape.new(name: 'EnhancedMonitoringOutput')
@@ -39,6 +40,13 @@ module Aws::Kinesis
     HashKeyRange = Shapes::StructureShape.new(name: 'HashKeyRange')
     IncreaseStreamRetentionPeriodInput = Shapes::StructureShape.new(name: 'IncreaseStreamRetentionPeriodInput')
     InvalidArgumentException = Shapes::StructureShape.new(name: 'InvalidArgumentException')
+    KMSAccessDeniedException = Shapes::StructureShape.new(name: 'KMSAccessDeniedException')
+    KMSDisabledException = Shapes::StructureShape.new(name: 'KMSDisabledException')
+    KMSInvalidStateException = Shapes::StructureShape.new(name: 'KMSInvalidStateException')
+    KMSNotFoundException = Shapes::StructureShape.new(name: 'KMSNotFoundException')
+    KMSOptInRequired = Shapes::StructureShape.new(name: 'KMSOptInRequired')
+    KMSThrottlingException = Shapes::StructureShape.new(name: 'KMSThrottlingException')
+    KeyId = Shapes::StringShape.new(name: 'KeyId')
     LimitExceededException = Shapes::StructureShape.new(name: 'LimitExceededException')
     ListStreamsInput = Shapes::StructureShape.new(name: 'ListStreamsInput')
     ListStreamsInputLimit = Shapes::IntegerShape.new(name: 'ListStreamsInputLimit')
@@ -76,6 +84,8 @@ module Aws::Kinesis
     ShardIteratorType = Shapes::StringShape.new(name: 'ShardIteratorType')
     ShardList = Shapes::ListShape.new(name: 'ShardList')
     SplitShardInput = Shapes::StructureShape.new(name: 'SplitShardInput')
+    StartStreamEncryptionInput = Shapes::StructureShape.new(name: 'StartStreamEncryptionInput')
+    StopStreamEncryptionInput = Shapes::StructureShape.new(name: 'StopStreamEncryptionInput')
     StreamARN = Shapes::StringShape.new(name: 'StreamARN')
     StreamDescription = Shapes::StructureShape.new(name: 'StreamDescription')
     StreamName = Shapes::StringShape.new(name: 'StreamName')
@@ -198,6 +208,7 @@ module Aws::Kinesis
 
     PutRecordOutput.add_member(:shard_id, Shapes::ShapeRef.new(shape: ShardId, required: true, location_name: "ShardId"))
     PutRecordOutput.add_member(:sequence_number, Shapes::ShapeRef.new(shape: SequenceNumber, required: true, location_name: "SequenceNumber"))
+    PutRecordOutput.add_member(:encryption_type, Shapes::ShapeRef.new(shape: EncryptionType, location_name: "EncryptionType"))
     PutRecordOutput.struct_class = Types::PutRecordOutput
 
     PutRecordsInput.add_member(:records, Shapes::ShapeRef.new(shape: PutRecordsRequestEntryList, required: true, location_name: "Records"))
@@ -206,6 +217,7 @@ module Aws::Kinesis
 
     PutRecordsOutput.add_member(:failed_record_count, Shapes::ShapeRef.new(shape: PositiveIntegerObject, location_name: "FailedRecordCount"))
     PutRecordsOutput.add_member(:records, Shapes::ShapeRef.new(shape: PutRecordsResultEntryList, required: true, location_name: "Records"))
+    PutRecordsOutput.add_member(:encryption_type, Shapes::ShapeRef.new(shape: EncryptionType, location_name: "EncryptionType"))
     PutRecordsOutput.struct_class = Types::PutRecordsOutput
 
     PutRecordsRequestEntry.add_member(:data, Shapes::ShapeRef.new(shape: Data, required: true, location_name: "Data"))
@@ -227,6 +239,7 @@ module Aws::Kinesis
     Record.add_member(:approximate_arrival_timestamp, Shapes::ShapeRef.new(shape: Timestamp, location_name: "ApproximateArrivalTimestamp"))
     Record.add_member(:data, Shapes::ShapeRef.new(shape: Data, required: true, location_name: "Data"))
     Record.add_member(:partition_key, Shapes::ShapeRef.new(shape: PartitionKey, required: true, location_name: "PartitionKey"))
+    Record.add_member(:encryption_type, Shapes::ShapeRef.new(shape: EncryptionType, location_name: "EncryptionType"))
     Record.struct_class = Types::Record
 
     RecordList.member = Shapes::ShapeRef.new(shape: Record)
@@ -253,6 +266,16 @@ module Aws::Kinesis
     SplitShardInput.add_member(:new_starting_hash_key, Shapes::ShapeRef.new(shape: HashKey, required: true, location_name: "NewStartingHashKey"))
     SplitShardInput.struct_class = Types::SplitShardInput
 
+    StartStreamEncryptionInput.add_member(:stream_name, Shapes::ShapeRef.new(shape: StreamName, required: true, location_name: "StreamName"))
+    StartStreamEncryptionInput.add_member(:encryption_type, Shapes::ShapeRef.new(shape: EncryptionType, required: true, location_name: "EncryptionType"))
+    StartStreamEncryptionInput.add_member(:key_id, Shapes::ShapeRef.new(shape: KeyId, required: true, location_name: "KeyId"))
+    StartStreamEncryptionInput.struct_class = Types::StartStreamEncryptionInput
+
+    StopStreamEncryptionInput.add_member(:stream_name, Shapes::ShapeRef.new(shape: StreamName, required: true, location_name: "StreamName"))
+    StopStreamEncryptionInput.add_member(:encryption_type, Shapes::ShapeRef.new(shape: EncryptionType, required: true, location_name: "EncryptionType"))
+    StopStreamEncryptionInput.add_member(:key_id, Shapes::ShapeRef.new(shape: KeyId, required: true, location_name: "KeyId"))
+    StopStreamEncryptionInput.struct_class = Types::StopStreamEncryptionInput
+
     StreamDescription.add_member(:stream_name, Shapes::ShapeRef.new(shape: StreamName, required: true, location_name: "StreamName"))
     StreamDescription.add_member(:stream_arn, Shapes::ShapeRef.new(shape: StreamARN, required: true, location_name: "StreamARN"))
     StreamDescription.add_member(:stream_status, Shapes::ShapeRef.new(shape: StreamStatus, required: true, location_name: "StreamStatus"))
@@ -261,6 +284,8 @@ module Aws::Kinesis
     StreamDescription.add_member(:retention_period_hours, Shapes::ShapeRef.new(shape: PositiveIntegerObject, required: true, location_name: "RetentionPeriodHours"))
     StreamDescription.add_member(:stream_creation_timestamp, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "StreamCreationTimestamp"))
     StreamDescription.add_member(:enhanced_monitoring, Shapes::ShapeRef.new(shape: EnhancedMonitoringList, required: true, location_name: "EnhancedMonitoring"))
+    StreamDescription.add_member(:encryption_type, Shapes::ShapeRef.new(shape: EncryptionType, location_name: "EncryptionType"))
+    StreamDescription.add_member(:key_id, Shapes::ShapeRef.new(shape: KeyId, location_name: "KeyId"))
     StreamDescription.struct_class = Types::StreamDescription
 
     StreamNameList.member = Shapes::ShapeRef.new(shape: StreamName)
@@ -405,6 +430,12 @@ module Aws::Kinesis
         o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
         o.errors << Shapes::ShapeRef.new(shape: ProvisionedThroughputExceededException)
         o.errors << Shapes::ShapeRef.new(shape: ExpiredIteratorException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSDisabledException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSInvalidStateException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSAccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSOptInRequired)
+        o.errors << Shapes::ShapeRef.new(shape: KMSThrottlingException)
       end)
 
       api.add_operation(:get_shard_iterator, Seahorse::Model::Operation.new.tap do |o|
@@ -477,6 +508,12 @@ module Aws::Kinesis
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
         o.errors << Shapes::ShapeRef.new(shape: ProvisionedThroughputExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSDisabledException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSInvalidStateException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSAccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSOptInRequired)
+        o.errors << Shapes::ShapeRef.new(shape: KMSThrottlingException)
       end)
 
       api.add_operation(:put_records, Seahorse::Model::Operation.new.tap do |o|
@@ -488,6 +525,12 @@ module Aws::Kinesis
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
         o.errors << Shapes::ShapeRef.new(shape: ProvisionedThroughputExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSDisabledException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSInvalidStateException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSAccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSOptInRequired)
+        o.errors << Shapes::ShapeRef.new(shape: KMSThrottlingException)
       end)
 
       api.add_operation(:remove_tags_from_stream, Seahorse::Model::Operation.new.tap do |o|
@@ -514,6 +557,36 @@ module Aws::Kinesis
         o.errors << Shapes::ShapeRef.new(shape: LimitExceededException)
       end)
 
+      api.add_operation(:start_stream_encryption, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "StartStreamEncryption"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: StartStreamEncryptionInput)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
+        o.errors << Shapes::ShapeRef.new(shape: LimitExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceInUseException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSDisabledException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSInvalidStateException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSAccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: KMSOptInRequired)
+        o.errors << Shapes::ShapeRef.new(shape: KMSThrottlingException)
+      end)
+
+      api.add_operation(:stop_stream_encryption, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "StopStreamEncryption"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: StopStreamEncryptionInput)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
+        o.errors << Shapes::ShapeRef.new(shape: LimitExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceInUseException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+      end)
+
       api.add_operation(:update_shard_count, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UpdateShardCount"
         o.http_method = "POST"

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

@@ -763,11 +763,22 @@ module Aws::Kinesis
     #   associated with every record put into the stream.
     #   @return [String]
     #
+    # @!attribute [rw] encryption_type
+    #   The encryption type to use on the record. This parameter can be one
+    #   of the following values:
+    #
+    #   * `NONE`\: Do not encrypt the records in the stream.
+    #
+    #   * `KMS`\: Use server-side encryption on the records in the stream
+    #     using a customer-managed KMS key.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/PutRecordOutput AWS API Documentation
     #
     class PutRecordOutput < Struct.new(
       :shard_id,
-      :sequence_number)
+      :sequence_number,
+      :encryption_type)
       include Aws::Structure
     end
 
@@ -818,11 +829,22 @@ module Aws::Kinesis
     #   includes `ErrorCode` and `ErrorMessage` in the result.
     #   @return [Array<Types::PutRecordsResultEntry>]
     #
+    # @!attribute [rw] encryption_type
+    #   The encryption type used on the records. This parameter can be one
+    #   of the following values:
+    #
+    #   * `NONE`\: Do not encrypt the records.
+    #
+    #   * `KMS`\: Use server-side encryption on the records using a
+    #     customer-managed KMS key.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/PutRecordsOutput AWS API Documentation
     #
     class PutRecordsOutput < Struct.new(
       :failed_record_count,
-      :records)
+      :records,
+      :encryption_type)
       include Aws::Structure
     end
 
@@ -912,7 +934,7 @@ module Aws::Kinesis
     # sequence number, a partition key, and a data blob.
     #
     # @!attribute [rw] sequence_number
-    #   The unique identifier of the record in the stream.
+    #   The unique identifier of the record within its shard.
     #   @return [String]
     #
     # @!attribute [rw] approximate_arrival_timestamp
@@ -931,13 +953,24 @@ module Aws::Kinesis
     #   Identifies which shard in the stream the data record is assigned to.
     #   @return [String]
     #
+    # @!attribute [rw] encryption_type
+    #   The encryption type used on the record. This parameter can be one of
+    #   the following values:
+    #
+    #   * `NONE`\: Do not encrypt the records in the stream.
+    #
+    #   * `KMS`\: Use server-side encryption on the records in the stream
+    #     using a customer-managed KMS key.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/Record AWS API Documentation
     #
     class Record < Struct.new(
       :sequence_number,
       :approximate_arrival_timestamp,
       :data,
-      :partition_key)
+      :partition_key,
+      :encryption_type)
       include Aws::Structure
     end
 
@@ -1061,6 +1094,82 @@ module Aws::Kinesis
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass StartStreamEncryptionInput
+    #   data as a hash:
+    #
+    #       {
+    #         stream_name: "StreamName", # required
+    #         encryption_type: "NONE", # required, accepts NONE, KMS
+    #         key_id: "KeyId", # required
+    #       }
+    #
+    # @!attribute [rw] stream_name
+    #   The name of the stream for which to start encrypting records.
+    #   @return [String]
+    #
+    # @!attribute [rw] encryption_type
+    #   The encryption type to use. This parameter can be one of the
+    #   following values:
+    #
+    #   * `NONE`\: Not valid for this operation. An
+    #     `InvalidOperationException` will be thrown.
+    #
+    #   * `KMS`\: Use server-side encryption on the records in the stream
+    #     using a customer-managed KMS key.
+    #   @return [String]
+    #
+    # @!attribute [rw] key_id
+    #   The GUID for the customer-managed KMS key to use for encryption. You
+    #   can also use a Kinesis-owned master key by specifying the alias
+    #   `aws/kinesis`.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/StartStreamEncryptionInput AWS API Documentation
+    #
+    class StartStreamEncryptionInput < Struct.new(
+      :stream_name,
+      :encryption_type,
+      :key_id)
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass StopStreamEncryptionInput
+    #   data as a hash:
+    #
+    #       {
+    #         stream_name: "StreamName", # required
+    #         encryption_type: "NONE", # required, accepts NONE, KMS
+    #         key_id: "KeyId", # required
+    #       }
+    #
+    # @!attribute [rw] stream_name
+    #   The name of the stream on which to stop encrypting records.
+    #   @return [String]
+    #
+    # @!attribute [rw] encryption_type
+    #   The encryption type. This parameter can be one of the following
+    #   values:
+    #
+    #   * `NONE`\: Not valid for this operation. An
+    #     `InvalidOperationException` will be thrown.
+    #
+    #   * `KMS`\: Use server-side encryption on the records in the stream
+    #     using a customer-managed KMS key.
+    #   @return [String]
+    #
+    # @!attribute [rw] key_id
+    #   The GUID for the customer-managed key that was used for encryption.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/StopStreamEncryptionInput AWS API Documentation
+    #
+    class StopStreamEncryptionInput < Struct.new(
+      :stream_name,
+      :encryption_type,
+      :key_id)
+      include Aws::Structure
+    end
+
     # Represents the output for DescribeStream.
     #
     # @!attribute [rw] stream_name
@@ -1112,6 +1221,21 @@ module Aws::Kinesis
     #   Represents the current enhanced monitoring settings of the stream.
     #   @return [Array<Types::EnhancedMetrics>]
     #
+    # @!attribute [rw] encryption_type
+    #   The server-side encryption type used on the stream. This parameter
+    #   can be one of the following values:
+    #
+    #   * `NONE`\: Do not encrypt the records in the stream.
+    #
+    #   * `KMS`\: Use server-side encryption on the records in the stream
+    #     using a customer-managed KMS key.
+    #   @return [String]
+    #
+    # @!attribute [rw] key_id
+    #   The GUID for the customer-managed KMS key used for encryption on the
+    #   stream.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/kinesis-2013-12-02/StreamDescription AWS API Documentation
     #
     class StreamDescription < Struct.new(
@@ -1122,7 +1246,9 @@ module Aws::Kinesis
       :has_more_shards,
       :retention_period_hours,
       :stream_creation_timestamp,
-      :enhanced_monitoring)
+      :enhanced_monitoring,
+      :encryption_type,
+      :key_id)
       include Aws::Structure
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-kinesis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc6
+  version: 1.0.0.rc7
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc14
+        version: 3.0.0.rc16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc14
+        version: 3.0.0.rc16
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement